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

[rails.git] / app / views / layouts / _header.html.erb

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 190ea44e5654b53b63af24f070ad8b0130609f9a..aa524938181c32cdb210fdb1c1cb9168b056b58d 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -27,59 +27,43 @@
       </ul>
     </div>
   </nav>
       </ul>
     </div>
   </nav>

-  <nav class='secondary d-flex gap-2 align-items-center'>
-    <ul class='nav flex-nowrap'>
+  <nav class='secondary d-flex gap-2 flex-grow-1 align-items-center'>
+    <ul id='secondary-nav-menu' class='nav flex-grow-1' data-turbo-permanent>

       <% if Settings.status != "database_offline" && can?(:index, Issue) %>
       <% if Settings.status != "database_offline" && can?(:index, Issue) %>

-        <li class="compact-hide nav-item">
+        <li class="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 %>
           <%= 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">
+      <li class="nav-item">

         <%= link_to t("layouts.history"), history_path, :class => header_nav_link_class(history_path) %>
       </li>
         <%= link_to t("layouts.history"), history_path, :class => header_nav_link_class(history_path) %>
       </li>

-      <li class="compact-hide nav-item">
+      <li class="nav-item">

         <%= link_to t("layouts.export"), export_path, :class => header_nav_link_class(export_path) %>
       </li>
         <%= link_to t("layouts.export"), export_path, :class => header_nav_link_class(export_path) %>
       </li>

-      <li class="compact-hide nav-item">
+      <li class="nav-item">

         <%= link_to t("layouts.gps_traces"), traces_path, :class => header_nav_link_class(traces_path) %>
       </li>
         <%= link_to t("layouts.gps_traces"), traces_path, :class => header_nav_link_class(traces_path) %>
       </li>

-      <li class="compact-hide nav-item">
+      <li class="nav-item">

         <%= link_to t("layouts.user_diaries"), diary_entries_path, :class => header_nav_link_class(diary_entries_path) %>
       </li>
         <%= link_to t("layouts.user_diaries"), diary_entries_path, :class => header_nav_link_class(diary_entries_path) %>
       </li>

-      <li class="compact-hide nav-item">
+      <li class="nav-item">

         <%= link_to t("layouts.communities"), communities_path, :class => header_nav_link_class(communities_path) %>
       </li>
         <%= link_to t("layouts.communities"), communities_path, :class => header_nav_link_class(communities_path) %>
       </li>

-      <li class="compact-hide nav-item">
+      <li class="nav-item">

         <%= link_to t("layouts.copyright"), copyright_path, :class => header_nav_link_class(copyright_path) %>
       </li>
         <%= link_to t("layouts.copyright"), copyright_path, :class => header_nav_link_class(copyright_path) %>
       </li>

-      <li class="compact-hide nav-item">
+      <li class="nav-item">

         <%= link_to t("layouts.help"), help_path, :class => header_nav_link_class(help_path) %>
       </li>
         <%= link_to t("layouts.help"), help_path, :class => header_nav_link_class(help_path) %>
       </li>

-      <li class="compact-hide nav-item">
+      <li class="nav-item">

         <%= link_to t("layouts.about"), about_path, :class => header_nav_link_class(about_path) %>
       </li>
         <%= link_to t("layouts.about"), about_path, :class => header_nav_link_class(about_path) %>
       </li>

-      <li id="compact-secondary-nav" class="dropdown nav-item">
+      <li id="compact-secondary-nav" class="dropdown nav-item ms-auto">

         <button class="dropdown-toggle nav-link btn btn-outline-secondary border-0 bg-body text-secondary" type="button" data-bs-toggle="dropdown"><%= t "layouts.more" %></button>
         <ul class="dropdown-menu">
         <button class="dropdown-toggle nav-link btn btn-outline-secondary border-0 bg-body 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>
-              <%= link_to issues_path(:status => "open"), :class => "dropdown-item" do %>
-                <%= t("layouts.issues") %>
-                <%= open_issues_count %>
-              <% end -%>
-            </li>
-          <% end %>
-          <li><%= link_to t("layouts.history"), history_path, :class => "dropdown-item" %></li>
-          <li><%= link_to t("layouts.export"), export_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>
         </ul>
       </li>
     </ul>


@@ -96,7 +80,7 @@
         </button>
         <div class='dropdown-menu dropdown-menu-end'>
           <%= link_to t("users.show.my_dashboard"), dashboard_path, :class => "dropdown-item" %>
         </button>
         <div class='dropdown-menu dropdown-menu-end'>
           <%= link_to t("users.show.my_dashboard"), dashboard_path, :class => "dropdown-item" %>

-          <%= link_to inbox_messages_path, :class => "dropdown-item" do %>
+          <%= link_to messages_inbox_path, :class => "dropdown-item" do %>

             <%= t("users.show.my messages") %>
             <span class='badge count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
           <% end %>
             <%= t("users.show.my messages") %>
             <span class='badge count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
           <% end %>


@@ -111,7 +95,7 @@
     <% else %>
       <div class="d-inline-flex btn-group login-menu" role="">
         <%= link_to t("layouts.log_in"), login_path(:referer => request.fullpath), :class => "geolink btn btn-outline-secondary" %>
     <% else %>
       <div class="d-inline-flex btn-group login-menu" role="">
         <%= link_to t("layouts.log_in"), login_path(:referer => request.fullpath), :class => "geolink btn btn-outline-secondary" %>

-        <%= link_to t("layouts.sign_up"), user_new_path, :class => "btn btn-outline-secondary" %>
+        <%= link_to t("layouts.sign_up"), new_user_path, :class => "btn btn-outline-secondary" %>

       </div>
     <% end %>
   </nav>
       </div>
     <% end %>
   </nav>