Merge remote-tracking branch 'upstream/pull/4662'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 82908ddc4a1203a2b42f97920cb72e81afb41140..14aaad9cb4f1851a243119ec3c887e8394c9244c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -150,11 +150,6 @@ nav.primary {
 nav.secondary {
   .nav-link {
     padding: 0.2rem;
-    color: $darkgrey;
-  }
-
-  > ul li.current a {
-    color: darken($darkgrey, 25%);
   }
 
   #inboxanchor {

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 17c36bdfe043066b81c518c9602546f3013af212..368668a9bbf4fbb5c82637595ab0a09560032d56 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -41,8 +41,8 @@ module ApplicationHelper
     end
   end
 
-  def current_page_class(path)
-    :current if current_page?(path)
+  def header_nav_link_class(path)
+    ["nav-link", current_page?(path) ? "text-secondary-emphasis" : "text-secondary"]
   end
 
   def application_data

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 0fafc3c7f25ad9b23fd9b1b20ab0a8d2c148d49f..6a926d69247317cbad1f556a21559c1b786cded5 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -34,48 +34,48 @@
   <nav class='secondary'>
     <ul class='mx-1 px-0'>
       <% if Settings.status != "database_offline" && can?(:index, Issue) %>
-        <li class="compact-hide nav-item <%= current_page_class(issues_path) %>">
-          <%= link_to issues_path(:status => "open"), :class => "nav-link" do %>
+        <li class="compact-hide nav-item">
+          <%= link_to issues_path(:status => "open"), :class => header_nav_link_class(issues_path) do %>
             <%= t("layouts.issues") %>
             <%= open_issues_count %>
           <% end -%>
         </li>
       <% end %>
-      <li class="compact-hide nav-item <%= current_page_class(traces_path) %>">
-        <%= link_to t("layouts.gps_traces"), traces_path, :class => "nav-link" %>
+      <li class="compact-hide nav-item">
+        <%= link_to t("layouts.gps_traces"), traces_path, :class => header_nav_link_class(traces_path) %>
       </li>
-      <li class="compact-hide nav-item <%= current_page_class(diary_entries_path) %>">
-        <%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "nav-link" %>
+      <li class="compact-hide nav-item">
+        <%= link_to t("layouts.user_diaries"), diary_entries_path, :class => header_nav_link_class(diary_entries_path) %>
       </li>
-      <li class="compact-hide nav-item <%= current_page_class(communities_path) %>">
-        <%= link_to t("layouts.communities"), communities_path, :class => "nav-link" %>
+      <li class="compact-hide nav-item">
+        <%= link_to t("layouts.communities"), communities_path, :class => header_nav_link_class(communities_path) %>
       </li>
-      <li class="compact-hide nav-item <%= current_page_class(copyright_path) %>">
-        <%= link_to t("layouts.copyright"), copyright_path, :class => "nav-link" %>
+      <li class="compact-hide nav-item">
+        <%= link_to t("layouts.copyright"), copyright_path, :class => header_nav_link_class(copyright_path) %>
       </li>
-      <li class="compact-hide nav-item <%= current_page_class(help_path) %>">
-        <%= link_to t("layouts.help"), help_path, :class => "nav-link" %>
+      <li class="compact-hide nav-item">
+        <%= link_to t("layouts.help"), help_path, :class => header_nav_link_class(help_path) %>
       </li>
-      <li class="compact-hide nav-item <%= current_page_class(about_path) %>">
-        <%= link_to t("layouts.about"), about_path, :class => "nav-link" %>
+      <li class="compact-hide nav-item">
+        <%= link_to t("layouts.about"), about_path, :class => header_nav_link_class(about_path) %>
       </li>
       <li id="compact-secondary-nav" class="dropdown nav-item">
         <button class="dropdown-toggle nav-link btn btn-outline-secondary border-0 bg-white text-secondary" type="button" data-bs-toggle="dropdown"><%= t "layouts.more" %></button>
         <ul class="dropdown-menu">
           <% if Settings.status != "database_offline" && can?(:index, Issue) %>
-            <li class="<%= current_page_class(issues_path) %>">
+            <li>
               <%= link_to issues_path(:status => "open"), :class => "dropdown-item" do %>
                 <%= t("layouts.issues") %>
                 <%= open_issues_count %>
               <% end -%>
             </li>
           <% end %>
-          <li class="<%= current_page_class(traces_path) %>"><%= link_to t("layouts.gps_traces"), traces_path, :class => "dropdown-item" %></li>
-          <li class="<%= current_page_class(diary_entries_path) %>"><%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "dropdown-item" %></li>
-          <li class="<%= current_page_class(communities_path) %>"><%= link_to t("layouts.communities"), communities_path, :class => "dropdown-item" %></li>
-          <li class="<%= current_page_class(copyright_path) %>"><%= link_to t("layouts.copyright"), copyright_path, :class => "dropdown-item" %></li>
-          <li class="<%= current_page_class(help_path) %>"><%= link_to t("layouts.help"), help_path, :class => "dropdown-item" %></li>
-          <li class="<%= current_page_class(about_path) %>"><%= link_to t("layouts.about"), about_path, :class => "dropdown-item" %></li>
+          <li><%= link_to t("layouts.gps_traces"), traces_path, :class => "dropdown-item" %></li>
+          <li><%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "dropdown-item" %></li>
+          <li><%= link_to t("layouts.communities"), communities_path, :class => "dropdown-item" %></li>
+          <li><%= link_to t("layouts.copyright"), copyright_path, :class => "dropdown-item" %></li>
+          <li><%= link_to t("layouts.help"), help_path, :class => "dropdown-item" %></li>
+          <li><%= link_to t("layouts.about"), about_path, :class => "dropdown-item" %></li>
         </ul>
       </li>
     </ul>

diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb
index a84ba133985c0b4331f339f669f1fc9296358547..f53f5cf2806bfc022e10ffed06518095c0fdcf6f 100644 (file)
--- a/app/views/user_blocks/_navigation.html.erb
+++ b/app/views/user_blocks/_navigation.html.erb
@@ -34,4 +34,11 @@
                   :class => ["nav-link", { :active => action_name == "blocks_by" }] %>
     </li>
   <% end %>
+  <% if @user_block %>
+    <li class="nav-item">
+      <%= link_to t(".block", :id => @user_block.id),
+                  user_block_path(@user_block),
+                  :class => ["nav-link", { :active => action_name == "show" }] %>
+    </li>
+  <% end %>
 </ul>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0634fc2a0d1f52b1000462318c6bf42b0620d422..f9117ca1cc89add7669440805fbb59138644c7b0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2991,6 +2991,7 @@ en:
       blocks_on_user: "Blocks on %{user}"
       blocks_by_me: "Blocks by Me"
       blocks_by_user: "Blocks by %{user}"
+      block: "Block #%{id}"
   user_mutes:
     index:
       title: "Muted Users"

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 34120e2078781ad732e69e5664a2e5324093157a..a905090dba6133a8c20908f8ee308a6fbb817015 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -91,5 +91,5 @@ class ApplicationHelperTest < ActionView::TestCase
 
   def test_body_class; end
 
-  def test_current_page_class; end
+  def test_header_nav_link_class; end
 end