diff --git a/app/assets/javascripts/my_modules/protocols.js.erb b/app/assets/javascripts/my_modules/protocols.js.erb index 3b2f3384e..73bbdae52 100644 --- a/app/assets/javascripts/my_modules/protocols.js.erb +++ b/app/assets/javascripts/my_modules/protocols.js.erb @@ -294,6 +294,9 @@ function initLoadFromRepositoryTable(content) { { data: "5" }, { data: "6" } ], + oLanguage: { + sSearch: "Filter:" + }, rowCallback: function(row, data, dataIndex) { // Get row ID var rowId = data["DT_RowId"]; diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js index f609a0699..ac6fdfb36 100644 --- a/app/assets/javascripts/protocols/index.js +++ b/app/assets/javascripts/protocols/index.js @@ -65,6 +65,9 @@ function initProtocolsTable() { { data: "5" }, { data: "6" } ], + oLanguage: { + sSearch: "Filter:" + }, rowCallback: function(row, data, dataIndex) { // Get row ID var rowId = data["DT_RowId"]; diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index 69fe217a0..b09cab854 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -43,7 +43,7 @@ var task_button = $("[data-action='complete-task']"); task_button.attr('data-action', 'uncomplete-task'); task_button.find('.btn') - .removeClass('btn-primary').addClass('btn-default'); + .removeClass('btn-success').addClass('btn-default'); $('.task-due-date').html(data.module_header_due_date_label); $('.task-state-label').html(data.module_state_label); task_button @@ -80,7 +80,8 @@ button = step.find("[data-action='complete-step']"); button.attr("data-action", "uncomplete-step"); - button.find(".btn").removeClass("btn-primary").addClass("btn-default"); + button.find(".btn").removeClass("btn-success").addClass("btn-default"); + button.find("button").html(' ' + data.new_title); if (data.task_ready_to_complete) { $('#completed-task-modal').modal('show'); @@ -92,10 +93,9 @@ button = step.find("[data-action='uncomplete-step']"); button.attr("data-action", "complete-step"); - button.find(".btn").removeClass("btn-default").addClass("btn-primary"); + button.find(".btn").removeClass("btn-default").addClass("btn-success"); + button.find("button").html(' ' + data.new_title); } - - button.find("button").html(data.new_title); }, error: function (data) { console.log ("error"); diff --git a/app/assets/javascripts/reports/reports_datatable.js.erb b/app/assets/javascripts/reports/reports_datatable.js.erb index 48c35055e..7175e51d3 100644 --- a/app/assets/javascripts/reports/reports_datatable.js.erb +++ b/app/assets/javascripts/reports/reports_datatable.js.erb @@ -146,6 +146,9 @@ 'sWidth': '1%', 'render': renderCheckboxHTML }], + 'oLanguage': { + 'sSearch': "Filter:" + }, 'fnDrawCallback': tableDrowCallback, 'createdRow': appendEditPathToRow }); diff --git a/app/assets/javascripts/repositories/repository_datatable.js.erb b/app/assets/javascripts/repositories/repository_datatable.js.erb index 8d8093df5..a8081ae55 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js.erb +++ b/app/assets/javascripts/repositories/repository_datatable.js.erb @@ -92,6 +92,9 @@ var RepositoryDatatable = (function(global) { "class='record-info-link'>" + data + ''; } }], + oLanguage: { + sSearch: "Filter:" + }, rowCallback: function(row, data) { // Get row ID var rowId = data.DT_RowId; diff --git a/app/assets/javascripts/users/settings/teams/show.js b/app/assets/javascripts/users/settings/teams/show.js index 0ba029f14..8183b9b64 100644 --- a/app/assets/javascripts/users/settings/teams/show.js +++ b/app/assets/javascripts/users/settings/teams/show.js @@ -120,7 +120,10 @@ function initUsersTable() { { data: "3" }, { data: "4" }, { data: "5" } - ] + ], + oLanguage: { + sSearch: "Filter:" + } }); } diff --git a/app/assets/stylesheets/constants.scss b/app/assets/stylesheets/constants.scss index 35d308d18..4e2aa5c3b 100644 --- a/app/assets/stylesheets/constants.scss +++ b/app/assets/stylesheets/constants.scss @@ -192,15 +192,15 @@ $btn-border-radius-small: $border-radius-small; // $grid-gutter-width: 30px; // $grid-float-breakpoint: $screen-sm-min; // $grid-float-breakpoint-max: ($grid-float-breakpoint - 1); -// -// // Container sizes -// $container-tablet: (720px + $grid-gutter-width); -// $container-sm: $container-tablet; -// $container-desktop: (940px + $grid-gutter-width); -// $container-md: $container-desktop; -// $container-large-desktop: (1140px + $grid-gutter-width); -// $container-lg: $container-large-desktop; -// + +// Container sizes +$container-tablet: auto; +$container-sm: auto; +$container-desktop: auto; +$container-md: auto; +$container-large-desktop: auto; +$container-lg: auto; + // // Navbar // $navbar-height: 50px; // $navbar-margin-bottom: $line-height-computed; diff --git a/app/assets/stylesheets/partials/_sidebar.scss b/app/assets/stylesheets/partials/_sidebar.scss index ec830b72e..72e3f07d9 100644 --- a/app/assets/stylesheets/partials/_sidebar.scss +++ b/app/assets/stylesheets/partials/_sidebar.scss @@ -22,6 +22,7 @@ $toggle-btn-size: 50px; transition: all 0.5s ease; #sidebar-wrapper { + box-shadow: 0 1px 4px $color-alto; background-color: $color-white; z-index: 1000; position: fixed; diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 7d992987a..2651b54d5 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -5,7 +5,9 @@ $color-group-hover: $brand-primary; $color-module-hover: $brand-default; -#new-project-modal, #edit-project-modal { +#new-project-modal, +#edit-project-modal, +#copy-to-repository-modal { .btn-group label.btn-primary:not(.active) { background-color: $color-white; border-color: $color-silver; diff --git a/app/assets/stylesheets/themes/main_navigation.scss b/app/assets/stylesheets/themes/main_navigation.scss index 12b455848..6d7fcd602 100644 --- a/app/assets/stylesheets/themes/main_navigation.scss +++ b/app/assets/stylesheets/themes/main_navigation.scss @@ -2,6 +2,7 @@ @import "mixins"; #main-nav { + box-shadow: 0 3px 6px $color-alto; margin-bottom: 0; } diff --git a/app/assets/stylesheets/themes/repositories.scss b/app/assets/stylesheets/themes/repositories.scss index 81f9a7a6b..e1cbb9d74 100644 --- a/app/assets/stylesheets/themes/repositories.scss +++ b/app/assets/stylesheets/themes/repositories.scss @@ -1,9 +1,5 @@ @import "constants"; -.repository-columns-header { - margin-top: 30px; -} - .repository-columns-body { margin-top: 50px; @@ -36,5 +32,9 @@ } #content-reports-index { - margin-top: 50px; + margin-top: 15px; +} + +#repository-toolbar { + margin-top: 15px; } diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index c99424a57..80bc9fd8d 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -46,10 +46,16 @@ table { } } -#fluid-content { +#fluid-content:not(.no-second-nav-container) { padding-left: 15px; padding-right: 15px; - padding-top: 80px; + padding-top: 50px; +} + +.content-pane { + background-color: $color-white; + margin: 20px 0; + padding: 15px 20px; } .spacer { @@ -116,10 +122,6 @@ body { cursor: -webkit-grabbing; } -.bg-primary { - background-color: $brand-primary; -} - /* this rule is strict because the order of css files is not correct */ .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) { width: 100% !important; @@ -269,7 +271,7 @@ a[data-toggle="tooltip"] { } .nav-name { - padding: 15px 0; + padding: 5px 0; } ul.nav { @@ -529,6 +531,7 @@ ul.double-line > li { .page-header { border-color: $color-alto; + margin-top: 0; } .pagination > .active > a, @@ -682,7 +685,8 @@ ul.double-line > li { } #global-activity-page { - margin-top: 50px; + margin-top: 15px; + padding: 0; } .btn-more-activities { @@ -872,8 +876,10 @@ ul.content-module-activities { } .badge-icon { - font-size: 1.4em; + background-color: $color-silver; + color: $color-white; float: left; + font-size: 1.4em; padding: 6px 10px; & + .well-sm { @@ -936,6 +942,7 @@ ul.content-module-activities { position: absolute; & > .badge { + background: $brand-success; border-radius: 2em; float: left; font-size: 23.4px; @@ -955,6 +962,7 @@ ul.content-module-activities { } & > .badge.icon { + background-color: $color-silver; font-size: 16.5px; padding: 9px; } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cb7c7b3ac..0625b8a70 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -12,8 +12,12 @@ module ApplicationHelper end def project_page? - controller_name == 'projects' || - (controller_name == 'reports' && action_name == 'index') + controller_name == 'projects' && + action_name.in?(%w(show experiment_archive)) + end + + def all_projects_page? + controller_name == 'projects' && action_name.in?(%w(index archive)) end def display_tooltip(message, len = Constants::NAME_TRUNCATION_LENGTH) diff --git a/app/helpers/secondary_navigation_helper.rb b/app/helpers/secondary_navigation_helper.rb index de5477453..28f203f52 100644 --- a/app/helpers/secondary_navigation_helper.rb +++ b/app/helpers/secondary_navigation_helper.rb @@ -1,5 +1,13 @@ module SecondaryNavigationHelper + def is_all_projects_index? + action_name == 'index' + end + + def is_all_projects_archive? + action_name == 'archive' + end + def is_project_info? action_name == 'show' end @@ -57,7 +65,9 @@ module SecondaryNavigationHelper end def title_element - if project_page? + if all_projects_page? + current_team + elsif project_page? @project elsif experiment_page? @experiment diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index 1db715a76..35788b9ef 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -1,24 +1,26 @@ <% provide :head_title, t('nav.label.activities') %> -
-
- - <% if @vars[:more_activities_url].present? && @vars[:page] == 1 %> -
- - <%= t'activities.index.more_activities' %>
- <% end %>
diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb index d3fec473c..d5716e770 100644 --- a/app/views/experiments/canvas.html.erb +++ b/app/views/experiments/canvas.html.erb @@ -2,61 +2,63 @@ <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> -
-
-
- <% if can_manage_experiment?(@experiment) %> - <%=link_to canvas_edit_experiment_url(@experiment), - remote: true, - type: 'button', - id: 'edit-canvas-button', - data: { action: 'edit' }, - class: 'ajax btn btn-default' do %> - - - <% end %> - - - - <%= render partial: 'experiments/dropdown_actions.html.erb', - locals: { project: @project, experiment: @experiment } %> - - <% end %> -
- -
- <%=link_to canvas_full_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default active", "data-action" => "full_zoom", "data-toggle" => "button", "aria-pressed" => true do %> - - <% end %> - <%=link_to canvas_medium_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default", "data-action" => "medium_zoom" do %> - - <% end %> - <%=link_to canvas_small_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default", "data-action" => "small_zoom" do %> - - <% end %> -
-
- - <% if can_create_experiments?(@project) %> - <%= link_to new_project_experiment_url(@project), - remote: true, - type: "button", - id: 'new-experiment', - class: "btn btn-primary pull-right" do %> - - <%=t 'experiments.new.create' %> +
+
+
+
+ <% if can_manage_experiment?(@experiment) %> + <%=link_to canvas_edit_experiment_url(@experiment), + remote: true, + type: 'button', + id: 'edit-canvas-button', + data: { action: 'edit' }, + class: 'ajax btn btn-default' do %> + + + <% end %> + + + + <%= render partial: 'experiments/dropdown_actions.html.erb', + locals: { project: @project, experiment: @experiment } %> + + <% end %> +
+ +
+ <%=link_to canvas_full_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default active", "data-action" => "full_zoom", "data-toggle" => "button", "aria-pressed" => true do %> + <% end %> - <% end %> + <%=link_to canvas_medium_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default", "data-action" => "medium_zoom" do %> + + <% end %> + <%=link_to canvas_small_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default", "data-action" => "small_zoom" do %> + + <% end %> +
+
+ + <% if can_create_experiments?(@project) %> + <%= link_to new_project_experiment_url(@project), + remote: true, + type: "button", + id: 'new-experiment', + class: "btn btn-primary pull-right" do %> + + <%=t 'experiments.new.create' %> + <% end %> + <% end %> +
-
-
- <%= render partial: 'canvas/full_zoom', locals: { experiment: @experiment, my_modules: @active_modules } %> +
+ <%= render partial: 'canvas/full_zoom', locals: { experiment: @experiment, my_modules: @active_modules } %> +
diff --git a/app/views/experiments/module_archive.html.erb b/app/views/experiments/module_archive.html.erb index e41c671a1..855949dd9 100644 --- a/app/views/experiments/module_archive.html.erb +++ b/app/views/experiments/module_archive.html.erb @@ -2,27 +2,29 @@ <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> -<% if @experiment.archived_modules.count > 0 %> -
- <% @experiment.archived_modules.each_with_index do |my_module, i| %> -
- <%= render partial: "experiments/module_archive/my_module.html.erb", locals: { my_module: my_module} %> -
- <% if (i+1) % 6 == 0 %> -
+
+ <% if @experiment.archived_modules.count > 0 %> +
+ <% @experiment.archived_modules.each_with_index do |my_module, i| %> +
+ <%= render partial: "experiments/module_archive/my_module.html.erb", locals: { my_module: my_module} %> +
+ <% if (i+1) % 6 == 0 %> +
+ <% end %> + <% if (i+1) % 4 == 0 %> +
+ <% end %> + <% if (i+1) % 3 == 0 %> +
+ <% end %> <% end %> - <% if (i+1) % 4 == 0 %> -
- <% end %> - <% if (i+1) % 3 == 0 %> -
- <% end %> - <% end %> -
-<% else %> -
-
- <%=t "experiments.module_archive.no_archived_modules" %>
-
-<% end %> + <% else %> +
+
+ <%=t "experiments.module_archive.no_archived_modules" %> +
+
+ <% end %> +
diff --git a/app/views/my_modules/_module_header.html.erb b/app/views/my_modules/_module_header.html.erb index b8d932514..3806eb640 100644 --- a/app/views/my_modules/_module_header.html.erb +++ b/app/views/my_modules/_module_header.html.erb @@ -1,6 +1,6 @@
-
+
@@ -10,7 +10,7 @@
-
+
<% if can_manage_module?(@my_module) %> <%= link_to due_date_my_module_path(@my_module, format: :json), remote: true, class: "due-date-link", style: "color: inherit" do %> @@ -38,7 +38,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
<% if can_manage_module?(@my_module) %> @@ -74,7 +74,7 @@
-
+
<% if can_manage_module?(@my_module) %> <%= link_to description_my_module_path(@my_module, format: :json), remote: true, class: "description-link", style: "color: inherit" do %> diff --git a/app/views/my_modules/_result.html.erb b/app/views/my_modules/_result.html.erb index 8bee5659f..4f5aaff63 100644 --- a/app/views/my_modules/_result.html.erb +++ b/app/views/my_modules/_result.html.erb @@ -1,6 +1,6 @@
- + <% if result.is_text %> <% elsif result.is_table %> diff --git a/app/views/my_modules/activities.html.erb b/app/views/my_modules/activities.html.erb index c6be0e62e..5365906b8 100644 --- a/app/views/my_modules/activities.html.erb +++ b/app/views/my_modules/activities.html.erb @@ -2,24 +2,26 @@ <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> -
- <% if @activities.length == 0 %> -
- <%= t 'my_modules.activities.no_activities' %> -
- <% else %> -
- <%= render partial: "my_modules/activities/list_activities.html.erb" %> - - <% if @overflown %> -
- - <%= t('my_modules.activities.more_activities') %> -
- <% end %> +
+
+ <% if @activities.length == 0 %> +
+ <%= t 'my_modules.activities.no_activities' %> +
+ <% else %> +
+ <%= render partial: "my_modules/activities/list_activities.html.erb" %> + + <% if @overflown %> +
+ + <%= t('my_modules.activities.more_activities') %> +
+ <% end %> +
+ <% end %>
-<% end %>
<%= javascript_include_tag("my_modules/activities") %> diff --git a/app/views/my_modules/archive.html.erb b/app/views/my_modules/archive.html.erb index cd698b95f..57d3994eb 100644 --- a/app/views/my_modules/archive.html.erb +++ b/app/views/my_modules/archive.html.erb @@ -2,17 +2,23 @@ <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> -
-
- <% i = 0 %> - <% @archived_results.each do |result| %> - <%= render partial: "my_modules/archive/result.html.erb", locals: { result: result } %> - <% i = i + 1 %> - <% end %> - <% if i == 0 %> - <%=t "my_modules.module_archive.no_archived_results" %> - <% end %> +
+
+
+ <% i = 0 %> + <% @archived_results.each do |result| %> + <%= render partial: "my_modules/archive/result.html.erb", locals: { result: result } %> + <% i = i + 1 %> + <% end %> +
+ <% if i == 0 %> +
+
+ <%=t "my_modules.module_archive.no_archived_results" %> +
+
+ <% end %>
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb index 89e2be322..6ad77a783 100644 --- a/app/views/my_modules/protocols.html.erb +++ b/app/views/my_modules/protocols.html.erb @@ -4,18 +4,20 @@ <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> -<%= render partial: "module_header" %> +
+ <%= render partial: "module_header" %> -
-
- <%= render partial: "my_modules/protocols/protocol_status_bar.html.erb" %> +
+
+ <%= render partial: "my_modules/protocols/protocol_status_bar.html.erb" %> +
+ <%= render partial: "my_modules/protocols/protocol_buttons.html.erb" %> + <%= render partial: "my_modules/state_buttons.html.erb" %>
- <%= render partial: "my_modules/protocols/protocol_buttons.html.erb" %> - <%= render partial: "my_modules/state_buttons.html.erb" %> -
-
- <%= render partial: "protocols/steps.html.erb" %> +
+ <%= render partial: "protocols/steps.html.erb" %> +
diff --git a/app/views/my_modules/repository.html.erb b/app/views/my_modules/repository.html.erb index a524cd49d..c06b4281c 100644 --- a/app/views/my_modules/repository.html.erb +++ b/app/views/my_modules/repository.html.erb @@ -5,43 +5,45 @@ <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> -

<%= @repository.name %>

+
+

<%= @repository.name %>

-
- - -
+
+ + +
-
- <%= render partial: "repositories/columns_reorder_dropdown" %> -
+
+ <%= render partial: "repositories/columns_reorder_dropdown" %> +
- + -
- <%= render partial: "repositories/repository_table", - locals: { - repository: @repository, - my_module: @my_module, - repository_index_link: repository_index_my_module_path(@my_module, @repository, format: :json) - } - %> +
+ <%= render partial: "repositories/repository_table", + locals: { + repository: @repository, + my_module: @my_module, + repository_index_link: repository_index_my_module_path(@my_module, @repository, format: :json) + } + %> +
<%= stylesheet_link_tag 'datatables' %> diff --git a/app/views/my_modules/results.html.erb b/app/views/my_modules/results.html.erb index 9ce275075..5a8fa7188 100644 --- a/app/views/my_modules/results.html.erb +++ b/app/views/my_modules/results.html.erb @@ -3,48 +3,50 @@ <%= render partial: "shared/secondary_navigation" %> <%= render partial: 'shared/drag_n_drop_overlay' %> -
-
- - +
+
+
+ + +
+ + <% if can_manage_module?(@my_module) %> + + + + + + + + + + + + + + <% end %>
- <% if can_manage_module?(@my_module) %> - - - - - - - - - - - - - +
+ +
+ <% ordered_result_of(@my_module).each do |result| %> + <%= render partial: "result", locals: { result: result } %> <% end %> -
- -
- -
-<% ordered_result_of(@my_module).each do |result| %> - <%= render partial: "result", locals: { result: result } %> -<% end %> +
<%= javascript_include_tag "handsontable.full.min" %> diff --git a/app/views/projects/archive.html.erb b/app/views/projects/archive.html.erb index 89bb349ee..7c472c447 100644 --- a/app/views/projects/archive.html.erb +++ b/app/views/projects/archive.html.erb @@ -1,52 +1,54 @@ <% provide(:head_title, t("projects.archive.head_title")) %> <%= render partial: "shared/sidebar" %> +<%= render partial: "shared/secondary_navigation" %> -<% if @archived_projects_by_teams.length > 0 %> -
+
+ <% if @archived_projects_by_teams.length > 0 %> +
-
+ -
- -
- - +
+
+
+
+ <% @archived_projects_by_teams.each do |team, projects| %> + <%= render partial: 'projects/archive/team_projects', + locals: {team: team, projects: projects} %> + <% end %> + <% else %> +
+
+

<%=t "projects.index.no_archived_projects" %>

+
+
+
+
+ <%= link_to t("projects.index.back_to_projects_index"), projects_path, data: { turbolinks: 'false' } %> +
+
+ +
+
- -
- - <% @archived_projects_by_teams.each do |team, projects| %> - <%= render partial: 'projects/archive/team_projects', - locals: {team: team, projects: projects} %> <% end %> -<% else %> - -
-
-
- -
-
-

<%=t "projects.index.no_archived_projects" %>

-
-
-
-
- <%= link_to t("projects.index.back_to_projects_index"), projects_path, data: { turbolinks: 'false' } %> -
-
-<% end %> +
diff --git a/app/views/projects/archive/_team_projects.html.erb b/app/views/projects/archive/_team_projects.html.erb index d15b74bba..c501786c5 100644 --- a/app/views/projects/archive/_team_projects.html.erb +++ b/app/views/projects/archive/_team_projects.html.erb @@ -1,5 +1,3 @@ -

<%= team.name %>

-
<% projects.each_index do |i| project = projects[i] %>
diff --git a/app/views/projects/experiment_archive.html.erb b/app/views/projects/experiment_archive.html.erb index dfd294719..3f63279e7 100644 --- a/app/views/projects/experiment_archive.html.erb +++ b/app/views/projects/experiment_archive.html.erb @@ -2,27 +2,29 @@ <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> -<% if @project.archived_experiments.count > 0 %> -
- <% @project.archived_experiments.each_with_index do |experiment, i| %> -
- <%= render partial: "projects/experiment_archive/experiment.html.erb", locals: { experiment: experiment} %> -
- <% if (i+1) % 6 == 0 %> -
+
+ <% if @project.archived_experiments.count > 0 %> +
+ <% @project.archived_experiments.each_with_index do |experiment, i| %> +
+ <%= render partial: "projects/experiment_archive/experiment.html.erb", locals: { experiment: experiment} %> +
+ <% if (i+1) % 6 == 0 %> +
+ <% end %> + <% if (i+1) % 4 == 0 %> +
+ <% end %> + <% if (i+1) % 3 == 0 %> +
+ <% end %> <% end %> - <% if (i+1) % 4 == 0 %> -
- <% end %> - <% if (i+1) % 3 == 0 %> -
- <% end %> - <% end %> -
-<% else %> -
-
- <%=t "projects.experiment_archive.no_archived_experiments" %>
-
-<% end %> + <% else %> +
+
+ <%=t "projects.experiment_archive.no_archived_experiments" %> +
+
+ <% end %> +
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index a915e32a6..bc4ea4e4d 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -1,6 +1,8 @@ <% provide(:head_title, t("projects.index.head_title")) %> <%= render partial: "shared/sidebar" %> +<%= render partial: "shared/secondary_navigation" %> +
<% if can_create_projects?(current_team) %> + <%= javascript_include_tag "projects/index", "data-turbolinks-track" => true %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index a0fe46e52..143ef9b23 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -2,58 +2,56 @@ <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> -
-
-
-
- -
- - -
- <% if can_create_experiments?(@project) %> - <%= link_to new_project_experiment_url(@project), - remote: true, - type: "button", - id: 'new-experiment', - class: 'btn btn-primary pull-right' do %> - - <% end %> - <% end %> -
-
-
-
-

<%= t'projects.show.page_title' %>

+
-
-
- <% @project.active_experiments(@current_sort).each_with_index do |experiment, index| %> - <%= render partial: 'projects/show/experiment', - locals: { experiment: experiment } %> +
+ <% @project.active_experiments(@current_sort).each_with_index do |experiment, index| %> + <%= render partial: 'projects/show/experiment', + locals: { experiment: experiment } %> - <%= content_tag(:div, '', class: 'clearfix visible-lg-block') if (index + 1) % 2 == 0 %> - <% end %> - <% if can_create_experiments?(@project) %> - <%= render 'projects/show/new_experiment' %> - <% end %> + <%= content_tag(:div, '', class: 'clearfix visible-lg-block') if (index + 1) % 2 == 0 %> + <% end %> + <% if can_create_experiments?(@project) %> + <%= render 'projects/show/new_experiment' %> + <% end %> +
+ <%= javascript_include_tag("experiments/dropdown_actions") %> <%= javascript_include_tag("projects/show") %> diff --git a/app/views/protocols/_header.html.erb b/app/views/protocols/_header.html.erb index a4e930a1d..ad8455cae 100644 --- a/app/views/protocols/_header.html.erb +++ b/app/views/protocols/_header.html.erb @@ -10,7 +10,7 @@
-
+
@@ -20,7 +20,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
<% if can_manage_protocol_in_repository?(@protocol) %> @@ -62,7 +62,7 @@
-
+
<% if can_manage_protocol_in_repository?(@protocol) %> @@ -84,7 +84,7 @@
-
+
<% if can_manage_protocol_in_repository?(@protocol) %> diff --git a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb index a16d6eaef..154c14640 100644 --- a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb +++ b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb @@ -2,7 +2,7 @@
- + <%= 1 %>     diff --git a/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb b/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb index 86d3b3cdd..5253d2ad3 100644 --- a/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb +++ b/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb @@ -8,7 +8,7 @@
- + <%= (counter) %>     diff --git a/app/views/protocols/import_export/_preview_templates.html.erb b/app/views/protocols/import_export/_preview_templates.html.erb index fc4a0488c..c5f6f67df 100644 --- a/app/views/protocols/import_export/_preview_templates.html.erb +++ b/app/views/protocols/import_export/_preview_templates.html.erb @@ -1,7 +1,7 @@
- +   diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb index 032e39c76..437e8e67d 100644 --- a/app/views/protocols/index.html.erb +++ b/app/views/protocols/index.html.erb @@ -1,143 +1,147 @@ <% provide(:head_title, t("protocols.index.head_title")) %> -<% if current_team %> -
    - - - -
-
-
- - <% if @type.in? [:public, :private] %> -
- <%= t(@type == :public ? "protocols.index.public_description" : "protocols.index.private_description") %> -
-
- data-url="<%= create_new_modal_protocols_path(team: @current_team, type: @type) %>"> - - - - - - - - - - - - <% if @type == :public %> - - - +
+ <% if current_team %> +
    + + + +
+
+
+ + <% if @type.in? [:public, :private] %> +
+ <%= t(@type == :public ? "protocols.index.public_description" : "protocols.index.private_description") %> +
+
+ data-url="<%= create_new_modal_protocols_path(team: @current_team, type: @type) %>"> + + - <% elsif @type == :private %> - - - + + + - <% end %> -
-
- - <% if can_create_protocols_in_repository?(@current_team) %> - - <% end %> - - - - -
- -
- - - - -
- <% else %> -
- <%= t("protocols.index.archive.description") %> -
-
- - - - -
- <% end %> - -
-
- - - - - - - - <% if @type == :public %> - - - <% elsif @type == :private %> - - - <% else %> - - + + + + + <% if @type == :public %> + + + + + <% elsif @type == :private %> + + + + + <% end %> + +
+ + <% if can_create_protocols_in_repository?(@current_team) %> +
- - - -
<%= t("protocols.index.thead_name") %><%= t("protocols.index.thead_keywords") %><%= t("protocols.index.thead_nr_of_linked_children") %><%= t("protocols.index.thead_published_by") %><%= t("protocols.index.thead_published_on") %><%= t("protocols.index.thead_added_by") %><%= t("protocols.index.thead_created_at") %><%= t("protocols.index.thead_archived_by") %><%= t("protocols.index.thead_archived_on") %><%= t("protocols.index.thead_updated_at") %>
+ + + <% end %> + + + + +
+ +
+ + + + +
+ <% else %> +
+ <%= t("protocols.index.archive.description") %> +
+
+ + + + +
+ <% end %> + +
+
+ + + + + + + + <% if @type == :public %> + + + <% elsif @type == :private %> + + + <% else %> + + + <% end %> + + + + +
<%= t("protocols.index.thead_name") %><%= t("protocols.index.thead_keywords") %><%= t("protocols.index.thead_nr_of_linked_children") %><%= t("protocols.index.thead_published_by") %><%= t("protocols.index.thead_published_on") %><%= t("protocols.index.thead_added_by") %><%= t("protocols.index.thead_created_at") %><%= t("protocols.index.thead_archived_by") %><%= t("protocols.index.thead_archived_on") %><%= t("protocols.index.thead_updated_at") %>
+
-
-<% else %> - -
-

<%=t 'protocols.index.no_teams.title' %>

-

<%=t 'protocols.index.no_teams.text' %>

-

- <%= link_to t('protocols.index.no_teams.btn'), teams_path, class: 'btn btn-primary' %> -

-
-<% end %> + <% else %> + +
+

<%=t 'protocols.index.no_teams.title' %>

+

<%=t 'protocols.index.no_teams.text' %>

+

+ <%= link_to t('protocols.index.no_teams.btn'), teams_path, class: 'btn btn-primary' %> +

+
+ <% end %> +
+
<%= render partial: "protocols/import_export/import_json_protocol_modal.html.erb" %> diff --git a/app/views/protocols/index/_protocol_preview_modal_body.html.erb b/app/views/protocols/index/_protocol_preview_modal_body.html.erb index aa8b04c67..1780de92b 100644 --- a/app/views/protocols/index/_protocol_preview_modal_body.html.erb +++ b/app/views/protocols/index/_protocol_preview_modal_body.html.erb @@ -1,6 +1,6 @@
-
+
@@ -10,7 +10,7 @@
-
+
@@ -20,7 +20,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
@@ -70,7 +70,7 @@ <% protocol.steps.order(:position).each do |step| %>
">
- <%= step.position + 1 %> + <%= step.position + 1 %>
diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb index 479ef9bd9..349249ad6 100644 --- a/app/views/reports/index.html.erb +++ b/app/views/reports/index.html.erb @@ -1,45 +1,47 @@ <% provide(:head_title, t('projects.reports.index.head_title').html_safe) %> <%= stylesheet_link_tag 'datatables' %> -
-
-
- <% if can_manage_reports?(current_team) %> - <%= link_to '#', class: 'btn btn-primary', id: 'new-report-btn', 'data-no-turbolink' => true do %> - - +
+
+
+
+ <% if can_manage_reports?(current_team) %> + <%= link_to '#', class: 'btn btn-primary', id: 'new-report-btn', 'data-no-turbolink' => true do %> + + + <% end %> + <%= link_to "", remote: true, class: "btn btn-default", id: "edit-report-btn" do %> + + + <% end %> + <%= link_to "", remote: true, class: "btn btn-default", id: "delete-reports-btn" do %> + + + <% end %> <% end %> - <%= link_to "", remote: true, class: "btn btn-default", id: "edit-report-btn" do %> - - - <% end %> - <%= link_to "", remote: true, class: "btn btn-default", id: "delete-reports-btn" do %> - - - <% end %> - <% end %> +
-
-
-
-
-
- - - - - - - - - - - - - -
<%=t 'projects.reports.index.thead_project_name' %><%=t 'projects.reports.index.thead_name' %><%=t 'projects.reports.index.thead_created_by' %><%=t 'projects.reports.index.thead_last_modified_by' %><%=t 'projects.reports.index.thead_created_at' %><%=t 'projects.reports.index.thead_updated_at' %>
+
+
+
+
+ + + + + + + + + + + + + +
<%=t 'projects.reports.index.thead_project_name' %><%=t 'projects.reports.index.thead_name' %><%=t 'projects.reports.index.thead_created_by' %><%=t 'projects.reports.index.thead_last_modified_by' %><%=t 'projects.reports.index.thead_created_at' %><%=t 'projects.reports.index.thead_updated_at' %>
+
diff --git a/app/views/repositories/index.html.erb b/app/views/repositories/index.html.erb index d6dca19ff..38230ef08 100644 --- a/app/views/repositories/index.html.erb +++ b/app/views/repositories/index.html.erb @@ -1,4 +1,5 @@ <% provide(:head_title, t("libraries.index.head_title")) %> +<% provide(:container_class, "no-second-nav-container") %> <% if current_team %> <%= render partial: "sidebar", locals: { repositories: @repositories } %> @@ -6,21 +7,23 @@ # show only if no repositories present. If the team will have them we will # handle this in left side navigation bar %> -
- <%=t 'libraries.index.no_libraries.text' %> - <% if can_create_repositories?(current_team) %> -

<%=t 'libraries.index.no_libraries.title' %>

-
- - - - - <% else %> -

<%=t 'libraries.index.no_libraries.no_permission_title' %>

- <% end %> +
+
+ <%=t 'libraries.index.no_libraries.text' %> + <% if can_create_repositories?(current_team) %> +

<%=t 'libraries.index.no_libraries.title' %>

+
+ + + + + <% else %> +

<%=t 'libraries.index.no_libraries.no_permission_title' %>

+ <% end %> +
<% else %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index c1662b303..b6897bd2e 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -1,141 +1,145 @@ <% provide(:head_title, t("libraries.show.head_title", library: @repository.name)) %> <%= stylesheet_link_tag 'datatables' %> +<% provide(:container_class, "no-second-nav-container") %> <%= render partial: "sidebar", locals: { repositories: @repositories } %>
-
+
+
- <% if can_create_repository_rows?(@repository.team) %> - - <% end %> + <% if can_create_repository_rows?(@repository.team) %> + + <% end %> -
-
-
> - - - +
+
+
> + + + +
+ + <% if can_perform_repository_actions(@repository) %> +
    +
  • + <%= t("repositories.index.options_dropdown.header") %> +
    • + <% if can_manage_repository?(@repository) %> +
  • + <%= link_to t('repositories.index.options_dropdown.rename'), + team_repository_rename_modal_path(current_team, repository_id: @repository), + class: "rename-repo-option", + remote: true %> +
    • + <% end %> + <% if can_create_repository_columns?(@repository.team) %> +
  • + <%= link_to t('repositories.index.options_dropdown.manage_columns'), + repository_repository_columns_path(@repository) %> +
    • + <% end %> + <% if can_create_repositories?(@repository.team) %> +
  • + <%= link_to t('repositories.index.options_dropdown.copy'), + team_repository_copy_modal_path(current_team, repository_id: @repository), + class: "copy-repo-option", + remote: true %> +
    • + <% end %> + <% if can_create_repository_rows?(@repository.team) %> +
  • + + <%= t('repositories.import_records.import') %> + +
  • + <% end %> + <% if can_read_team?(@repository.team) %> +
  • + + <%= t("my_modules.repository.export") %> + +
    • + <% end %> + <% if can_manage_repository?(@repository) %> + +
  • + <%= link_to t('repositories.index.modal_delete.delete'), + team_repository_destroy_modal_path(current_team, repository_id: @repository), + class: "delete-repo-option", + remote: true %> +
    • + <% end %> +
+ <% end %>
+
- <% if can_perform_repository_actions(@repository) %> -
    -
  • - <%= t("repositories.index.options_dropdown.header") %> -
    • - <% if can_manage_repository?(@repository) %> -
  • - <%= link_to t('repositories.index.options_dropdown.rename'), - team_repository_rename_modal_path(current_team, repository_id: @repository), - class: "rename-repo-option", - remote: true %> -
    • - <% end %> - <% if can_create_repository_columns?(@repository.team) %> -
  • - <%= link_to t('repositories.index.options_dropdown.manage_columns'), - repository_repository_columns_path(@repository) %> -
    • - <% end %> - <% if can_create_repositories?(@repository.team) %> -
  • - <%= link_to t('repositories.index.options_dropdown.copy'), - team_repository_copy_modal_path(current_team, repository_id: @repository), - class: "copy-repo-option", - remote: true %> -
    • - <% end %> - <% if can_create_repository_rows?(@repository.team) %> -
  • - - <%= t('repositories.import_records.import') %> - -
  • - <% end %> - <% if can_read_team?(@repository.team) %> -
  • - - <%= t("my_modules.repository.export") %> - -
    • - <% end %> - <% if can_manage_repository?(@repository) %> - -
  • - <%= link_to t('repositories.index.modal_delete.delete'), - team_repository_destroy_modal_path(current_team, repository_id: @repository), - class: "delete-repo-option", - remote: true %> -
    • - <% end %> -
- <% end %> + +
+
+ <% if can_create_repositories?(@repository.team) %> + + + + + <% end %> +
+ <%= render partial: "columns_reorder_dropdown", formats: :html %>
- -
-
- <% if can_create_repositories?(@repository.team) %> - - - - - <% end %> -
- <%= render partial: "columns_reorder_dropdown", formats: :html %> + + + + + + <%= render partial: "repositories/repository_table.html.erb", + locals: { + repository: @repository, + repository_index_link: repository_table_index_path(@repository) + } + %>
- - - - - -<%= render partial: "repositories/repository_table.html.erb", - locals: { - repository: @repository, - repository_index_link: repository_table_index_path(@repository) - } -%> <%= render partial: 'repositories/import_repository_records_modal.html.erb', locals: { repository: @repository } %> diff --git a/app/views/repository_columns/index.html.erb b/app/views/repository_columns/index.html.erb index f8f4c4b8c..e9d674617 100644 --- a/app/views/repository_columns/index.html.erb +++ b/app/views/repository_columns/index.html.erb @@ -1,5 +1,6 @@ <% provide(:head_title, t('libraries.repository_columns.head_title', repository: @repository.name)) %> -
+ +
<%= link_to t('libraries.repository_columns.index.back_to_repository_html', repository: @repository.name), diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index f4af835a4..5c4c1cced 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -1,325 +1,327 @@ <% provide(:head_title, t("search.index.head_title")) %> -
-

<%= t('search.index.results_title_html', query: @display_query) %>

-
- -
-
- <%= form_tag search_path, - method: :get, - role: 'search' do %> -
-
- - - - +
+
+

<%= t('search.index.results_title_html', query: @display_query) %>

+
+ +
+
+ <%= form_tag search_path, + method: :get, + role: 'search' do %> +
+
+ + + + +
+ + +
- - - -
- <% end %> + <% end %> +
+ + <%= form_tag search_path, method: :get do %> + <%= hidden_field_tag :q, @search_query %> + <%= hidden_field_tag :category, @search_category %> + +
+
+ +
+ + <% if not @search_category.empty? %> +
+ +
+ <% if @search_results_count == 0 %> +

<%= t'search.index.error.no_results', q: @search_query %>

+ <% end %> + +
+ + <% if @search_category == :projects and @project_search_count > 0 %> + <%= render 'search/results/projects', search_query: @search_query, results: @project_results %> + <% end %> + <% if @search_category == :experiments and @experiment_search_count > 0 %> + <%= render 'search/results/experiments', search_query: @search_query, results: @experiment_results %> + <% end %> + <% if @search_category == :modules and @module_search_count > 0 %> + <%= render 'search/results/modules', search_query: @search_query, results: @module_results %> + <% end %> + <% if @search_category == :results and @result_search_count > 0 %> + <%= render 'search/results/results', search_query: @search_query, results: @result_results %> + <% end %> + <% if @search_category == :tags and @tag_search_count > 0 %> + <%= render 'search/results/tags', search_query: @search_query, results: @tag_results %> + <% end %> + <% if @search_category == :reports and @report_search_count > 0 %> + <%= render 'search/results/reports', search_query: @search_query, results: @report_results %> + <% end %> + <% if @search_category == :protocols and @protocol_search_count > 0 %> + <%= render 'search/results/protocols', search_query: @search_query, results: @protocol_results %> + <% end %> + <% if @search_category == :steps and @step_search_count > 0 %> + <%= render 'search/results/steps', search_query: @search_query, results: @step_results %> + <% end %> + <% if @search_category == :checklists and @checklist_search_count > 0 %> + <%= render 'search/results/checklists', search_query: @search_query, results: @checklist_results %> + <% end %> + <% if @search_category == :repositories and @repository_search_count_total > 0 %> + <%= render 'search/results/repositories', search_query: @search_query, results: @repository_results, repository: @repository %> + <% end %> + <% if @search_category == :assets and @asset_search_count > 0 %> + <%= render 'search/results/assets', search_query: @search_query, results: @asset_results %> + <% end %> + <% if @search_category == :tables and @table_search_count > 0 %> + <%= render 'search/results/tables', search_query: @search_query, results: @table_results %> + <% end %> + <% if @search_category == :comments and @comment_search_count > 0 %> + <%= render 'search/results/comments', search_query: @search_query, results: @comment_results %> + <% end %> + +
+
+ <% end %> +
+ + <% end %> + + <% if @search_pages > 1 %> + + <% end %>
-<%= form_tag search_path, method: :get do %> - <%= hidden_field_tag :q, @search_query %> - <%= hidden_field_tag :category, @search_category %> - -
-
- -
- - <% if not @search_category.empty? %> -
- -
- <% if @search_results_count == 0 %> -

<%= t'search.index.error.no_results', q: @search_query %>

- <% end %> - -
- - <% if @search_category == :projects and @project_search_count > 0 %> - <%= render 'search/results/projects', search_query: @search_query, results: @project_results %> - <% end %> - <% if @search_category == :experiments and @experiment_search_count > 0 %> - <%= render 'search/results/experiments', search_query: @search_query, results: @experiment_results %> - <% end %> - <% if @search_category == :modules and @module_search_count > 0 %> - <%= render 'search/results/modules', search_query: @search_query, results: @module_results %> - <% end %> - <% if @search_category == :results and @result_search_count > 0 %> - <%= render 'search/results/results', search_query: @search_query, results: @result_results %> - <% end %> - <% if @search_category == :tags and @tag_search_count > 0 %> - <%= render 'search/results/tags', search_query: @search_query, results: @tag_results %> - <% end %> - <% if @search_category == :reports and @report_search_count > 0 %> - <%= render 'search/results/reports', search_query: @search_query, results: @report_results %> - <% end %> - <% if @search_category == :protocols and @protocol_search_count > 0 %> - <%= render 'search/results/protocols', search_query: @search_query, results: @protocol_results %> - <% end %> - <% if @search_category == :steps and @step_search_count > 0 %> - <%= render 'search/results/steps', search_query: @search_query, results: @step_results %> - <% end %> - <% if @search_category == :checklists and @checklist_search_count > 0 %> - <%= render 'search/results/checklists', search_query: @search_query, results: @checklist_results %> - <% end %> - <% if @search_category == :repositories and @repository_search_count_total > 0 %> - <%= render 'search/results/repositories', search_query: @search_query, results: @repository_results, repository: @repository %> - <% end %> - <% if @search_category == :assets and @asset_search_count > 0 %> - <%= render 'search/results/assets', search_query: @search_query, results: @asset_results %> - <% end %> - <% if @search_category == :tables and @table_search_count > 0 %> - <%= render 'search/results/tables', search_query: @search_query, results: @table_results %> - <% end %> - <% if @search_category == :comments and @comment_search_count > 0 %> - <%= render 'search/results/comments', search_query: @search_query, results: @comment_results %> - <% end %> - -
-
- <% end %> -
- -<% end %> - -<% if @search_pages > 1 %> - -<% end %> - <%= javascript_include_tag('search') %> diff --git a/app/views/shared/_left_menu_bar.html.erb b/app/views/shared/_left_menu_bar.html.erb index 50a6f7812..a72cc5e52 100644 --- a/app/views/shared/_left_menu_bar.html.erb +++ b/app/views/shared/_left_menu_bar.html.erb @@ -37,12 +37,6 @@ <%= t('left_menu_bar.reports') %> <% end %> -
  • "> - <%= link_to edit_user_registration_path, id: "settings-link", title: t('left_menu_bar.settings') do %> - - <%= t('left_menu_bar.settings') %> - <% end %> -
    • "> @@ -76,6 +70,12 @@ target: "_blank" %>
    +
  • "> + <%= link_to edit_user_registration_path, id: "settings-link", title: t('left_menu_bar.settings') do %> + + <%= t('left_menu_bar.settings') %> + <% end %> +
    • diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb index 7387bd372..50907f3b2 100644 --- a/app/views/shared/_secondary_navigation.html.erb +++ b/app/views/shared/_secondary_navigation.html.erb @@ -17,7 +17,23 @@ -
    +

    <%= truncate(title_element.name, length: Constants::NAME_TRUNCATION_LENGTH) %> -

    +
    diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb index 7b6659915..caf372025 100644 --- a/app/views/shared/_sidebar.html.erb +++ b/app/views/shared/_sidebar.html.erb @@ -2,7 +2,7 @@
      - <% if project_page? && action_name.in?(%w(index archive)) || + <% if all_projects_page? || sample_types_page_project? || sample_groups_page_project? %> diff --git a/app/views/shared/sidebar/_projects.html.erb b/app/views/shared/sidebar/_projects.html.erb index f22f129b9..b0a379bfb 100644 --- a/app/views/shared/sidebar/_projects.html.erb +++ b/app/views/shared/sidebar/_projects.html.erb @@ -3,7 +3,7 @@ <% @projects_by_teams.each do |team, projects| %> <% projects.each do |project| %> - <% if (project_page? && action_name.in?(%w(show experiment_archive)) || + <% if (project_page? || sample_types_page_project? || sample_groups_page_project?) && project == @project %>
    • diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb index 2ba98d0fc..fe40594db 100644 --- a/app/views/steps/_step.html.erb +++ b/app/views/steps/_step.html.erb @@ -1,6 +1,6 @@
      ">
      - <%= step.position + 1 %> + <%= step.position + 1 %>
      @@ -126,13 +126,19 @@
      - +
      <% else %>
      - +
      <% end %> <% end %> diff --git a/app/views/user_notifications/index.html.erb b/app/views/user_notifications/index.html.erb index 6cfbefdbd..89d2b33f9 100644 --- a/app/views/user_notifications/index.html.erb +++ b/app/views/user_notifications/index.html.erb @@ -1,26 +1,29 @@ <% provide(:head_title, sanitize_input(t("notifications.title"))) %> -
      -
      - <%= t('notifications.title') %><%= link_to t('nav.user.settings'), preferences_path %> -
      -
      -
        - <% if @notifications.count > 0 %> - <%= render 'list', notifications: @notifications %> - <% else %> -
      • - <%= t('notifications.no_notifications') %> -
        • + +
        +
        +
        + <%= t('notifications.title') %><%= link_to t('nav.user.settings'), preferences_path %> +
        +
        +
          + <% if @notifications.count > 0 %> + <%= render 'list', notifications: @notifications %> + <% else %> +
        • + <%= t('notifications.no_notifications') %> +
          • + <% end %> +
        +
        + <% if @overflown %> +
        + + <%= t('notifications.show_more') %> + +
        <% end %> -
      - <% if @overflown %> -
      - - <%= t('notifications.show_more') %> - -
      - <% end %>
      <%= javascript_include_tag("notifications") %> diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index 09e7bb067..76f56c518 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -1,14 +1,15 @@ <% provide(:head_title, t("users.registrations.edit.head_title")) %> +<% provide(:container_class, "no-second-nav-container") %> <%= render partial: "users/settings/sidebar" %>
      -
      +
      -

      <%=t "users.registrations.edit.title" %>

      +

      <%=t "users.registrations.edit.title" %>

      <% if not resource.errors.empty? %>
      @@ -203,7 +204,7 @@
      -

      <%=t "users.statistics.title" %>

      +

      <%=t "users.statistics.title" %>

      • <%= @user.statistics[:number_of_teams]%>

        diff --git a/app/views/users/settings/account/addons/index.html.erb b/app/views/users/settings/account/addons/index.html.erb index 6022900b6..798ae97f6 100644 --- a/app/views/users/settings/account/addons/index.html.erb +++ b/app/views/users/settings/account/addons/index.html.erb @@ -1,8 +1,9 @@ <% provide(:head_title, t('users.settings.account.addons.head_title')) %> +<% provide(:container_class, "no-second-nav-container") %> <%= render partial: 'users/settings/sidebar.html.erb' %>
        -
        +
        diff --git a/app/views/users/settings/account/preferences/index.html.erb b/app/views/users/settings/account/preferences/index.html.erb index 278bd961e..5585feb34 100644 --- a/app/views/users/settings/account/preferences/index.html.erb +++ b/app/views/users/settings/account/preferences/index.html.erb @@ -1,8 +1,9 @@ <% provide(:head_title, t("users.settings.account.preferences.head_title")) %> +<% provide(:container_class, "no-second-nav-container") %> <%= render partial: "users/settings/sidebar.html.erb" %>
        -
        +
        diff --git a/app/views/users/settings/teams/index.html.erb b/app/views/users/settings/teams/index.html.erb index 6787c1319..544542421 100644 --- a/app/views/users/settings/teams/index.html.erb +++ b/app/views/users/settings/teams/index.html.erb @@ -1,9 +1,10 @@ <% provide(:head_title, t("users.settings.teams.head_title")) %> +<% provide(:container_class, "no-second-nav-container") %> <%= render partial: "users/settings/sidebar.html.erb" %>
        -
        -
        +
        +
        <%= render partial: "users/settings/teams/breadcrumbs.html.erb" %> diff --git a/app/views/users/settings/teams/show.html.erb b/app/views/users/settings/teams/show.html.erb index 64559af9b..0b4ae5cf5 100644 --- a/app/views/users/settings/teams/show.html.erb +++ b/app/views/users/settings/teams/show.html.erb @@ -1,11 +1,12 @@ <% provide(:head_title, t("users.settings.teams.head_title")) %> +<% provide(:container_class, "no-second-nav-container") %>
        <%= render partial: "users/settings/sidebar.html.erb" %>
        -
        -
        +
        +
        <%= render partial: "users/settings/teams/breadcrumbs.html.erb" %> @@ -26,7 +27,7 @@
        -
        +
        @@ -36,7 +37,7 @@
        -
        +
        @@ -46,7 +47,7 @@
        -
        +
        @@ -60,7 +61,7 @@
        -
        +
        <%= link_to team_description_path(@team, format: :json), remote: true, class: 'description-link', diff --git a/config/locales/en.yml b/config/locales/en.yml index 6573a9f84..d1aec6f04 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -100,7 +100,7 @@ en: left_menu_bar: projects: "Projects" repositories: "Inventories" - templates: "Templates" + templates: "Protocols" reports: "Reports" settings: "Settings" activities: "Activities" @@ -119,21 +119,25 @@ en: all: "All Projects" nav2: + all_projects: + index: "Projects" + archive: "Archived projects" projects: - show: "Overview" + show: "Experiments" samples: "Samples" activities: "Activity" reports: "Reports" - archive: "Archive" + archive: "Archived experiments" experiments: - canvas: "Overview" + canvas: "Tasks" + archive: "Archived tasks" modules: steps: "Protocols" results: "Results" activities: "Activity" samples: "Samples" repositories: "Inventories" - archive: "Archive" + archive: "Archived results" search: whole_word: "Match any whole word" @@ -203,8 +207,8 @@ en: head_title: "Home" archive: "Archive" new: "New Project" - visibility_private: "Project is private. Only invited users can see it." - visibility_public: "Project is public. Everybody from the team can see it." + visibility_private: "Project is visible to project members only." + visibility_public: "Project is visible to all team members." user_project: "%{user} joined on %{timestamp}." no_activities: "No activities!" no_comments: "No comments!" @@ -250,9 +254,9 @@ en: name: "Project name" name_placeholder: "My project" team: "Team" - visibility: "Visibility" - visibility_hidden: "Private" - visibility_visible: "Public" + visibility: "Visible to:" + visibility_hidden: "Project members only" + visibility_visible: "All team members" modal_edit_project: modal_title: "Edit project %{project}" submit: "Save" @@ -283,7 +287,6 @@ en: error_flash: "Project %{name} not restored." show: head_title: "%{project}" - page_title: "Project's experiments" samples: head_title: "%{project} | Sample inventory" reports: @@ -304,7 +307,7 @@ en: projects: "Projects" head_title: "Create new report" no_projects: "No projects available." - message: "You are about to create a new report. Please select a project from which you would like to create a report for." + message: "You are about to create a new report. Please select a project from which you would like to create a report." create: "Create" modal_delete: head_title: "Delete report/s" @@ -573,7 +576,7 @@ en: load_protocol_from_repository: "from repository" load_protocol_from_file: "from file" export: "Export Protocol" - copy_to_repository: "Save To Protocol Repository" + copy_to_repository: "Copy To Protocol Repository" confirm_link_update_modal: unlink_title: "Unlink protocol" unlink_message: "Are you sure you want to unlink the task protocol from the repository version? This will stop any tracking of changes." @@ -603,8 +606,9 @@ en: title: "Load protocol from repository" text: "Choose the protocol to be loaded to the task." text2: "This action will overwrite the current protocol in the task and unlink it from repository. The current protocol will remain unchanged in repository." - tab_public: "Public protocols" - tab_private: "Private protocols" + tab_public: "Team protocols" + tab_private: "My protocols" + tab_archive: "Archived protocols" thead_name: "Name" thead_keywords: "Keywords" thead_nr_of_linked_children: "No. of linked tasks" @@ -621,9 +625,9 @@ en: name_label: "Repository protocol name" name_placeholder: "My protocol" type_label: "Copy to" - type_public: "Public protocols" - type_private: "Private protocols" - type_text: "You can copy the protocol to public team repository, or to your private protocols." + type_public: "Team protocols" + type_private: "My protocols" + type_text: "You can copy the protocol to protocols repository visible to all team members, or to your protocols repository." link_label: "Link task to this repository protocol" link_text: "Warning! This will unlink the currently linked protocol." error_400: "Due to unknown error, protocol could not be copied to repository." @@ -1566,11 +1570,11 @@ en: index: head_title: "Protocol management" navigation: - public: "Public protocols" - private: "Private protocols" + public: "Team protocols" + private: "My protocols" archive: "Archive" - public_description: "Public protocols are visible and can be used by everyone from the team." - private_description: "Private protocols are only visible to you." + public_description: "Team protocols are visible and can be used by everyone from the team." + private_description: "My protocols are only visible to you." create_new: "New" edit: "Edit" clone_btn: "Copy" @@ -1581,8 +1585,8 @@ en: modal_import_json_title: "Import protocols.io file" modal_import_json_notice: "Upload your protocols.io protocol file" export: "Export" - make_private: "Make private" - publish: "Publish" + make_private: "Move to My Protocols" + publish: "Move to Team protocols" archive_action: "Archive" thead_name: "Name" thead_keywords: "Keywords" @@ -1601,16 +1605,16 @@ en: used_in: "Number of tasks linked to this protocol: %{nr}" no_linked_children: "This protocol is not linked to any task." archive: - description: "Archived protocols can only be seen by you. Restoring protocols will return them to their previous location (public/private)." + description: "Archived protocols can only be seen by you. Restoring protocols will return them to their previous location (team/my protocols)." restore: "Restore" no_teams: title: "Your dashboard is empty!" text: "It seems you're not a member of any team. See team management to sort it out." btn: "Manage Teams" - make_private_unauthorized: "You do not have permission to make selected protocols private." - make_private_error: "Error occured while making selected protocols private." - publish_unauthorized: "You do not have permission to publish selected protocols." - publish_error: "Error occured while publishing selected protocols." + make_private_unauthorized: "You do not have permission to move selected protocols to My protocols." + make_private_error: "Error occured while moving selected protocols to My protocols." + publish_unauthorized: "You do not have permission to move selected protocols to Team protocols." + publish_error: "Error occured while moving selected protocols to Team protocols." archive_unauthorized: "You do not have permission to archive selected protocols." archive_error: "Error occured while archiving selected protocols." restore_unauthorized: "You do not have permission to restore selected protocols." @@ -1621,25 +1625,25 @@ en: title: "Create new protocol" name_label: "Protocol name" name_placeholder: "My protocol" - message_public: "When you create a new public protocol, it will instantly be visible to all members of the team." - message_private: "When you create a new private protocol, it will only be visible to you." + message_public: "When you create a new Team protocol, it will instantly be visible to all members of the team." + message_private: "When you create a new My protocol, it will only be visible to you." submit: "Create" clone: success_flash: "Successfully copied protocol '%{new}' from protocol '%{original}'." error_flash: "Failed to copied protocol '%{original}'." make_private_results: - title: "Make private results" - message_failed: "Failed to make %{nr} protocols private." - message_ok: "Successfully made %{nr} protocols private." - row_success: "Made private" - row_renamed: "Made private & renamed" + title: "Move to My protocols results" + message_failed: "Failed to move %{nr} protocols to My protocols." + message_ok: "Successfully moved %{nr} protocols to My protocols." + row_success: "Moved to My protocols" + row_renamed: "Moved to My protocols & renamed" row_failed: "Failed" publish_results: - title: "Publish results" - message_failed: "Failed to publish %{nr} protocols." - message_ok: "Successfully published %{nr} protocols." - row_success: "Published" - row_renamed: "Published & renamed" + title: "Move to Team protocols results" + message_failed: "Failed to move %{nr} protocols to Team protocols." + message_ok: "Successfully moved %{nr} protocols to Team protocols." + row_success: "Moved to Team protocols" + row_renamed: "Moved to Team protocols & renamed" row_failed: "Failed" import_results: title: "Import results" @@ -1670,8 +1674,8 @@ en: row_success: "Restored" row_renamed: "Restored & renamed" row_failed: "Failed" - row_in_repository_public: "%{protocol} - into public protocols" - row_in_repository_private: "%{protocol} - into private protocols" + row_in_repository_public: "%{protocol} - into Team protocols" + row_in_repository_private: "%{protocol} - into My protocols" steps: completed: 'Completed' uncompleted: 'Uncompleted'