scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5072 from sboursen-scinote/sb_SCI-8030

Browse source 
Fix protocol repository sidebar on archived view [SCI-8030]
This commit is contained in:
artoscinote 2023-03-03 14:39:01 +01:00 committed by GitHub
parent 3a60a0aacd 248b13aa72
commit d1f26e1c7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/helpers/protocols_helper.rb Normal file
View file

@ -0,0 +1,7 @@
# frozen_string_literal: true
module ProtocolsHelper
def templates_view_mode_archived?(type: nil, protocol: nil)
type == :archived || protocol&.archived?
end
end

2
app/views/protocols/index.html.erb
View file

@ -14,7 +14,7 @@
<div class="content-pane flexible protocols-index <%= @type %>">
<div class="content-header sticky-header">
<div class="title-row">
<% if @type == :archived %>
<% if templates_view_mode_archived? %>
<h1>
<i class="fas fa-archive"></i>
<%= t('protocols.index.head_title_archived') %>

42
app/views/shared/sidebar/_templates_sidebar.html.erb
View file

@ -1,22 +1,30 @@
<ul class="sidebar-branch">
<li class="sidebar-leaf">
<i class="fas fa-caret-right toggle-branch collapsed"></i>
<%= link_to t('sidebar.templates.protocol_templates'),
protocols_path,
class: "sidebar-link #{'selected' if active == :protocol && params[:type] != 'archived'}" %>
<ul class="sidebar-branch">
<li class="sidebar-leaf">
<%= link_to protocols_path(type: :archived), class: "sidebar-link #{'selected' if active == :protocol && params[:type] == 'archived'}" do %>
<i class="fas fa-archive"></i>
<%= t("protocols.index.navigation.archive") %>
<% end %>
</ul>
</li>
<% if can_view_label_templates?(current_team) %>
<% if templates_view_mode_archived?(type: @type, protocol: @protocol) %>
<li class="sidebar-leaf">
<%= link_to t('sidebar.templates.label_templates'),
label_templates_path,
class: "sidebar-link #{'selected' if active == :label}" %>
<%= link_to protocols_path, class: "sidebar-link back-button" do %>
<%= t("protocols.index.back_to_active_protocols") %>
<% end %>
</li>
<% else %>
<li class="sidebar-leaf">
<i class="fas fa-caret-right toggle-branch collapsed"></i>
<%= link_to t('sidebar.templates.protocol_templates'),
protocols_path,
class: "sidebar-link #{'selected' if active == :protocol && params[:type] != 'archived'}" %>
<ul class="sidebar-branch">
<li class="sidebar-leaf">
<%= link_to protocols_path(type: :archived), class: "sidebar-link #{'selected' if active == :protocol && params[:type] == 'archived'}" do %>
<i class="fas fa-archive"></i>
<%= t("protocols.index.navigation.archive") %>
<% end %>
</ul>
</li>
<% if can_view_label_templates?(current_team) %>
<li class="sidebar-leaf">
<%= link_to t('sidebar.templates.label_templates'),
label_templates_path,
class: "sidebar-link #{'selected' if active == :label}" %>
</li>
<% end %>
<% end %>
</ul>

1
config/locales/en.yml
View file

@ -2705,6 +2705,7 @@ en:
head_title: "Protocol templates"
head_title_archived: "Archived protocol templates"
default_name: 'New protocol'
back_to_active_protocols: 'Back to active protocols'
navigation:
public: "Team protocols"
private: "My protocols"