Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 30, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7c3e80
Closes #19358: Move release info from footer to nav menu
jeremystretch Apr 29, 2025
9685659
Tweak link text
jeremystretch Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netbox/project-static/dist/netbox.css
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions netbox/project-static/styles/transitional/_navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
16 changes: 13 additions & 3 deletions netbox/templates/base/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{# 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 %}

Expand Down Expand Up @@ -51,8 +51,19 @@ <h1 class="navbar-brand pb-0">
{# 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>

Expand Down Expand Up @@ -210,7 +221,6 @@ <h1 class="navbar-brand pb-0">
<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 #}

Expand Down