Skip to content

feat: [five-c] User experience (UX) enhancements #524

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

Open
tdruez wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat: [five-c] User experience (UX) enhancements #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a2078e
rework the top navbar menu with compliance as starting point
tdruez Apr 24, 2026
aa24c80
add side_menu navigation
tdruez Apr 24, 2026
a124a80
refine side_menu navigation
tdruez Apr 24, 2026
a4bb068
adjust CSS
tdruez Apr 24, 2026
d54ab94
refine the menu button
tdruez Apr 24, 2026
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
3 changes: 3 additions & 0 deletions dje/templates/bootstrap_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
{% if FAVICON_HREF %}<link rel="icon" href="{{ FAVICON_HREF }}">{% endif %}
</head>
<body class="d-flex flex-column h-100 {% block bodyclass %}{% endblock %}">
{% block side_menu %}
{% include 'navbar/side_menu.html' %}
{% endblock %}
<header>
{% block header %}
{% include HEADER_TEMPLATE %}
Expand Down
2 changes: 1 addition & 1 deletion dje/templates/includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'includes/navbar_header.html' %}
{% extends 'navbar/navbar_header.html' %}
{% load i18n %}

{% block nav-brand %}
Expand Down
24 changes: 0 additions & 24 deletions dje/templates/includes/navbar_header_left_menu.html
View file
Open in desktop

This file was deleted.

28 changes: 12 additions & 16 deletions dje/templates/includes/navbar_header.html → dje/templates/navbar/navbar_header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
{% load i18n static %}

{% url 'product_portfolio:product_list' as product_list_url %}
{% url 'component_catalog:component_list' as component_list_url %}
{% url 'component_catalog:package_list' as package_list_url %}
{% url 'license_library:license_list' as license_list_url %}
{% url 'organization:owner_list' as owner_list_url %}
{% url 'global_search' as global_search_url %}
{% url 'product_portfolio:compliance_dashboard' as compliance_dashboard_url %}
{% url 'reporting:report_list' as report_list_url %}
{% url 'workflow:request_list' as request_list_url %}
{% url 'component_catalog:scan_list' as scan_list_url %}
{% url 'purldb:purldb_list' as purldb_list_url %}
{% url 'vulnerabilities:vulnerability_list' as vulnerability_list_url %}
{% url 'django_registration_register' as register_url %}
{% url 'api_v2:api-root' as api_root_url %}
{% url 'account_profile' as account_profile_url %}

<nav class="navbar navbar-expand-xl fixed-top">
{# If the anonymous feature is enabled, the user will have a dataspace assigned at that point #}
{% if not user.is_authenticated and not user.dataspace %}
<a class="navbar-brand" href="{% url 'index_dispatch' %}">{{ SITE_TITLE }}</a>
{% else %}
<button class="btn btn-link nav-link px-2 border me-2 fs-5" type="button"
data-bs-toggle="offcanvas"
data-bs-target="#sideMenu"
aria-controls="sideMenu"
aria-label="Open menu">
<i class="fas fa-bars"></i>
</button>
{% block nav-brand %}
<div class="navbar-brand">{{ SITE_TITLE }}</div>
<a class="navbar-brand" href="{% url 'index_dispatch' %}">{{ SITE_TITLE }}</a>
{% endblock %}
<button class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#navbarOffcanvas" aria-controls="navbarOffcanvas" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand All @@ -34,12 +30,12 @@ <h5 class="offcanvas-title" id="offcanvasNavbarLabel">Menu</h5>
</div>
<div class="offcanvas-body">
<ul class="navbar-nav">
{% include 'includes/navbar_header_left_menu.html' %}
{% include 'includes/navbar_header_tools_menu.html' %}
{% include 'navbar/navbar_header_left_menu.html' %}
{# include 'navbar/navbar_header_tools_menu.html' #}
</ul>
<ul class="navbar-nav ms-xl-auto">
{% include 'includes/navbar_header_search_form.html' %}
{% include 'includes/navbar_header_right_menu.html' %}
{% include 'navbar/navbar_header_search_form.html' %}
{% include 'navbar/navbar_header_right_menu.html' %}
</ul>
</div>
</div>
Expand Down
28 changes: 28 additions & 0 deletions dje/templates/navbar/navbar_header_left_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{% load i18n %}
{% url 'product_portfolio:product_list' as product_list_url %}
{% url 'component_catalog:package_list' as package_list_url %}
{% url 'license_library:license_list' as license_list_url %}
{% url 'product_portfolio:compliance_dashboard' as compliance_dashboard_url %}

{% if not user.is_anonymous and SHOW_PP_IN_NAV %}
<li class="nav-item{% if product_list_url in request.path and 'compliance' not in request.path %} active{% endif %}">
<a class="nav-link" href="{{ product_list_url }}">
{% trans 'Products' %}
</a>
</li>
{% endif %}
<li class="nav-item{% if package_list_url in request.path %} active{% endif %}">
<a class="nav-link" href="{{ package_list_url }}">
{% trans 'Packages' %}
</a>
</li>
<li class="nav-item{% if license_list_url in request.path %} active{% endif %}">
<a class="nav-link" href="{{ license_list_url }}">
{% trans 'Licenses' %}
</a>
</li>
<li class="nav-item{% if compliance_dashboard_url in request.path %} active{% endif %}">
<a class="nav-link" href="{{ compliance_dashboard_url }}">
{% trans 'Compliance' %}
</a>
</li>
36 changes: 3 additions & 33 deletions ...es/includes/navbar_header_right_menu.html → ...ates/navbar/navbar_header_right_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<li class="nav-item">
<hr class="d-xl-none my-2 text-white-50">
</li>
{% include 'includes/navbar_theme_toogle.html' %}
{% include 'navbar/navbar_theme_toogle.html' %}
{% if user.is_anonymous %}
<li class="nav-item">
<a class="nav-link" href="{% url 'login' %}"><i class="fas fa-sign-in-alt"></i> {% trans 'Sign in' %}</a>
Expand Down Expand Up @@ -60,38 +60,8 @@
<div class="dropdown-header">Administration</div>
<a class="dropdown-item" href="{% url 'admin:index' %}">
<i class="fas fa-tachometer-alt" aria-hidden="true"></i>
Dashboard
Admin Dashboard
</a>
{% if perms.product_portfolio.change_product %}
<a class="dropdown-item" href="{% url 'admin:product_portfolio_product_changelist' %}">
<i class="fa fa-briefcase" aria-hidden="true"></i>
{% trans 'Products' %}
</a>
{% endif %}
{% if perms.component_catalog.change_component %}
<a class="dropdown-item" href="{% url 'admin:component_catalog_component_changelist' %}">
<i class="fa fa-puzzle-piece" aria-hidden="true"></i>
{% trans 'Components' %}
</a>
{% endif %}
{% if perms.component_catalog.change_package %}
<a class="dropdown-item" href="{% url 'admin:component_catalog_package_changelist' %}">
<i class="fas fa-archive" aria-hidden="true"></i>
{% trans 'Packages' %}
</a>
{% endif %}
{% if perms.license_library.change_license %}
<a class="dropdown-item" href="{% url 'admin:license_library_license_changelist' %}">
<i class="fa fa-book" aria-hidden="true"></i>
{% trans 'Licenses' %}
</a>
{% endif %}
{% if perms.organization.change_owner %}
<a class="dropdown-item" href="{% url 'admin:organization_owner_changelist' %}">
<i class="fa fa-users" aria-hidden="true"></i>
{% trans 'Owners' %}
</a>
{% endif %}
{% endif %}
{% if user.is_staff %}
<div class="dropdown-divider"></div>
Expand All @@ -107,7 +77,7 @@
<form id="logout-form" method="post" action="{% url 'logout' %}">
{% csrf_token %}
<button type="submit" class="dropdown-item">
<i class="fa fa-power-off" aria-hidden="true"></i>
<i class="fas fa-right-to-bracket" aria-hidden="true"></i>
{% trans "Sign Out" %}
</button>
</form>
Expand Down
0 ...s/includes/navbar_header_search_form.html → ...tes/navbar/navbar_header_search_form.html
View file
Open in desktop
File renamed without changes.
16 changes: 10 additions & 6 deletions ...es/includes/navbar_header_tools_menu.html → ...ates/navbar/navbar_header_tools_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
Tools
</a>
<div class="dropdown-menu">
<div class="dropdown-header">Compliance</div>
<a class="dropdown-item{% if compliance_dashboard_url in request.path %} active{% endif %}" href="{{ compliance_dashboard_url }}">
<i class="fa-solid fa-shield-halved" aria-hidden="true"></i>
Control Center
</a>
<div class="dropdown-divider"></div>
<div class="dropdown-header">Reporting</div>
<a class="dropdown-item{% if report_list_url in request.path %} active{% endif %}" href="{{ report_list_url }}">
<i class="far fa-chart-bar" aria-hidden="true"></i>
Expand Down Expand Up @@ -56,6 +50,16 @@
<i class="fab fa-leanpub" aria-hidden="true"></i>
API Documentation
</a>
<div class="dropdown-divider"></div>
<div class="dropdown-header">Models</div>
<a class="dropdown-item{% if component_list_url in request.path %} active{% endif %}" href="{{ component_list_url }}">
<i class="fa fa-puzzle-piece"></i>
Components
</a>
<a class="dropdown-item{% if owner_list_url in request.path %} active{% endif %}" href="{{ owner_list_url }}">
<i class="fa fa-users"></i>
Owner
</a>
</div>
</li>
<li class="nav-item">
Expand Down
0 ...mplates/includes/navbar_theme_toogle.html → ...templates/navbar/navbar_theme_toogle.html
View file
Open in desktop
File renamed without changes.
Loading
Loading