diff --git a/app/assets/images/icon_small/navigate_next.svg b/app/assets/images/icon_small/navigate_next.svg deleted file mode 100644 index ff48952b1..000000000 --- a/app/assets/images/icon_small/navigate_next.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/assets/stylesheets/navigation/breadcrumbs.scss b/app/assets/stylesheets/navigation/breadcrumbs.scss deleted file mode 100644 index bcdb06a08..000000000 --- a/app/assets/stylesheets/navigation/breadcrumbs.scss +++ /dev/null @@ -1,42 +0,0 @@ -.sci--layout-navigation-breadcrumbs { - --max-breadcrumbs-link-width: 11.25rem; - align-items: center; - column-gap: .875rem; - display: flex; - flex-wrap: wrap; - padding: .875rem 1.5rem .5rem; - - .breadcrumbs-link { - color: var(--sn-blue); - display: inline-block; - max-width: var(--max-breadcrumbs-link-width); - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - &:last-child { - color: var(--sn-grey); - } - } - - .delimiter { - padding-bottom: .25rem; - } - - .breadcrumbs-collapsed-container { - color: var(--sn-blue); - position: relative; - - .show-breadcrumbs { - align-items: center; - cursor: pointer; - display: flex; - position: relative; - } - - a { - @include font-button; - color: var(--sn-blue); - } - } -} diff --git a/app/assets/stylesheets/shared_styles/constants/fonts.scss b/app/assets/stylesheets/shared_styles/constants/fonts.scss index 7d3e85dd5..75d2d0e72 100644 --- a/app/assets/stylesheets/shared_styles/constants/fonts.scss +++ b/app/assets/stylesheets/shared_styles/constants/fonts.scss @@ -77,7 +77,3 @@ html { // $headings-font-weight: 500; // $headings-line-height: 1.1; // $headings-color: inherit; - -html { - font-size: 16px; -} diff --git a/app/controllers/concerns/breadcrumbs.rb b/app/controllers/concerns/breadcrumbs.rb deleted file mode 100644 index 6c0473776..000000000 --- a/app/controllers/concerns/breadcrumbs.rb +++ /dev/null @@ -1,63 +0,0 @@ -# frozen_string_literal: true - -module Breadcrumbs - extend ActiveSupport::Concern - - included do - def set_breadcrumbs_items - my_module = @my_module - experiment = my_module&.experiment || @experiment - project = experiment&.project || @project - current_folder = project&.project_folder || @current_folder - @breadcrumbs_items = [] - - folders = helpers.tree_ordered_parent_folders(current_folder) - - @breadcrumbs_items.push({ - label: t('projects.index.breadcrumbs_root'), - url: projects_path - }) - - folders&.each do |project_folder| - @breadcrumbs_items.push({ - label: project_folder.name, - url: project_folder_path(project_folder) - }) - end - - include_project(project) if project - - include_experiment(experiment) if experiment - - include_my_module(my_module) if my_module - - @breadcrumbs_items - end - end - - private - - def include_project(project) - @breadcrumbs_items.push({ - label: project.name, - url: project_path(project), - archived: project.archived? - }) - end - - def include_experiment(experiment) - @breadcrumbs_items.push({ - label: experiment.name, - url: my_modules_experiment_path(experiment), - archived: experiment.archived? - }) - end - - def include_my_module(my_module) - @breadcrumbs_items.push({ - label: my_module.name, - url: my_module_path(my_module), - archived: my_module.archived? - }) - end -end diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index 912706256..5f1819ec0 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -6,7 +6,6 @@ class ExperimentsController < ApplicationController include ActionView::Helpers::TextHelper include ApplicationHelper include Rails.application.routes.url_helpers - include Breadcrumbs before_action :load_project, only: %i(new create archive_group restore_group) before_action :load_experiment, except: %i(new create archive_group restore_group) @@ -19,7 +18,6 @@ class ExperimentsController < ApplicationController before_action :check_clone_permissions, only: %i(clone_modal clone) before_action :check_move_permissions, only: %i(move_modal move) before_action :set_inline_name_editing, only: %i(canvas table module_archive) - before_action :set_breadcrumbs_items, only: %i(canvas table module_archive) layout 'fluid' diff --git a/app/controllers/label_templates_controller.rb b/app/controllers/label_templates_controller.rb index 2525dc1af..1577219df 100644 --- a/app/controllers/label_templates_controller.rb +++ b/app/controllers/label_templates_controller.rb @@ -8,7 +8,6 @@ class LabelTemplatesController < ApplicationController before_action :check_manage_permissions, only: %i(create duplicate set_default delete update) before_action :load_label_templates, only: %i(index datatable) before_action :load_label_template, only: %i(show set_default update template_tags) - before_action :set_breadcrumbs_items, only: %i(index show) layout 'fluid' @@ -187,20 +186,4 @@ class LabelTemplatesController < ApplicationController team: label_template.team, message_items: message_items) end - - def set_breadcrumbs_items - @breadcrumbs_items = [] - - @breadcrumbs_items.push({ - label: t('breadcrumbs.labels'), - url: label_templates_path - }) - - if @label_template - @breadcrumbs_items.push({ - label: @label_template.name, - url: label_template_path(@label_template) - }) - end - end end diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index 5bafd09e2..f2ac67a1c 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -6,7 +6,6 @@ class MyModulesController < ApplicationController include ActionView::Helpers::UrlHelper include ApplicationHelper include MyModulesHelper - include Breadcrumbs before_action :load_vars, except: %i(restore_group create new save_table_state) before_action :load_experiment, only: %i(create new) @@ -20,7 +19,6 @@ class MyModulesController < ApplicationController before_action :check_update_state_permissions, only: :update_state before_action :set_inline_name_editing, only: %i(protocols results activities archive) before_action :load_experiment_my_modules, only: %i(protocols results activities archive) - before_action :set_breadcrumbs_items, only: %i(results protocols activities) layout 'fluid'.freeze diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 9ba2fe90c..57c58b68b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -7,7 +7,6 @@ class ProjectsController < ApplicationController include ProjectsHelper include CardsViewHelper include ExperimentsHelper - include Breadcrumbs attr_reader :current_folder helper_method :current_folder @@ -23,7 +22,6 @@ class ProjectsController < ApplicationController before_action :load_exp_sort_var, only: :show before_action :reset_invalid_view_state, only: %i(index cards show) before_action :set_folder_inline_name_editing, only: %i(index cards) - before_action :set_breadcrumbs_items, only: %i(index show) layout 'fluid' diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb index 9d5436a8a..baead7713 100644 --- a/app/controllers/protocols_controller.rb +++ b/app/controllers/protocols_controller.rb @@ -70,7 +70,6 @@ class ProtocolsController < ApplicationController before_action :set_importer, only: %i(load_from_file import) before_action :set_inline_name_editing, only: :show - before_action :set_breadcrumbs_items, only: %i(index show) layout 'fluid' @@ -1126,21 +1125,4 @@ class ProtocolsController < ApplicationController protocol: link_to(@protocol.name, protocol_url(@protocol))) ) end - - def set_breadcrumbs_items - @breadcrumbs_items = [] - - @breadcrumbs_items.push({ - label: t('breadcrumbs.protocols'), - url: protocols_path - }) - - if @protocol - @breadcrumbs_items.push({ - label: @protocol.name, - url: protocol_path(@protocol), - archived: @protocol.archived? - }) - end - end end diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index aa8a24185..796c4f07d 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -22,7 +22,6 @@ class RepositoriesController < ApplicationController before_action :check_create_permissions, only: %i(create_modal create) before_action :check_copy_permissions, only: %i(copy_modal copy) before_action :set_inline_name_editing, only: %i(show) - before_action :set_breadcrumbs_items, only: %i(index show) layout 'fluid' @@ -526,21 +525,4 @@ class RepositoriesController < ApplicationController team: @repository.team, message_items: message_items) end - - def set_breadcrumbs_items - @breadcrumbs_items = [] - - @breadcrumbs_items.push({ - label: t('breadcrumbs.inventories'), - url: repositories_path - }) - - if @repository - @breadcrumbs_items.push({ - label: @repository.name, - url: repository_path(@repository), - archived: @repository.archived? - }) - end - end end diff --git a/app/views/experiments/_show_header.html.erb b/app/views/experiments/_show_header.html.erb index 4d3f7a52b..49f41488a 100644 --- a/app/views/experiments/_show_header.html.erb +++ b/app/views/experiments/_show_header.html.erb @@ -1,4 +1,7 @@
+

<% if @experiment.archived? %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 443e535ac..bcb9e3dff 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -57,7 +57,8 @@ -
+ +
<%= render "shared/navigation/top" %>
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb index d36c1de7a..7f8ccd3f5 100644 --- a/app/views/my_modules/protocols.html.erb +++ b/app/views/my_modules/protocols.html.erb @@ -37,7 +37,7 @@ %> <% end %> <%= render partial: 'shared/drag_n_drop_overlay' %> -<%= render partial: 'shared/secondary_navigation', locals: { render_breadcrumbs: false, project: @experiment.project, experiment: @experiment } %> +<%= render partial: 'shared/secondary_navigation', locals: { render_breadcrumbs: true, project: @experiment.project, experiment: @experiment } %>
diff --git a/app/views/projects/index/_header.html.erb b/app/views/projects/index/_header.html.erb index 965751632..ebd0bcbf7 100644 --- a/app/views/projects/index/_header.html.erb +++ b/app/views/projects/index/_header.html.erb @@ -1,4 +1,7 @@
+
<% if current_folder&.name && @inline_editable_title_config.present? %>

diff --git a/app/views/projects/show/_header.html.erb b/app/views/projects/show/_header.html.erb index 99958a725..300aa2385 100644 --- a/app/views/projects/show/_header.html.erb +++ b/app/views/projects/show/_header.html.erb @@ -1,4 +1,7 @@
+

<% if @project.archived? %> diff --git a/app/views/protocols/show.html.erb b/app/views/protocols/show.html.erb index 1552cdd5f..79f4db298 100644 --- a/app/views/protocols/show.html.erb +++ b/app/views/protocols/show.html.erb @@ -5,6 +5,14 @@ <% provide(:container_class, 'no-second-nav-container') %>
+

<% if @inline_editable_title_config.present? %> diff --git a/app/views/shared/navigation/_breadcrumbs.html.erb b/app/views/shared/navigation/_breadcrumbs.html.erb index d71d318ed..e69de29bb 100644 --- a/app/views/shared/navigation/_breadcrumbs.html.erb +++ b/app/views/shared/navigation/_breadcrumbs.html.erb @@ -1,64 +0,0 @@ -<% if @breadcrumbs_items&.length %> - <% @breadcrumbs_items.each { |item| item[:label] = "(A) #{item[:label]}" if item[:archived] }%> - <% shortened = @breadcrumbs_items.length > 4 %> - - <% if shortened %> - <% first_breadcrumb_item = @breadcrumbs_items.shift - last_breadcrumb_items = @breadcrumbs_items.pop(2) %> - <%= link_to(first_breadcrumb_item[:label], first_breadcrumb_item[:url], - class: "breadcrumbs-link", - title: first_breadcrumb_item[:label]) %> - - <%= image_tag "icon_small/navigate_next.svg", - alt: "navigate next", - class: "navigate_next" %> - - - - ••• - - - - - - <%= image_tag "icon_small/navigate_next.svg", - alt: "navigate next", - class: "navigate_next" %> - - <% item = last_breadcrumb_items.first %> - <%= link_to(item[:label], item[:url], - class: "breadcrumbs-link", - title: item[:label]) %> - - <%= image_tag "icon_small/navigate_next.svg", - alt: "navigate next", - class: "navigate_next" %> - - <% last_item = last_breadcrumb_items.last %> - - <%= last_item[:label] %> - - <% else %> - <% last_item = @breadcrumbs_items.pop %> - <% @breadcrumbs_items.each do |item| %> - <%= link_to(item[:label], item[:url], - class: "breadcrumbs-link", - title: item[:label]) %> - - " - alt="navigate next" - class="navigate_next"> - - - <% end %> - - <%= last_item[:label] %> - - <% end %> -<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index b37f8039b..1985d8fa8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3484,11 +3484,6 @@ en: url: not_valid: "Not valid URL" - breadcrumbs: - projects: "Projects" - inventories: "Inventories" - protocols: "Protocol templates" - labels: "Label templates" Add: "Add" Asset: "File"