From 2a2078ea34c2b94098160d04a962d774386d393c Mon Sep 17 00:00:00 2001 From: tdruez Date: Fri, 24 Apr 2026 09:50:53 +0400 Subject: [PATCH 01/36] rework the top navbar menu with compliance as starting point Signed-off-by: tdruez --- dje/templates/includes/header.html | 2 +- .../includes/navbar_header_left_menu.html | 24 -------------- .../{includes => navbar}/navbar_header.html | 8 ++--- .../navbar/navbar_header_left_menu.html | 33 +++++++++++++++++++ .../navbar_header_right_menu.html | 2 +- .../navbar_header_search_form.html | 0 .../navbar_header_tools_menu.html | 16 +++++---- .../navbar_theme_toogle.html | 0 8 files changed, 49 insertions(+), 36 deletions(-) delete mode 100644 dje/templates/includes/navbar_header_left_menu.html rename dje/templates/{includes => navbar}/navbar_header.html (88%) create mode 100644 dje/templates/navbar/navbar_header_left_menu.html rename dje/templates/{includes => navbar}/navbar_header_right_menu.html (99%) rename dje/templates/{includes => navbar}/navbar_header_search_form.html (100%) rename dje/templates/{includes => navbar}/navbar_header_tools_menu.html (87%) rename dje/templates/{includes => navbar}/navbar_theme_toogle.html (100%) diff --git a/dje/templates/includes/header.html b/dje/templates/includes/header.html index bf99ee4f..fa094deb 100644 --- a/dje/templates/includes/header.html +++ b/dje/templates/includes/header.html @@ -1,4 +1,4 @@ -{% extends 'includes/navbar_header.html' %} +{% extends 'navbar/navbar_header.html' %} {% load i18n %} {% block nav-brand %} diff --git a/dje/templates/includes/navbar_header_left_menu.html b/dje/templates/includes/navbar_header_left_menu.html deleted file mode 100644 index 40e8b256..00000000 --- a/dje/templates/includes/navbar_header_left_menu.html +++ /dev/null @@ -1,24 +0,0 @@ -{% load i18n %} -{% 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 %} - -{% if not user.is_anonymous and SHOW_PP_IN_NAV %} -
  • - {% trans 'Products' %} -
    • -{% endif %} -
  • - {% trans 'Components' %} -
    • -
  • - {% trans 'Packages' %} -
    • -
  • - {% trans 'Licenses' %} -
    • -
  • - {% trans 'Owners' %} -
    • \ No newline at end of file diff --git a/dje/templates/includes/navbar_header.html b/dje/templates/navbar/navbar_header.html similarity index 88% rename from dje/templates/includes/navbar_header.html rename to dje/templates/navbar/navbar_header.html index 405aeedd..0c35375e 100644 --- a/dje/templates/includes/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -34,12 +34,12 @@
    Menu
      - {% 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' %}
      - {% 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' %}
    diff --git a/dje/templates/navbar/navbar_header_left_menu.html b/dje/templates/navbar/navbar_header_left_menu.html new file mode 100644 index 00000000..913c97e8 --- /dev/null +++ b/dje/templates/navbar/navbar_header_left_menu.html @@ -0,0 +1,33 @@ +{% load i18n %} +{% 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 %} + +
  • + + + {% trans 'Compliance' %} + +
    • +{% if not user.is_anonymous and SHOW_PP_IN_NAV %} +
  • + + + {% trans 'Products' %} + +
    • +{% endif %} +
  • + + + {% trans 'Packages' %} + +
    • +
  • + + + {% trans 'Licenses' %} + +
    • \ No newline at end of file diff --git a/dje/templates/includes/navbar_header_right_menu.html b/dje/templates/navbar/navbar_header_right_menu.html similarity index 99% rename from dje/templates/includes/navbar_header_right_menu.html rename to dje/templates/navbar/navbar_header_right_menu.html index 73fad794..99850f49 100644 --- a/dje/templates/includes/navbar_header_right_menu.html +++ b/dje/templates/navbar/navbar_header_right_menu.html @@ -10,7 +10,7 @@
    • - {% include 'includes/navbar_theme_toogle.html' %} + {% include 'navbar/navbar_theme_toogle.html' %} {% if user.is_anonymous %}
  • {% trans 'Sign in' %} diff --git a/dje/templates/includes/navbar_header_search_form.html b/dje/templates/navbar/navbar_header_search_form.html similarity index 100% rename from dje/templates/includes/navbar_header_search_form.html rename to dje/templates/navbar/navbar_header_search_form.html diff --git a/dje/templates/includes/navbar_header_tools_menu.html b/dje/templates/navbar/navbar_header_tools_menu.html similarity index 87% rename from dje/templates/includes/navbar_header_tools_menu.html rename to dje/templates/navbar/navbar_header_tools_menu.html index ced30d5c..a1506731 100644 --- a/dje/templates/includes/navbar_header_tools_menu.html +++ b/dje/templates/navbar/navbar_header_tools_menu.html @@ -5,12 +5,6 @@ Tools
    -
    Compliance
    - - - Control Center - -
    Reporting
    @@ -56,6 +50,16 @@ API Documentation +
    +
    Models
    + + + Components + + + + Owner +
  • diff --git a/dje/templates/includes/navbar_theme_toogle.html b/dje/templates/navbar/navbar_theme_toogle.html similarity index 100% rename from dje/templates/includes/navbar_theme_toogle.html rename to dje/templates/navbar/navbar_theme_toogle.html From aa24c80a7290c01190fd4495a092f65b38d4f5d4 Mon Sep 17 00:00:00 2001 From: tdruez Date: Fri, 24 Apr 2026 16:22:44 +0400 Subject: [PATCH 02/36] add side_menu navigation Signed-off-by: tdruez --- dje/templates/bootstrap_base.html | 3 + dje/templates/navbar/navbar_header.html | 5 ++ dje/templates/navbar/side_menu.html | 114 ++++++++++++++++++++++++ 3 files changed, 122 insertions(+) create mode 100644 dje/templates/navbar/side_menu.html diff --git a/dje/templates/bootstrap_base.html b/dje/templates/bootstrap_base.html index c8e22d99..ce0a3ad3 100644 --- a/dje/templates/bootstrap_base.html +++ b/dje/templates/bootstrap_base.html @@ -15,6 +15,9 @@ {% if FAVICON_HREF %}{% endif %} + {% block side_menu %} + {% include 'navbar/side_menu.html' %} + {% endblock %}
    {% block header %} {% include HEADER_TEMPLATE %} diff --git a/dje/templates/navbar/navbar_header.html b/dje/templates/navbar/navbar_header.html index 0c35375e..104b89da 100644 --- a/dje/templates/navbar/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -21,6 +21,11 @@ {% if not user.is_authenticated and not user.dataspace %} {{ SITE_TITLE }} {% else %} + {% block nav-brand %}
    {{ SITE_TITLE }}
    {% endblock %} diff --git a/dje/templates/navbar/side_menu.html b/dje/templates/navbar/side_menu.html new file mode 100644 index 00000000..7306ae10 --- /dev/null +++ b/dje/templates/navbar/side_menu.html @@ -0,0 +1,114 @@ +{% load i18n %} +
    +
    +
    + {{ SITE_TITLE }} +
    + +
    + +
    + + + + {# Footer area with user info, pushed to bottom with mt-auto #} +
    + {% if user.is_authenticated %} +
    + + +
    + {% else %} + + {% trans "Sign in" %} + + {% endif %} +
    +
    +
    \ No newline at end of file From a124a80a4ee16d360ca4ada1b04dbbbe27db5d12 Mon Sep 17 00:00:00 2001 From: tdruez Date: Fri, 24 Apr 2026 16:45:20 +0400 Subject: [PATCH 03/36] refine side_menu navigation Signed-off-by: tdruez --- dje/templates/navbar/navbar_header.html | 15 +- .../navbar/navbar_header_left_menu.html | 21 +- .../navbar/navbar_header_right_menu.html | 34 +-- dje/templates/navbar/side_menu.html | 225 +++++++++++++----- 4 files changed, 178 insertions(+), 117 deletions(-) diff --git a/dje/templates/navbar/navbar_header.html b/dje/templates/navbar/navbar_header.html index 104b89da..aaa95eab 100644 --- a/dje/templates/navbar/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -1,20 +1,9 @@ {% 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 %} -{% include 'includes/search_help_modal.html' %} \ No newline at end of file +{% include 'includes/search_modal.html' %} \ No newline at end of file diff --git a/dje/templates/navbar/navbar_header_search_form.html b/dje/templates/navbar/navbar_header_search_form.html index cecd9fc5..02ff0c26 100644 --- a/dje/templates/navbar/navbar_header_search_form.html +++ b/dje/templates/navbar/navbar_header_search_form.html @@ -1,38 +1,8 @@ {% load i18n %} -
  • - +
  • +
    • \ No newline at end of file From 22743e1c60baedf3ed8de32da297fd479084dad5 Mon Sep 17 00:00:00 2001 From: tdruez Date: Mon, 27 Apr 2026 16:02:32 +0400 Subject: [PATCH 10/36] display as rounded pills Signed-off-by: tdruez --- dje/templates/includes/search_modal.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dje/templates/includes/search_modal.html b/dje/templates/includes/search_modal.html index 1435c5c8..afdbe01c 100644 --- a/dje/templates/includes/search_modal.html +++ b/dje/templates/includes/search_modal.html @@ -17,18 +17,18 @@
    {% trans "Search in" %}
    - {% if not user.is_anonymous %} - {% endif %} - -
    From 62d94d8fad21db7a9cd4ff80feae46b00ba3e5d5 Mon Sep 17 00:00:00 2001 From: tdruez Date: Mon, 27 Apr 2026 16:07:20 +0400 Subject: [PATCH 11/36] display the search modal from the top Signed-off-by: tdruez --- dje/templates/includes/search_modal.html | 2 +- dje/templates/navbar/side_menu.html | 49 ++++++++++++------------ 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dje/templates/includes/search_modal.html b/dje/templates/includes/search_modal.html index afdbe01c..e3c2c4c5 100644 --- a/dje/templates/includes/search_modal.html +++ b/dje/templates/includes/search_modal.html @@ -1,6 +1,6 @@ {% load i18n %}
    • +
  • + + {% trans "Compliance" %} + +
    • + {% if not user.is_anonymous %} +
  • + + R{% trans "Requests" %} + +
    • +
  • + + {% trans "Reports" %} + +
    • + {% endif %} + {# Catalog section #}
  • @@ -70,31 +94,6 @@
    - - {% trans "Tools" %} - -
    • -
  • - - {% trans "Compliance" %} - -
    • - {% if not user.is_anonymous %} -
  • - - R{% trans "Requests" %} - -
    • -
  • - - {% trans "Reports" %} - -
    • - - {% endif %} - {# Integrations section #} {% if not user.is_anonymous %} {% if user.dataspace.enable_package_scanning or user.dataspace.enable_purldb_access or user.dataspace.enable_vulnerablecodedb_access or user.is_staff %} From a6560da4637e578c3892a17dce069a4300becb4e Mon Sep 17 00:00:00 2001 From: tdruez Date: Mon, 27 Apr 2026 17:11:51 +0400 Subject: [PATCH 12/36] refine the rendering of the search button in nav Signed-off-by: tdruez --- dje/templates/navbar/navbar_header_search_form.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dje/templates/navbar/navbar_header_search_form.html b/dje/templates/navbar/navbar_header_search_form.html index 02ff0c26..27878bab 100644 --- a/dje/templates/navbar/navbar_header_search_form.html +++ b/dje/templates/navbar/navbar_header_search_form.html @@ -1,8 +1,10 @@ {% load i18n %} -
  • -
    • \ No newline at end of file From 118dce7937ee99eab9f81c96bc36c8a31cd87db3 Mon Sep 17 00:00:00 2001 From: tdruez Date: Mon, 27 Apr 2026 18:29:52 +0400 Subject: [PATCH 13/36] adjust margin Signed-off-by: tdruez --- dje/templates/navbar/side_menu.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dje/templates/navbar/side_menu.html b/dje/templates/navbar/side_menu.html index cc617779..d404fab8 100644 --- a/dje/templates/navbar/side_menu.html +++ b/dje/templates/navbar/side_menu.html @@ -33,7 +33,7 @@
    +
  • {% trans "Tools" %} @@ -57,7 +57,7 @@
    +
  • {% trans "Catalog" %} From 1bbc70a5ac5dca4d5ca1856d5d87a65aef67d2dd Mon Sep 17 00:00:00 2001 From: tdruez Date: Mon, 27 Apr 2026 19:20:56 +0400 Subject: [PATCH 14/36] adjust main dejacode button rendering Signed-off-by: tdruez --- dje/templates/navbar/navbar_header.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dje/templates/navbar/navbar_header.html b/dje/templates/navbar/navbar_header.html index a629607a..614cab36 100644 --- a/dje/templates/navbar/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -10,16 +10,17 @@ {% if not user.is_authenticated and not user.dataspace %} {{ SITE_TITLE }} {% else %} - - {% block nav-brand %} - {{ SITE_TITLE }} - {% endblock %} + + + From 1b84a004aa2db07c2dee24a7c4c61405d972436e Mon Sep 17 00:00:00 2001 From: tdruez Date: Mon, 27 Apr 2026 19:35:37 +0400 Subject: [PATCH 15/36] add focus and hover behavior to the navbar buttons Signed-off-by: tdruez --- dejacode/static/css/dejacode_bootstrap.css | 8 ++++++++ dje/templates/navbar/navbar_header.html | 2 +- dje/templates/navbar/navbar_header_search_form.html | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dejacode/static/css/dejacode_bootstrap.css b/dejacode/static/css/dejacode_bootstrap.css index 49a51200..70012bdf 100644 --- a/dejacode/static/css/dejacode_bootstrap.css +++ b/dejacode/static/css/dejacode_bootstrap.css @@ -159,6 +159,14 @@ table.text-break thead { .navbar #search-form { width: 350px; } +.nav-chip { + transition: background-color 0.15s ease, border-color 0.15s ease; +} +.nav-chip:hover, +.nav-chip:focus-visible { + background-color: rgba(255, 255, 255, 0.18) !important; + border-color: rgba(255, 255, 255, 0.5) !important; +} /* -- Side menu -- */ #side-menu .nav-pills .nav-link.active { diff --git a/dje/templates/navbar/navbar_header.html b/dje/templates/navbar/navbar_header.html index 614cab36..dea8d6cc 100644 --- a/dje/templates/navbar/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -10,7 +10,7 @@ {% if not user.is_authenticated and not user.dataspace %} {{ SITE_TITLE }} {% else %} - From 9bece62c425b543eee48e312053c585f0f5d00df Mon Sep 17 00:00:00 2001 From: tdruez Date: Tue, 28 Apr 2026 12:17:56 +0400 Subject: [PATCH 17/36] add missing global search URL Signed-off-by: tdruez --- dje/templates/{includes => modals}/search_modal.html | 0 dje/templates/navbar/navbar_header.html | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename dje/templates/{includes => modals}/search_modal.html (100%) diff --git a/dje/templates/includes/search_modal.html b/dje/templates/modals/search_modal.html similarity index 100% rename from dje/templates/includes/search_modal.html rename to dje/templates/modals/search_modal.html diff --git a/dje/templates/navbar/navbar_header.html b/dje/templates/navbar/navbar_header.html index 5f0d4a34..41601ea4 100644 --- a/dje/templates/navbar/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -4,6 +4,7 @@ {% url 'license_library:license_list' as license_list_url %} {% url 'product_portfolio:compliance_dashboard' as compliance_dashboard_url %} {% url 'django_registration_register' as register_url %} +{% url 'global_search' as global_search_url %} -{% include 'includes/search_modal.html' %} \ No newline at end of file +{% include 'modals/search_modal.html' %} \ No newline at end of file From adab56259853b2d4e6c96c9a96dba5aadffe8eb8 Mon Sep 17 00:00:00 2001 From: tdruez Date: Tue, 28 Apr 2026 12:19:22 +0400 Subject: [PATCH 18/36] remove the SHOW_TOOLS_IN_NAV setting Signed-off-by: tdruez --- dejacode/settings.py | 3 --- dje/context_processors.py | 1 - dje/templates/navbar/navbar_header_left_menu.html | 2 +- dje/templates/navbar/side_menu.html | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dejacode/settings.py b/dejacode/settings.py index fd0941fc..dac71d74 100644 --- a/dejacode/settings.py +++ b/dejacode/settings.py @@ -381,9 +381,6 @@ def gettext_noop(s): # links to the "Requests" and "Reporting" views. SHOW_TOOLS_IN_NAV = env.bool("SHOW_TOOLS_IN_NAV", default=True) -# Set False to hide the "Product Portfolio" section in the navbar. -SHOW_PP_IN_NAV = env.bool("SHOW_PP_IN_NAV", default=True) - # An integer specifying how many objects should be displayed per table whithin tabs. TAB_PAGINATE_BY = env.int("TAB_PAGINATE_BY", default=100) diff --git a/dje/context_processors.py b/dje/context_processors.py index 3ee98911..a2e9e897 100644 --- a/dje/context_processors.py +++ b/dje/context_processors.py @@ -20,7 +20,6 @@ def dejacode_context(request): "SITE_TITLE": settings.SITE_TITLE, "HEADER_TEMPLATE": settings.HEADER_TEMPLATE, "FOOTER_TEMPLATE": settings.FOOTER_TEMPLATE, - "SHOW_PP_IN_NAV": settings.SHOW_PP_IN_NAV, "SHOW_TOOLS_IN_NAV": settings.SHOW_TOOLS_IN_NAV, "AXES_ENABLED": settings.AXES_ENABLED, "LOGIN_FORM_ALERT": settings.LOGIN_FORM_ALERT, diff --git a/dje/templates/navbar/navbar_header_left_menu.html b/dje/templates/navbar/navbar_header_left_menu.html index d6cc85c0..3e1da4bf 100644 --- a/dje/templates/navbar/navbar_header_left_menu.html +++ b/dje/templates/navbar/navbar_header_left_menu.html @@ -4,7 +4,7 @@ {% 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 %} +{% if not user.is_anonymous %}
  • {% trans 'Products' %} diff --git a/dje/templates/navbar/side_menu.html b/dje/templates/navbar/side_menu.html index d404fab8..4740c29d 100644 --- a/dje/templates/navbar/side_menu.html +++ b/dje/templates/navbar/side_menu.html @@ -62,7 +62,7 @@
    • - {% if not user.is_anonymous and SHOW_PP_IN_NAV %} + {% if not user.is_anonymous %}
  • {% trans "Products" %} From 09d42ae394243ed71ac7172145b440de205d77bd Mon Sep 17 00:00:00 2001 From: tdruez Date: Tue, 28 Apr 2026 12:22:22 +0400 Subject: [PATCH 19/36] remove the SHOW_TOOLS_IN_NAV setting Signed-off-by: tdruez --- dejacode/settings.py | 4 -- dje/context_processors.py | 1 - dje/templates/navbar/navbar_header.html | 1 - .../navbar/navbar_header_tools_menu.html | 68 ------------------- workflow/tests/test_views.py | 2 +- 5 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 dje/templates/navbar/navbar_header_tools_menu.html diff --git a/dejacode/settings.py b/dejacode/settings.py index dac71d74..6aa6a37a 100644 --- a/dejacode/settings.py +++ b/dejacode/settings.py @@ -377,10 +377,6 @@ def gettext_noop(s): # An email address displayed in UI for users to reach the support team. DEJACODE_SUPPORT_EMAIL = env.str("DEJACODE_SUPPORT_EMAIL", default="") -# Enable this setting to display a "Tools" section in the navbar including -# links to the "Requests" and "Reporting" views. -SHOW_TOOLS_IN_NAV = env.bool("SHOW_TOOLS_IN_NAV", default=True) - # An integer specifying how many objects should be displayed per table whithin tabs. TAB_PAGINATE_BY = env.int("TAB_PAGINATE_BY", default=100) diff --git a/dje/context_processors.py b/dje/context_processors.py index a2e9e897..6d044709 100644 --- a/dje/context_processors.py +++ b/dje/context_processors.py @@ -20,7 +20,6 @@ def dejacode_context(request): "SITE_TITLE": settings.SITE_TITLE, "HEADER_TEMPLATE": settings.HEADER_TEMPLATE, "FOOTER_TEMPLATE": settings.FOOTER_TEMPLATE, - "SHOW_TOOLS_IN_NAV": settings.SHOW_TOOLS_IN_NAV, "AXES_ENABLED": settings.AXES_ENABLED, "LOGIN_FORM_ALERT": settings.LOGIN_FORM_ALERT, } diff --git a/dje/templates/navbar/navbar_header.html b/dje/templates/navbar/navbar_header.html index 41601ea4..8a144bb3 100644 --- a/dje/templates/navbar/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -33,7 +33,6 @@
    Menu
      {% include 'navbar/navbar_header_left_menu.html' %} - {# include 'navbar/navbar_header_tools_menu.html' #}
      {% include 'navbar/navbar_header_search_form.html' %} diff --git a/dje/templates/navbar/navbar_header_tools_menu.html b/dje/templates/navbar/navbar_header_tools_menu.html deleted file mode 100644 index a1506731..00000000 --- a/dje/templates/navbar/navbar_header_tools_menu.html +++ /dev/null @@ -1,68 +0,0 @@ -{% load i18n %} -{% if not user.is_anonymous and SHOW_TOOLS_IN_NAV %} -
    • - -
      -
      Reporting
      - - - Reports - -
      -
      Workflow
      - - R - {% trans 'Requests' %} - - {% if user.dataspace.enable_package_scanning or user.dataspace.enable_purldb_access %} -
      -
      {% trans 'Packages' %}
      - {% if user.dataspace.enable_package_scanning %} - - - {% trans 'Scans' %} - - {% endif %} - {% if user.dataspace.enable_purldb_access %} - - - {% trans 'PurlDB' %} - - {% endif %} - {% endif %} - {% if user.dataspace.enable_vulnerablecodedb_access %} -
      -
      {% trans 'Vulnerabilities' %}
      - - - {% trans 'Vulnerabilities' %} - - {% endif %} -
      -
      API
      - - - API Browser - - - - API Documentation - -
      -
      Models
      - - - Components - - - - Owner - -
      -
      • -
    • -
      -
      • -{% endif %} \ No newline at end of file diff --git a/workflow/tests/test_views.py b/workflow/tests/test_views.py index 27339a2c..41eb6928 100644 --- a/workflow/tests/test_views.py +++ b/workflow/tests/test_views.py @@ -137,7 +137,7 @@ def setUp(self): content_type=self.component_ct, ) - @override_settings(ANONYMOUS_USERS_DATASPACE="nexB", SHOW_TOOLS_IN_NAV=True) + @override_settings(ANONYMOUS_USERS_DATASPACE="nexB") def test_workflow_request_link_availability_in_user_menu(self): url = reverse("workflow:request_list") response = self.client.get(reverse("license_library:license_list")) From 9142e861ed1d2ef7d109fdf0e926e5c3d7d14752 Mon Sep 17 00:00:00 2001 From: tdruez Date: Tue, 28 Apr 2026 13:17:43 +0400 Subject: [PATCH 20/36] adjust the break points Signed-off-by: tdruez --- dje/templates/includes/footer.html | 2 +- dje/templates/navbar/navbar_header.html | 4 ++-- .../navbar/navbar_header_right_menu.html | 16 ++++++++-------- .../navbar/navbar_header_search_form.html | 2 +- dje/templates/navbar/navbar_theme_toogle.html | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dje/templates/includes/footer.html b/dje/templates/includes/footer.html index 1df5875d..1c956f01 100644 --- a/dje/templates/includes/footer.html +++ b/dje/templates/includes/footer.html @@ -1,5 +1,5 @@ {% load i18n %} -
      +
      • Home
        • {# No trans for Home on purpose #} diff --git a/dje/templates/navbar/navbar_header.html b/dje/templates/navbar/navbar_header.html index 8a144bb3..632241fb 100644 --- a/dje/templates/navbar/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -6,7 +6,7 @@ {% url 'django_registration_register' as register_url %} {% url 'global_search' as global_search_url %} -
      -
        - {% include 'navbar/navbar_header_left_menu.html' %} -
      -
        +
          {% include 'navbar/navbar_header_search_form.html' %} {% include 'navbar/navbar_header_right_menu.html' %}
        diff --git a/dje/templates/navbar/navbar_header_right_menu.html b/dje/templates/navbar/navbar_header_right_menu.html index ad3070e7..de82d76a 100644 --- a/dje/templates/navbar/navbar_header_right_menu.html +++ b/dje/templates/navbar/navbar_header_right_menu.html @@ -8,7 +8,7 @@ {% endif %}
      • -
        +
        • {% include 'navbar/navbar_theme_toogle.html' %} {% if user.is_anonymous %} @@ -17,24 +17,24 @@ {% else %}
      • -
        +
      • {% if user|has_notification %} - + - - Notifications + + Notifications {% else %} - + - Notifications + Notifications {% endif %}
      • -
        +
        • From bdb2daf78ea90d71e6dfcaba7dea2607a29ad57c Mon Sep 17 00:00:00 2001 From: tdruez Date: Tue, 28 Apr 2026 13:33:08 +0400 Subject: [PATCH 22/36] set offcanva size Signed-off-by: tdruez --- dejacode/static/css/dejacode_bootstrap.css | 7 ++----- dje/templates/navbar/side_menu.html | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dejacode/static/css/dejacode_bootstrap.css b/dejacode/static/css/dejacode_bootstrap.css index 70012bdf..29d36bde 100644 --- a/dejacode/static/css/dejacode_bootstrap.css +++ b/dejacode/static/css/dejacode_bootstrap.css @@ -141,9 +141,6 @@ table.text-break thead { background-color: var(--bs-djc-blue-bg); height: 54px; } -.navbar .offcanvas { - background-color: var(--bs-djc-blue-bg) !important; -} .navbar-nav .active>.nav-link, .navbar-nav .show>.nav-link .navbar-nav .nav-link.active, @@ -156,8 +153,8 @@ table.text-break thead { .navbar #search-input::placeholder { color: var(--bs-gray-300); } -.navbar #search-form { - width: 350px; +.offcanvas { + --bs-offcanvas-width: 280px; } .nav-chip { transition: background-color 0.15s ease, border-color 0.15s ease; diff --git a/dje/templates/navbar/side_menu.html b/dje/templates/navbar/side_menu.html index 4740c29d..0dc9ec29 100644 --- a/dje/templates/navbar/side_menu.html +++ b/dje/templates/navbar/side_menu.html @@ -13,7 +13,7 @@ {% url 'api_v2:api-root' as api_root_url %} {% url 'account_profile' as account_profile_url %} -
          +
          {{ SITE_TITLE }} @@ -164,7 +164,7 @@
          • -
        • +
        • {% trans "Admin Dashboard" %} From fc15fabc298400d2451ec9beaaa7509c4fd743d1 Mon Sep 17 00:00:00 2001 From: tdruez Date: Tue, 28 Apr 2026 13:38:27 +0400 Subject: [PATCH 23/36] adjust label color and rendering for consistency in compliance tab Signed-off-by: tdruez --- .../compliance/compliance_panels.html | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/product_portfolio/templates/product_portfolio/compliance/compliance_panels.html b/product_portfolio/templates/product_portfolio/compliance/compliance_panels.html index 7f163654..ed90010e 100644 --- a/product_portfolio/templates/product_portfolio/compliance/compliance_panels.html +++ b/product_portfolio/templates/product_portfolio/compliance/compliance_panels.html @@ -41,11 +41,11 @@

          {% trans "License compliance" %}

      {% if license_issues_count == 0 %} - {% trans "OK" %} + {% trans "OK" %} {% elif license_error_count > 0 %} - {% trans "Error" %} + {% trans "Error" %} {% else %} - {% trans "Warning" %} + {% trans "Warning" %} {% endif %}
    @@ -76,11 +76,11 @@

    {% trans "License compliance" %}

    {% if license.compliance_alert == "error" %} - {% trans "Error" %} + {% trans "Error" %} {% elif license.compliance_alert == "warning" %} - {% trans "Warning" %} + {% trans "Warning" %} {% else %} - {% trans "OK" %} + {% trans "OK" %} {% endif %} @@ -139,15 +139,15 @@

    {% trans "Security compliance" %}

    {% if vulnerability_count == 0 or above_threshold_count == 0 %} - {% trans "OK" %} + {% trans "OK" %} {% elif max_vulnerability_severity == "critical" %} - {% trans "Critical" %} + {% trans "Critical" %} {% elif max_vulnerability_severity == "high" %} - {% trans "High" %} + {% trans "High" %} {% elif max_vulnerability_severity == "medium" %} - {% trans "Medium" %} + {% trans "Medium" %} {% else %} - {% trans "Low" %} + {% trans "Low" %} {% endif %} @@ -178,13 +178,13 @@

    {% trans "Security compliance" %}

    {% if vulnerability.risk_level == "critical" %} - {% trans "Critical" %} + {% trans "Critical" %} {% elif vulnerability.risk_level == "high" %} - {% trans "High" %} + {% trans "High" %} {% elif vulnerability.risk_level == "medium" %} - {% trans "Medium" %} + {% trans "Medium" %} {% elif vulnerability.risk_level == "low" %} - {% trans "Low" %} + {% trans "Low" %} {% else %} {% trans "Unknown" %} {% endif %} From 17418464462a2ef74a3ca88c267f3d6eb2bb6c24 Mon Sep 17 00:00:00 2001 From: tdruez Date: Tue, 28 Apr 2026 16:25:58 +0400 Subject: [PATCH 24/36] revert the background color for the offcanva menu Signed-off-by: tdruez --- dejacode/static/css/dejacode_bootstrap.css | 4 ++-- dje/templates/navbar/side_menu.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dejacode/static/css/dejacode_bootstrap.css b/dejacode/static/css/dejacode_bootstrap.css index 29d36bde..fe4f7f88 100644 --- a/dejacode/static/css/dejacode_bootstrap.css +++ b/dejacode/static/css/dejacode_bootstrap.css @@ -150,8 +150,8 @@ table.text-break thead { text-underline-position: under; color: var(--bs-white); } -.navbar #search-input::placeholder { - color: var(--bs-gray-300); +.navbar .offcanvas { + background-color: var(--bs-djc-blue-bg) !important; } .offcanvas { --bs-offcanvas-width: 280px; diff --git a/dje/templates/navbar/side_menu.html b/dje/templates/navbar/side_menu.html index 0dc9ec29..872ecef8 100644 --- a/dje/templates/navbar/side_menu.html +++ b/dje/templates/navbar/side_menu.html @@ -15,7 +15,7 @@
    -
    +
    {{ SITE_TITLE }}
    From e3d39541f0e9eab57edd98690c0867cfe6d43845 Mon Sep 17 00:00:00 2001 From: tdruez Date: Wed, 29 Apr 2026 11:53:31 +0400 Subject: [PATCH 25/36] reflect the active theme in the dropdown Signed-off-by: tdruez --- dejacode/static/js/bootstrap_theme_toggler.js | 115 +++++++++--------- dejacode/static/js/dejacode_main.js | 23 ++++ 2 files changed, 80 insertions(+), 58 deletions(-) diff --git a/dejacode/static/js/bootstrap_theme_toggler.js b/dejacode/static/js/bootstrap_theme_toggler.js index 0e020115..59372ae0 100644 --- a/dejacode/static/js/bootstrap_theme_toggler.js +++ b/dejacode/static/js/bootstrap_theme_toggler.js @@ -1,81 +1,80 @@ /*! -* Color mode toggler for Bootstrap's docs (https://getbootstrap.com/) -* Copyright 2011-2023 The Bootstrap Authors -* Licensed under the Creative Commons Attribution 3.0 Unported License. -* https://getbootstrap.com/docs/5.3/customize/color-modes/#javascript -*/ + * Color mode toggler for Bootstrap's docs (https://getbootstrap.com/) + * Copyright 2011-2025 The Bootstrap Authors + * Licensed under the Creative Commons Attribution 3.0 Unported License. + */ (() => { -'use strict' + 'use strict' const getStoredTheme = () => localStorage.getItem('theme') const setStoredTheme = theme => localStorage.setItem('theme', theme) -const getPreferredTheme = () => { - const storedTheme = getStoredTheme() - if (storedTheme) { - return storedTheme - } + const getPreferredTheme = () => { + const storedTheme = getStoredTheme() + if (storedTheme) { + return storedTheme + } - return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light' -} + return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light' + } -const setTheme = theme => { - if (theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches) { - document.documentElement.setAttribute('data-bs-theme', 'dark') - } else { - document.documentElement.setAttribute('data-bs-theme', theme) + const setTheme = theme => { + if (theme === 'auto') { + document.documentElement.setAttribute('data-bs-theme', (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')) + } else { + document.documentElement.setAttribute('data-bs-theme', theme) + } } -} -setTheme(getPreferredTheme()) + setTheme(getPreferredTheme()) -const showActiveTheme = (theme, focus = false) => { - const themeSwitcher = document.querySelector('#bd-theme') + const showActiveTheme = (theme, focus = false) => { + const themeSwitcher = document.querySelector('#bd-theme') - if (!themeSwitcher) { - return - } + if (!themeSwitcher) { + return + } - const themeSwitcherText = document.querySelector('#bd-theme-text') - const activeThemeIcon = document.querySelector('.theme-icon-active use') - const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`) - const svgOfActiveBtn = btnToActive.querySelector('svg use').getAttribute('href') + const themeSwitcherText = document.querySelector('#bd-theme-text') + const activeThemeIcon = document.querySelector('.theme-icon-active use') + const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`) + const svgOfActiveBtn = btnToActive.querySelector('svg use').getAttribute('href') - document.querySelectorAll('[data-bs-theme-value]').forEach(element => { - element.classList.remove('active') - element.setAttribute('aria-pressed', 'false') - }) + document.querySelectorAll('[data-bs-theme-value]').forEach(element => { + element.classList.remove('active') + element.setAttribute('aria-pressed', 'false') + }) - btnToActive.classList.add('active') - btnToActive.setAttribute('aria-pressed', 'true') - activeThemeIcon.setAttribute('href', svgOfActiveBtn) - const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})` - themeSwitcher.setAttribute('aria-label', themeSwitcherLabel) + btnToActive.classList.add('active') + btnToActive.setAttribute('aria-pressed', 'true') + activeThemeIcon.setAttribute('href', svgOfActiveBtn) + const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})` + themeSwitcher.setAttribute('aria-label', themeSwitcherLabel) - if (focus) { - themeSwitcher.focus() + if (focus) { + themeSwitcher.focus() + } } -} -window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { - const storedTheme = getStoredTheme() - if (storedTheme !== 'light' && storedTheme !== 'dark') { - setTheme(getPreferredTheme()) - } -}) + window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { + const storedTheme = getStoredTheme() + if (storedTheme !== 'light' && storedTheme !== 'dark') { + setTheme(getPreferredTheme()) + } + }) -window.addEventListener('DOMContentLoaded', () => { - showActiveTheme(getPreferredTheme()) + window.addEventListener('DOMContentLoaded', () => { + showActiveTheme(getPreferredTheme()) - document.querySelectorAll('[data-bs-theme-value]') - .forEach(toggle => { - toggle.addEventListener('click', () => { - const theme = toggle.getAttribute('data-bs-theme-value') - setStoredTheme(theme) - setTheme(theme) - showActiveTheme(theme, true) + document.querySelectorAll('[data-bs-theme-value]') + .forEach(toggle => { + toggle.addEventListener('click', () => { + const theme = toggle.getAttribute('data-bs-theme-value') + setStoredTheme(theme) + setTheme(theme) + showActiveTheme(theme, true) + }) }) - }) -}) + }) })() diff --git a/dejacode/static/js/dejacode_main.js b/dejacode/static/js/dejacode_main.js index 9be23ff1..2e782b34 100644 --- a/dejacode/static/js/dejacode_main.js +++ b/dejacode/static/js/dejacode_main.js @@ -168,6 +168,28 @@ function setupSearchModal() { }); } +function setupThemeSwitcher() { + // Reflects the active theme on the dropdown buttons since Bootstrap's own + // script targets its docs-specific markup and skips ours. + const getActiveTheme = () => localStorage.getItem('theme') || 'auto'; + + const markActiveTheme = theme => { + document.querySelectorAll('[data-bs-theme-value]').forEach(btn => { + const isActive = btn.getAttribute('data-bs-theme-value') === theme; + btn.classList.toggle('active', isActive); + btn.setAttribute('aria-pressed', isActive); + }); + }; + + markActiveTheme(getActiveTheme()); + + document.querySelectorAll('[data-bs-theme-value]').forEach(btn => { + btn.addEventListener('click', () => { + markActiveTheme(btn.getAttribute('data-bs-theme-value')); + }); + }); +} + document.addEventListener('DOMContentLoaded', () => { NEXB = {}; NEXB.client_data = JSON.parse(document.getElementById("client_data").textContent); @@ -203,4 +225,5 @@ document.addEventListener('DOMContentLoaded', () => { setupBackToTop(); setupHTMX(); setupSearchModal(); + setupThemeSwitcher(); }); From 676e148e168955e5bc059bf4bc1325b068f04373 Mon Sep 17 00:00:00 2001 From: tdruez Date: Wed, 29 Apr 2026 11:56:46 +0400 Subject: [PATCH 26/36] fix the focus order Signed-off-by: tdruez --- dejacode/static/js/dejacode_main.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dejacode/static/js/dejacode_main.js b/dejacode/static/js/dejacode_main.js index 2e782b34..428dd899 100644 --- a/dejacode/static/js/dejacode_main.js +++ b/dejacode/static/js/dejacode_main.js @@ -153,6 +153,11 @@ function setupSearchModal() { searchInput.select(); }); + // Move focus out before aria-hidden is restored to avoid accessibility warning + searchModal.addEventListener('hide.bs.modal', () => { + if (document.activeElement) document.activeElement.blur(); + }); + // Keyboard shortcuts: Ctrl/Cmd+K and / to open the modal document.addEventListener('keydown', (event) => { const isTyping = ['INPUT', 'TEXTAREA', 'SELECT'].includes(document.activeElement.tagName) || document.activeElement.isContentEditable; From 45addd8dde60af9ae50d4eb435b0572301c89b7c Mon Sep 17 00:00:00 2001 From: tdruez Date: Wed, 29 Apr 2026 12:04:47 +0400 Subject: [PATCH 27/36] add Requests in navbar header when viewpoint is large enough Signed-off-by: tdruez --- dje/templates/navbar/navbar_header.html | 1 + dje/templates/navbar/navbar_header_left_menu.html | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dje/templates/navbar/navbar_header.html b/dje/templates/navbar/navbar_header.html index f77c7737..1d464ab6 100644 --- a/dje/templates/navbar/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -5,6 +5,7 @@ {% url 'product_portfolio:compliance_dashboard' as compliance_dashboard_url %} {% url 'django_registration_register' as register_url %} {% url 'global_search' as global_search_url %} +{% url 'workflow:request_list' as request_list_url %} + {% include 'modals/search_modal.html' %} +{% endblock navbar %} \ No newline at end of file diff --git a/dje/templates/navbar/navbar_header_right_menu.html b/dje/templates/navbar/navbar_header_right_menu.html index de82d76a..8bd74574 100644 --- a/dje/templates/navbar/navbar_header_right_menu.html +++ b/dje/templates/navbar/navbar_header_right_menu.html @@ -2,23 +2,17 @@ {% load has_notification from notifications_tags %} {% block right-nav %} + {% include 'navbar/navbar_theme_toogle.html' %} {% if not user.is_authenticated and register_url %}
  • {% trans 'Sign Up' %}
    • {% endif %} -
  • -
    -
    • - {% include 'navbar/navbar_theme_toogle.html' %} {% if user.is_anonymous %}
  • {% trans 'Sign in' %}
    • {% else %} -
  • -
    -
  • {% if user|has_notification %} @@ -33,9 +27,6 @@ {% endif %}
    • -
  • -
    -
    • {% endif %} -{% endblock %} \ No newline at end of file +{% endblock right-nav %} \ No newline at end of file From 2c5333eef647da18ac0d3eb3740edef807c629f4 Mon Sep 17 00:00:00 2001 From: tdruez Date: Wed, 29 Apr 2026 13:30:38 +0400 Subject: [PATCH 33/36] fix the buttons color to white Signed-off-by: tdruez --- dje/templates/navbar/navbar_header.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dje/templates/navbar/navbar_header.html b/dje/templates/navbar/navbar_header.html index 4a3b2677..6cfc220d 100644 --- a/dje/templates/navbar/navbar_header.html +++ b/dje/templates/navbar/navbar_header.html @@ -30,13 +30,13 @@ {% endblock navbar_nav_left %} {% block navbar_nav_right %} -