From 213add87de0432f167c52db8e2e2ceadb4a0ac6c Mon Sep 17 00:00:00 2001
From: dnoneill <noneill@stanford.edu>
Date: Thu, 16 Jan 2025 17:06:11 -0500
Subject: [PATCH] move mobile menu under title, switch order

---
 app/components/top_navbar_component.html.erb | 65 +++++---------------
 1 file changed, 16 insertions(+), 49 deletions(-)

diff --git a/app/components/top_navbar_component.html.erb b/app/components/top_navbar_component.html.erb
index 39dcdd43b..23f6b20e2 100644
--- a/app/components/top_navbar_component.html.erb
+++ b/app/components/top_navbar_component.html.erb
@@ -22,9 +22,7 @@
         <span class="navbar-toggler-icon"></span>
       </button>
 
-      <div
-        class="collapse navbar-collapse justify-content-md-end"
-        id="user-util-collapse">
+      <div class="d-md-block d-none">
         <ul class="navbar-nav">
           <li class="nav-item">
             <%= link_to 'Feedback', 'mailto:argo-feedback@lists.stanford.edu', class: 'nav-link' %>
@@ -34,46 +32,6 @@
               <p class='navbar-text'>Logged in as <%= current_user.to_s.html_safe %></p>
             </li>
           <% end %>
-          <hr>
-          <% if session[:groups].present? %>
-            <li class='dropdown nav-item d-md-none'>
-              <a href='#' class='dropdown-toggle impersonating link-warning nav-link' data-bs-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>
-                Impersonating: <%= session[:groups].join(' ') %>
-                <span class='caret'></span>
-              </a>
-              <ul class='dropdown-menu'>
-                <li>
-                  <%= link_to 'Stop Impersonating', auth_forget_impersonated_groups_path %>
-                </li>
-              </ul>
-            </li>
-          <% elsif can? :impersonate, User %>
-            <li class="nav-item d-md-none">
-              <%= link_to 'Impersonate', auth_groups_path, class: 'nav-link' %>
-            </li>
-          <% end %>
-
-          <li class="nav-item d-md-none">
-            <%= link_to 'Bulk&nbsp;Action'.html_safe, bulk_actions_path, class: 'nav-link' %>
-          </li>
-
-          <li class="nav-item d-md-none">
-            <%= link_to 'All&nbsp;Workflows'.html_safe, report_workflow_grid_path, class: 'nav-link' %>
-          </li>
-
-          <li class='nav-item d-md-none dropdown'>
-            <a href='#' class='nav-link dropdown-toggle' id="registerDropdown" data-bs-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>
-              Register
-              <span class='caret'></span>
-            </a>
-            <div class="dropdown-menu" aria-labelledby="registerDropdown">
-              <%= link_to 'Register Items', registration_path, class: 'dropdown-item' %>
-              <% if can? :create, Cocina::Models::AdminPolicy %>
-                <%= link_to 'Register APO', new_apo_path, class: 'dropdown-item' %>
-              <% end %>
-              <%= link_to 'Agreement', new_agreement_path, class: 'dropdown-item' %>
-            </div>
-          </li>
         </ul>
       </div>
     </div>
@@ -88,10 +46,10 @@
             <%= link_to 'Argo', root_path, class: 'nav-link' %>
           </div>
         </div>
-        <div class="col-md-4 d-none d-md-block">
+        <div class="col-md-4">
           <nav
-            class="navbar navbar-expand d-flex justify-content-end"
-            aria-label="browse">
+            class="navbar collapse navbar-collapse justify-content-md-end navbar-expand-md d-md-flex"
+            aria-label="browse" id="user-util-collapse">
             <ul class="navbar-nav">
               <% if session[:groups].present? %>
                 <li class='dropdown nav-item'>
@@ -111,15 +69,15 @@
                 </li>
               <% end %>
 
-              <li class="nav-item ms-3">
+              <li class="nav-item ms-md-3">
                 <%= link_to 'Bulk&nbsp;Action'.html_safe, bulk_actions_path, class: 'nav-link' %>
               </li>
 
-              <li class="nav-item ms-3">
+              <li class="nav-item ms-md-3">
                 <%= link_to 'All&nbsp;Workflows'.html_safe, report_workflow_grid_path, class: 'nav-link' %>
               </li>
 
-              <li class='nav-item ms-3 dropdown'>
+              <li class='nav-item me-md-0 dropdown'>
                 <a href='#' class='nav-link dropdown-toggle' id="registerDropdown" data-bs-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>
                   Register
                   <span class='caret'></span>
@@ -132,6 +90,15 @@
                   <%= link_to 'Agreement', new_agreement_path, class: 'dropdown-item' %>
                 </div>
               </li>
+              <hr class="d-md-none d-block">
+              <li class="nav-item d-md-none d-block">
+                <%= link_to 'Feedback', 'mailto:argo-feedback@lists.stanford.edu', class: 'nav-link' %>
+              </li>
+              <% if current_user %>
+                <li class="nav-item d-md-none d-block">
+                  <p class='navbar-text'>Logged in as <%= current_user.to_s.html_safe %></p>
+                </li>
+              <% end %>
             </ul>
           </nav>
         </div>