Merge latest features/export-all [SCI-2731]

This commit is contained in:
Oleksii Kriuchykhin 2018-10-03 11:04:44 +02:00
commit ba58eec2e2
5 changed files with 60 additions and 26 deletions

View file

@ -3,7 +3,7 @@ ruby:
eslint: eslint:
enabled: true enabled: true
config_file: .eslintrc.json config_file: app/assets/.eslintrc.json
scss: scss:
config_file: .scss-lint.yml config_file: .scss-lint.yml

View file

@ -623,8 +623,6 @@ ul.double-line > li {
color: $brand-primary; color: $brand-primary;
} }
#projects-index,
#project-archive,
#project-show, #project-show,
#experiment-archive, #experiment-archive,
#module-archive, #module-archive,
@ -651,15 +649,26 @@ ul.double-line > li {
} }
.panel-project { .panel-project {
box-shadow: 0 3px 6px $color-alto;
color: $color-silver-chalice; color: $color-silver-chalice;
&:not(.selected) .panel-heading .project-card-selector,
&:not(.selected) .panel-heading .dropdown {
display: none;
}
&:not(.selected):hover .project-card-selector,
&:not(.selected):hover .dropdown {
display: block;
}
.nav .btn-link { .nav .btn-link {
padding: 10px 5px; padding: 10px 5px;
} }
&.selected { &.selected {
border-color: $brand-primary; border-color: $brand-primary;
box-shadow: 0px 3px 10px $brand-primary !important; box-shadow: 0 3px 10px $brand-primary;
} }
&.archived { &.archived {
@ -674,10 +683,12 @@ ul.double-line > li {
.panel-heading { .panel-heading {
background-color: $color-white; background-color: $color-white;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
color: $color-silver-chalice; color: $color-silver-chalice;
.dropdown-toggle { .fas {
padding: 6px; margin-right: 10px;
} }
} }
@ -689,12 +700,25 @@ ul.double-line > li {
} }
} }
.panel-body .row { .panel-body {
padding: 5px; padding: 10px 15px;
.row {
padding: 2px;
}
} }
.panel-footer .nav { .panel-footer {
padding: 0 10px; border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
.nav {
padding: 0 10px;
}
.nav-tabs {
border-bottom: 0;
}
} }
} }

View file

@ -1,6 +1,7 @@
Canaid::Permissions.register_for(Project) do Canaid::Permissions.register_for(Project) do
# Project must be active for all the specified permissions # Project must be active for all the specified permissions
%i(manage_project %i(read_project
manage_project
archive_project archive_project
create_experiments create_experiments
create_comments_in_project create_comments_in_project

View file

@ -11,29 +11,28 @@
<input class="project-card-selector" type="checkbox" name="project-<%= project.id %>"> <input class="project-card-selector" type="checkbox" name="project-<%= project.id %>">
</div> </div>
<h3 class="panel-title"> <div class="panel-title">
<span class="fas <%= active ? 'fa-arrow-alt-circle-right' : 'fa-archive' %> "></span>
<% if active %> <% if active %>
<i class="fas fa-arrow-alt-circle-right"></i>
<%= link_to project.name, project_path(project), id: "#{project.id}-project-canvas-link" %> <%= link_to project.name, project_path(project), id: "#{project.id}-project-canvas-link" %>
<% else %> <% else %>
<i class="fas fa-archive"></i>
<%= project.name %> <%= project.name %>
<% end %> <% end %>
</h3> </div>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
<% if project.hidden? %> <% if project.hidden? %>
<div class="col-xs-1"> <div class="col-xs-1">
<i class="fas fa-eye-slash" aria-hidden="true" title="<%= t("projects.index.hidden") %>"></i> <i class="fas fa-lg fa-eye-slash" aria-hidden="true" title="<%= t("projects.index.hidden") %>"></i>
</div> </div>
<div class="col-xs-10"> <div class="col-xs-10">
<span><%= t("projects.index.hidden") %></span> <span><%= t("projects.index.hidden") %></span>
</div> </div>
<% else %> <% else %>
<div class="col-xs-1"> <div class="col-xs-1">
<i class="fas fa-eye" aria-hidden="true" title="<%= t("projects.index.visible") %>"></i> <i class="fas fa-lg fa-eye" aria-hidden="true" title="<%= t("projects.index.visible") %>"></i>
</div> </div>
<div class="col-xs-10"> <div class="col-xs-10">
<span><%= t("projects.index.visible") %></span> <span><%= t("projects.index.visible") %></span>
@ -54,12 +53,16 @@
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs nav-tabs-less" role="tablist" data-hook="project-footer-icons"> <ul class="nav nav-tabs nav-tabs-less" role="tablist" data-hook="project-footer-icons">
<li role="presentation"> <li role="presentation">
<a class="btn btn-link" href="<%= url_for project_project_activities_path(project_id: project.id, format: :json) %>" aria-controls="activities-<%= project.id %>" role="tab" data-remote="true"> <a class="btn btn-link <%= 'disabled' unless active %>"
href="<%= url_for project_project_activities_path(project_id: project.id, format: :json) %>"
aria-controls="activities-<%= project.id %>" role="tab" data-remote="true">
<span class="fas fa-list"></span> <span class="fas fa-list"></span>
</a> </a>
</li> </li>
<li class="pull-right" role="presentation"> <li class="pull-right" role="presentation">
<a class="btn btn-link" href="<%= url_for project_project_comments_path(project_id: project.id, format: :json) %>" aria-controls="comments-<%= project.id %>" role="tab" data-remote="true"> <a class="btn btn-link <%= 'disabled' unless active %>"
href="<%= url_for project_project_comments_path(project_id: project.id, format: :json) %>"
aria-controls="comments-<%= project.id %>" role="tab" data-remote="true">
<span class="fas fa-comment"></span> <span class="fas fa-comment"></span>
<span class="badge badge-indicator comments-badge-indicator <%= 'hidden' unless project.comment_count.positive? %>" <span class="badge badge-indicator comments-badge-indicator <%= 'hidden' unless project.comment_count.positive? %>"
data-linked-id="<%= project.id %>"> data-linked-id="<%= project.id %>">
@ -68,7 +71,9 @@
</a> </a>
</li> </li>
<li class="pull-right" role="presentation"> <li class="pull-right" role="presentation">
<a class="btn btn-link" href="<%= url_for notifications_project_path(id: project.id, format: :json) %>" aria-controls="notifications-<%= project.id %>" role="tab" data-remote="true"> <a class="btn btn-link <%= 'disabled' unless active %>"
href="<%= url_for notifications_project_path(id: project.id, format: :json) %>"
aria-controls="notifications-<%= project.id %>" role="tab" data-remote="true">
<span class="fas fa-bell"></span> <span class="fas fa-bell"></span>
<% if project.notification_count.positive? %> <% if project.notification_count.positive? %>
<span class="badge badge-indicator"><%= project.notification_count %></span> <span class="badge badge-indicator"><%= project.notification_count %></span>
@ -76,7 +81,9 @@
</a> </a>
</li> </li>
<li class="pull-right" role="presentation"> <li class="pull-right" role="presentation">
<a class="btn btn-link" href="<%= url_for project_user_projects_path(project_id: project.id, format: :json) %>" aria-controls="users-<%= project.id %>" role="tab" data-remote="true"> <a class="btn btn-link <%= 'disabled' unless active %>"
href="<%= url_for project_user_projects_path(project_id: project.id, format: :json) %>"
aria-controls="users-<%= project.id %>" role="tab" data-remote="true">
<span class="fas fa-users"></span> <span class="fas fa-users"></span>
<span class="badge badge-indicator users-badge-indicator <%= 'hidden' unless project.user_count.positive? %>" <span class="badge badge-indicator users-badge-indicator <%= 'hidden' unless project.user_count.positive? %>"
data-linked-id="<%= project.id %>"> data-linked-id="<%= project.id %>">

View file

@ -1,21 +1,23 @@
<% cache project do %> <% cache project do %>
<% active = !project.archived %> <% active = !project.archived %>
<% if (true || active && can_manage_project?(project)) || (!active && can_restore_project?(project)) %> <% if (active && (can_manage_project?(project) || can_archive_project?(project))) || (!active && can_restore_project?(project)) %>
<div class="dropdown pull-right"> <div class="dropdown pull-right">
<button class="btn btn-link dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <button class="btn btn-link dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="fas fa-ellipsis-v"></span> <span class="caret"></span>
</button> </button>
<% project_form = nil %> <% project_form = nil %>
<%= form_for project, namespace: view_mode, format: :json, method: :put, remote: true do |f| %> <%= form_for project, format: :json, method: :put, remote: true do |f| %>
<% project_form = f %> <% project_form = f %>
<%= f.hidden_field :archived, value: active %> <%= f.hidden_field :archived, value: active %>
<% end %> <% end %>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1" style="top: 105%;"> <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1" style="top: 105%;">
<li class="dropdown-header"><%= t('projects.index.options_header') %></li> <li class="dropdown-header"><%= t('projects.index.options_header') %></li>
<% if active %> <% if active && can_manage_project?(project) %>
<li> <li>
<%= link_to t("projects.index.edit_option"), edit_project_path(project, format: :json), remote: true, "data-action" => "edit" %> <%= link_to t("projects.index.edit_option"), edit_project_path(project, format: :json), remote: true, "data-action" => "edit" %>
</li> </li>
<% end %>
<% if active && can_archive_project?(project) %>
<li> <li>
<a href="#" <a href="#"
class="form-submit-link" class="form-submit-link"
@ -23,7 +25,7 @@
data-submit-form="<%= project_form.options[:html][:id] %>" data-submit-form="<%= project_form.options[:html][:id] %>"
data-confirm-form="<%= t("projects.index.archive_confirm") %>"><%= t 'projects.index.archive_option' %></a> data-confirm-form="<%= t("projects.index.archive_confirm") %>"><%= t 'projects.index.archive_option' %></a>
</li> </li>
<% else %> <% elsif !active %>
<li> <li>
<a href="#" <a href="#"
class="form-submit-link" class="form-submit-link"