From 37aa07eea195bbba6c6f9f43a3c9d10329e38a9d Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Fri, 24 Mar 2023 22:01:41 -0400
Subject: [PATCH] Clean up navigation menu

---
 netbox/netbox/navigation/menu.py            |  54 +++++++++++++++-----
 netbox/project-static/dist/netbox-dark.css  | Bin 375270 -> 375259 bytes
 netbox/project-static/dist/netbox-light.css | Bin 232647 -> 232636 bytes
 netbox/project-static/dist/netbox-print.css | Bin 727156 -> 727125 bytes
 netbox/project-static/styles/sidenav.scss   |   8 +--
 5 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py
index f5d15b3d8..a639fe4d6 100644
--- a/netbox/netbox/navigation/menu.py
+++ b/netbox/netbox/navigation/menu.py
@@ -265,17 +265,24 @@ POWER_MENU = Menu(
     ),
 )
 
-OTHER_MENU = Menu(
-    label=_('Other'),
-    icon_class='mdi mdi-notification-clear-all',
+PROVISIONING_MENU = Menu(
+    label=_('Provisioning'),
+    icon_class='mdi mdi-file-document-multiple-outline',
     groups=(
         MenuGroup(
-            label=_('Logging'),
+            label=_('Configurations'),
             items=(
-                get_model_item('extras', 'journalentry', _('Journal Entries'), actions=[]),
-                get_model_item('extras', 'objectchange', _('Change Log'), actions=[]),
+                get_model_item('extras', 'configcontext', _('Config Contexts'), actions=['add']),
+                get_model_item('extras', 'configtemplate', _('Config Templates'), actions=['add']),
             ),
         ),
+    ),
+)
+
+CUSTOMIZATION_MENU = Menu(
+    label=_('Customization'),
+    icon_class='mdi mdi-toolbox-outline',
+    groups=(
         MenuGroup(
             label=_('Customization'),
             items=(
@@ -283,13 +290,12 @@ OTHER_MENU = Menu(
                 get_model_item('extras', 'customlink', _('Custom Links')),
                 get_model_item('extras', 'exporttemplate', _('Export Templates')),
                 get_model_item('extras', 'savedfilter', _('Saved Filters')),
+                get_model_item('extras', 'tag', 'Tags'),
             ),
         ),
         MenuGroup(
-            label=_('Integrations'),
+            label=_('Reports & Scripts'),
             items=(
-                get_model_item('core', 'datasource', _('Data Sources')),
-                get_model_item('extras', 'webhook', _('Webhooks')),
                 MenuItem(
                     link='extras:report_list',
                     link_text=_('Reports'),
@@ -300,6 +306,25 @@ OTHER_MENU = Menu(
                     link_text=_('Scripts'),
                     permissions=['extras.view_script']
                 ),
+            ),
+        ),
+    ),
+)
+
+OPERATIONS_MENU = Menu(
+    label=_('Operations'),
+    icon_class='mdi mdi-cogs',
+    groups=(
+        MenuGroup(
+            label=_('Integrations'),
+            items=(
+                get_model_item('core', 'datasource', _('Data Sources')),
+                get_model_item('extras', 'webhook', _('Webhooks')),
+            ),
+        ),
+        MenuGroup(
+            label=_('Jobs'),
+            items=(
                 MenuItem(
                     link='extras:jobresult_list',
                     link_text=_('Jobs'),
@@ -308,11 +333,10 @@ OTHER_MENU = Menu(
             ),
         ),
         MenuGroup(
-            label=_('Other'),
+            label=_('Logging'),
             items=(
-                get_model_item('extras', 'tag', 'Tags'),
-                get_model_item('extras', 'configcontext', _('Config Contexts'), actions=['add']),
-                get_model_item('extras', 'configtemplate', _('Config Templates'), actions=['add']),
+                get_model_item('extras', 'journalentry', _('Journal Entries'), actions=[]),
+                get_model_item('extras', 'objectchange', _('Change Log'), actions=[]),
             ),
         ),
     ),
@@ -329,7 +353,9 @@ MENUS = [
     VIRTUALIZATION_MENU,
     CIRCUITS_MENU,
     POWER_MENU,
-    OTHER_MENU,
+    PROVISIONING_MENU,
+    CUSTOMIZATION_MENU,
+    OPERATIONS_MENU,
 ]
 
 #
diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index da4e4ea6ee767a624446f8672cd0528cead7a01a..a690cfcac567f2f961bcaa36b88a810b54c79ee8 100644
GIT binary patch
delta 58
zcmV-A0LB02^A_9l7J!5SgaU*Ev;=I*lTo2Kmte{SvzO2!0tJ_f<^m*_fW!m|mmkao
QA-84A1h56SWzhtI==`7=PXGV_

delta 68
zcmV-K0K5O&^A_gw7J!5SgaU*Ev;=I*m$1qNr<d`i1Sywb#RLeqiOU4h1r2*`VRC0_
aZY^|ga5^%VA*uu?mypi{9JgB01cB%yY8`t3

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index 406ab5447140c7119fc578cc40da06a2c24a3b08..fad60f89bd494d1771dd39d750e056aeda843cba 100644
GIT binary patch
delta 71
zcmV-N0J#6hnGU>}4uFIKv;r;Z4|{E4a%X97En;tUbZ>1smtpP#6PJ$Z0t%Nm=>mI~
da2^5$mv8C<ESGOW0SmY7=>nJpx3lg76rKv?9K`?t

delta 61
zcmV-D0K)&gnGVO94uFIKv;r;Zmrv;eg_n-%0x*|vLIDf65b6S$1P^;{VRC0_ZY^|g
Ta5^$@c$Y!#0w1@i?gA8^3ji3P

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 930ac4c9333fdcdb989ee46d836fd761af3a9ce4..37814cd201bda878c83e76f53f1cb2fc618857bf 100644
GIT binary patch
delta 120
zcmeyeLFeiQorV_17N!>F7M2#)7Pc1l7LF~Pf9<Ak(_>MY9$?4G17gWe4>02tWX?-0
zn<OJLUDlXUbh?8TC+GHGcAUM8(+gr*SSQPbif&)vz$wf<{htpf=X4n!pmv8KPRZ#9
UoH<#*V(oi;IJfWd;o5N;0Ax8Qg#Z8m

delta 105
zcmcb*LFdZ`orV_17N!>F7M2#)7Pc1l7LF~Pf9<B{IdF1qpKH(Az&M%FS8}?86({F*
z2S-jW?&&~5gXt4IIR!y1+35=YoT>uVxrs&TnR&V;`2|)+1r@c^<Gnd0+Z}v>dVIJ<
G&j0{Zh$1im

diff --git a/netbox/project-static/styles/sidenav.scss b/netbox/project-static/styles/sidenav.scss
index 4261e5120..3e2a53ef9 100644
--- a/netbox/project-static/styles/sidenav.scss
+++ b/netbox/project-static/styles/sidenav.scss
@@ -185,6 +185,10 @@
     margin-bottom: 0;
   }
 
+  .nav {
+    margin-bottom: 0.5rem;
+  }
+
   // Child Link nav-item
   .nav .nav-item {
     display: flex;
@@ -193,8 +197,7 @@
     width: 100%;
 
     &.no-buttons {
-      // When there are no buttons, don't extend to the full width of the sidenav.
-      padding-right: $spacer * 5;
+      padding-right: 0.5rem;
     }
   }
 
@@ -262,7 +265,6 @@
     margin-left: -$sidenav-spacing-x;
 
     .nav-item {
-      margin-top: 2px;
 
       &.disabled {
         cursor: not-allowed;