Move Export to secondary nav

[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 95b2c5537a96e39d05b4a90883f3b235b53ccd8c..dd972e5c6bff618a0ede88d840365aebb34c3b73 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,7 +1,7 @@
 <header class="d-flex bg-body text-nowrap closed z-3">
   <h1 class="d-flex m-0 fw-semibold">
     <a href="<%= root_path %>" class="icon-link gap-1 text-body-emphasis text-decoration-none geolink">
 <header class="d-flex bg-body text-nowrap closed z-3">
   <h1 class="d-flex m-0 fw-semibold">
     <a href="<%= root_path %>" class="icon-link gap-1 text-body-emphasis text-decoration-none geolink">

-      <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :size => 30 %>
+      <%= image_tag "osm_logo.svg", :alt => t("layouts.logo.alt_text"), :size => 30 %>

       <%= t "layouts.project_name.h1" %>
     </a>
   </h1>
       <%= t "layouts.project_name.h1" %>
     </a>
   </h1>


@@ -9,13 +9,13 @@
   <nav class='primary'>
     <%= content_for :header %>
     <div class="btn-group">
   <nav class='primary'>
     <%= content_for :header %>
     <div class="btn-group">

-      <div id="edit_tab" class="btn-group">
+      <div id="edit_tab" class="btn-group flex-grow-1">

         <%= link_to t("layouts.edit"),
                     edit_path,
                     :class => "btn btn-outline-primary geolink editlink",
                     :id => "editanchor",
                     :data => { :editor => preferred_editor } %>
         <%= link_to t("layouts.edit"),
                     edit_path,
                     :class => "btn btn-outline-primary geolink editlink",
                     :id => "editanchor",
                     :data => { :editor => preferred_editor } %>

-        <button class='btn btn-outline-primary dropdown-toggle dropdown-toggle-split' type='button' data-bs-toggle='dropdown'></button>
+        <button class='btn btn-outline-primary dropdown-toggle dropdown-toggle-split flex-grow-0' type='button' data-bs-toggle='dropdown'></button>

         <ul class='dropdown-menu'>
           <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
             <li>
         <ul class='dropdown-menu'>
           <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
             <li>


@@ -27,8 +27,7 @@
           <% end %>
         </ul>
       </div>
           <% end %>
         </ul>
       </div>

-      <%= link_to t("layouts.history"), history_path, :class => "btn btn-outline-primary geolink flex-grow-1", :id => "history_tab" %>
-      <%= link_to t("layouts.export"), export_path, :class => "btn btn-outline-primary geolink", :id => "export_tab" %>
+      <%= link_to t("layouts.history"), history_path, :class => "btn btn-outline-primary geolink flex-grow-1" %>

     </div>
   </nav>
   <nav class='secondary d-flex gap-2 align-items-center'>
     </div>
   </nav>
   <nav class='secondary d-flex gap-2 align-items-center'>


@@ -41,6 +40,9 @@
           <% end -%>
         </li>
       <% end %>
           <% end -%>
         </li>
       <% end %>

+      <li class="compact-hide nav-item">
+        <%= link_to t("layouts.export"), export_path, :class => header_nav_link_class(export_path) %>
+      </li>

       <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">
         <%= link_to t("layouts.gps_traces"), traces_path, :class => header_nav_link_class(traces_path) %>
       </li>


@@ -70,6 +72,7 @@
               <% end -%>
             </li>
           <% end %>
               <% end -%>
             </li>
           <% end %>

+          <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.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>


@@ -81,12 +84,12 @@
     </ul>
     <% if current_user && current_user.id %>
       <div class='d-inline-flex dropdown user-menu logged-in'>
     </ul>
     <% if current_user && current_user.id %>
       <div class='d-inline-flex dropdown user-menu logged-in'>

-        <button class='dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
-          <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
+        <button class='d-flex gap-1 align-items-center justify-content-center dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
+          <%= user_thumbnail_tiny(current_user, :class => "user_thumbnail_tiny rounded-1 bg-body") %>

           <% if current_user.new_messages.size > 0 %>
             <span class="badge count-number position-static m-1"><%= current_user.new_messages.size %></span>
           <% end %>
           <% if current_user.new_messages.size > 0 %>
             <span class="badge count-number position-static m-1"><%= current_user.new_messages.size %></span>
           <% end %>

-          <span class='username align-middle'>
+          <span class='username align-middle text-truncate'>

             <%= current_user.display_name %>
           </span>
         </button>
             <%= current_user.display_name %>
           </span>
         </button>