From 4562e347fdc666d45d954ba3015915bad222b18e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Tue, 16 Apr 2024 10:45:39 -0400
Subject: [PATCH] Fixes #15613: Show login button/user menu on mobile view

---
 netbox/project-static/dist/netbox.css         | Bin 552689 -> 552769 bytes
 .../styles/overrides/_bootstrap.scss          |   6 ++
 netbox/templates/base/layout.html             |  57 +++---------------
 netbox/templates/inc/user_menu.html           |  50 +++++++++++++++
 4 files changed, 66 insertions(+), 47 deletions(-)
 create mode 100644 netbox/templates/inc/user_menu.html

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index c4b712c863e9d9e4376367697558d196d1a8bb4b..7cf2533fc228e74ecd494d1d8c303cdddef45e6c 100644
GIT binary patch
delta 95
zcmex(SMlII#fBEf7N!>F7M2#)7Pc1lEgUD}G%||xQi}2mQu535bW<|RGE-8EbTCBp
lGK!`bq%(_7Z&YCyW-2I}{%}9D@bm)*nYg#Vh~wZC007>tBd!1d

delta 44
zcmX?jPx0ej#fBEf7N!>F7M2#)7Pc1lEgUD}m<o!fKitnOJpI5yChqMP@f@520G7fK
Aj{pDw

diff --git a/netbox/project-static/styles/overrides/_bootstrap.scss b/netbox/project-static/styles/overrides/_bootstrap.scss
index 520452499..59c248541 100644
--- a/netbox/project-static/styles/overrides/_bootstrap.scss
+++ b/netbox/project-static/styles/overrides/_bootstrap.scss
@@ -14,3 +14,9 @@ html {
 .progress {
   min-width: 80px;
 }
+
+// Reduce vertical margin around dropdown menu divider
+hr.dropdown-divider {
+  margin-bottom: 0.25rem;
+  margin-top: 0.25rem;
+}
diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html
index d3124ea4a..ace305f34 100644
--- a/netbox/templates/base/layout.html
+++ b/netbox/templates/base/layout.html
@@ -21,16 +21,23 @@ Blocks:
     <aside class="navbar navbar-vertical navbar-expand-lg" data-bs-theme="dark">
       <div class="container-fluid">
 
-        {# Header icon #}
+        {# Menu toggle (mobile view) #}
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#sidebar-menu" aria-controls="sidebar-menu" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
+
+        {# Logo #}
         <h1 class="navbar-brand navbar-brand-autodark">
           <a href="{% url 'home' %}">
-            <img src="{% static 'netbox_logo.svg' %}" height="32" alt="{% trans "NetBox Logo" %}" class="navbar-brand-image">
+            <img src="{% static 'netbox_logo.svg' %}" alt="{% trans "NetBox Logo" %}" class="navbar-brand-image">
           </a>
         </h1>
 
+        {# User menu (mobile view) #}
+        <div class="navbar-nav flex-row d-lg-none">
+          {% include 'inc/user_menu.html' %}
+        </div>
+
         {# Navigation menu #}
         <div class="collapse navbar-collapse" id="sidebar-menu">
           {% nav %}
@@ -43,11 +50,6 @@ Blocks:
     <header class="navbar navbar-expand-md d-none d-lg-flex d-print-none">
       <div class="container-fluid">
 
-        {# Nav menu toggle #}
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu" aria-controls="navbar-menu" aria-expanded="false" aria-label="Toggle navigation">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-
         <div class="navbar-nav flex-row align-items-center order-md-last">
           {# Dark/light mode toggle #}
           <div class="d-none d-md-flex">
@@ -60,46 +62,7 @@ Blocks:
           </div>
 
           {# User menu #}
-          {% if request.user.is_authenticated %}
-            <div class="nav-item dropdown">
-              <a href="#" class="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown" aria-label="Open user menu">
-                <div class="d-xl-block ps-2">
-                  <div>{{ request.user }}</div>
-                  <div class="mt-1 small text-secondary">{% if request.user.is_staff %}Staff{% else %}User{% endif %}</div>
-                </div>
-              </a>
-              <div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow" {% htmx_boost %}>
-                {% if config.DJANGO_ADMIN_ENABLED and request.user.is_staff %}
-                  <a class="dropdown-item" href="{% url 'admin:index' %}">
-                    <i class="mdi mdi-cog"></i> {% trans "Django Admin" %}
-                  </a>
-                {% endif %}
-                <a href="{% url 'account:profile' %}" class="dropdown-item">
-                  <i class="mdi mdi-account"></i> {% trans "Profile" %}
-                </a>
-                <a href="{% url 'account:bookmarks' %}" class="dropdown-item">
-                  <i class="mdi mdi-bookmark"></i> {% trans "Bookmarks" %}
-                </a>
-                <a href="{% url 'account:preferences' %}" class="dropdown-item">
-                  <i class="mdi mdi-wrench"></i> {% trans "Preferences" %}
-                </a>
-                <a href="{% url 'account:usertoken_list' %}" class="dropdown-item">
-                  <i class="mdi mdi-key"></i> {% trans "API Tokens" %}
-                </a>
-                <div class="dropdown-divider"></div>
-                <a href="{% url 'logout' %}" hx-disable="true" class="dropdown-item">
-                  <i class="mdi mdi-logout-variant"></i> {% trans "Log Out" %}
-                </a>
-              </div>
-            </div>
-          {% else %}
-            <div class="btn-group ps-2">
-              <a class="btn btn-primary" type="button" href="{% url 'login' %}?next={{ request.path }}">
-                <i class="mdi mdi-login-variant"></i> {% trans "Log In" %}
-              </a>
-            </div>
-          {% endif %}
-          {# /User menu #}
+          {% include 'inc/user_menu.html' %}
         </div>
 
         {# Search box #}
diff --git a/netbox/templates/inc/user_menu.html b/netbox/templates/inc/user_menu.html
new file mode 100644
index 000000000..30ea63059
--- /dev/null
+++ b/netbox/templates/inc/user_menu.html
@@ -0,0 +1,50 @@
+{% load i18n %}
+{% load navigation %}
+
+{% if request.user.is_authenticated %}
+  <div class="nav-item dropdown">
+    <a href="#" class="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown" aria-label="Open user menu">
+      <div class="d-xl-block ps-2">
+        <div>{{ request.user }}</div>
+        <div class="mt-1 small text-secondary">
+          {% if request.user.is_superuser %}
+            {% trans "Admin" %}
+          {% elif request.user.is_staff %}
+            {% trans "Staff" %}
+          {% else %}
+            {% trans "User" %}
+          {% endif %}
+        </div>
+      </div>
+    </a>
+    <div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow" {% htmx_boost %}>
+      {% if config.DJANGO_ADMIN_ENABLED and request.user.is_staff %}
+        <a class="dropdown-item" href="{% url 'admin:index' %}">
+          <i class="mdi mdi-cog"></i> {% trans "Django Admin" %}
+        </a>
+      {% endif %}
+      <a href="{% url 'account:profile' %}" class="dropdown-item">
+        <i class="mdi mdi-account"></i> {% trans "Profile" %}
+      </a>
+      <a href="{% url 'account:bookmarks' %}" class="dropdown-item">
+        <i class="mdi mdi-bookmark"></i> {% trans "Bookmarks" %}
+      </a>
+      <a href="{% url 'account:preferences' %}" class="dropdown-item">
+        <i class="mdi mdi-wrench"></i> {% trans "Preferences" %}
+      </a>
+      <a href="{% url 'account:usertoken_list' %}" class="dropdown-item">
+        <i class="mdi mdi-key"></i> {% trans "API Tokens" %}
+      </a>
+      <hr class="dropdown-divider" />
+      <a href="{% url 'logout' %}" hx-disable="true" class="dropdown-item">
+        <i class="mdi mdi-logout-variant"></i> {% trans "Log Out" %}
+      </a>
+    </div>
+  </div>
+{% else %}
+  <div class="btn-group align-items-center ps-2">
+    <a class="btn btn-primary" type="button" href="{% url 'login' %}?next={{ request.path }}">
+      <i class="mdi mdi-login-variant"></i> {% trans "Log In" %}
+    </a>
+  </div>
+{% endif %}