Browse Source

Closes #19358: Move release info from footer to nav menu (#19360)

Jeremy Stretch 9 months ago
parent
commit
6202ae1236

File diff suppressed because it is too large
+ 0 - 0
netbox/project-static/dist/netbox.css


+ 0 - 5
netbox/project-static/styles/transitional/_navigation.scss

@@ -1,11 +1,6 @@
 // Navbar and light theme styling
 .navbar-vertical.navbar-expand-lg {
 
-  // Adds spacing to the bottom of the side navigation to avoid hidden nav items
-  @include media-breakpoint-up(lg) {
-    padding-bottom: 2rem;
-  }
-
   // Adjust hover color & style for menu items
   .navbar-collapse {
     .nav-link-icon {

+ 13 - 3
netbox/templates/base/layout.html

@@ -21,7 +21,7 @@ Blocks:
     {# Sidebar #}
     <aside class="navbar navbar-vertical navbar-expand-lg d-print-none">
 
-      {% if 'commercial' in settings.RELEASE.features %}
+      {% if settings.RELEASE.features.commercial %}
         <img class="motif" src="{% static 'motif.svg' %}" alt="{% trans "NetBox Motif" %}">
       {% endif %}
 
@@ -51,8 +51,19 @@ Blocks:
         {# Navigation menu #}
         <div class="collapse navbar-collapse" id="sidebar-menu">
           {% nav %}
-        </div>
 
+          {# Release info #}
+          <div class="text-muted text-center fs-5 my-3">
+            {{ settings.RELEASE.name }}
+            {% if not settings.RELEASE.features.commercial %}
+              <div>
+                <a href="https://netboxlabs.com/netbox-cloud/" class="text-muted">{% trans "Get" %} Cloud</a> |
+                <a href="https://netboxlabs.com/netbox-enterprise/" class="text-muted">{% trans "Get" %} Enterprise</a>
+              </div>
+            {% endif %}
+          </div>
+
+        </div>
       </div>
     </aside>
 
@@ -210,7 +221,6 @@ Blocks:
             <ul class="list-inline list-inline-dots fs-5 mb-0" id="footer-stamp" hx-swap-oob="true">
               <li class="list-inline-item">{% now 'Y-m-d H:i:s T' %}</li>
               <li class="list-inline-item">{{ settings.HOSTNAME }}</li>
-              <li class="list-inline-item">{{ settings.RELEASE.name }}</li>
             </ul>
             {# /Footer text #}
 

Some files were not shown because too many files changed in this diff