diff --git a/dejacode/static/css/dejacode_bootstrap.css b/dejacode/static/css/dejacode_bootstrap.css index 91ba8de9..f49cb19d 100644 --- a/dejacode/static/css/dejacode_bootstrap.css +++ b/dejacode/static/css/dejacode_bootstrap.css @@ -94,11 +94,14 @@ table.text-break thead { } .bg-warning-orange { background-color: var(--bs-orange); - color: #000; + color: #fff; } .text-warning-orange { color: var(--bs-orange) !important; } +.bg-warning-orange-subtle { + background-color: rgba(253, 126, 20, 0.15); +} .spinner-border-md { --bs-spinner-width: 1.5rem; --bs-spinner-height: 1.5rem; @@ -798,8 +801,7 @@ pre.log { .nav-pills .show>.nav-link { background-color: var(--bs-djc-blue-bg); } -.card, -.table { +.card { box-shadow: rgba(0, 0, 0, 0.05) 0 0.0625rem 0.125rem; } .table-md th, diff --git a/dje/templates/includes/navbar_header.html b/dje/templates/includes/navbar_header.html index af0dc424..405aeedd 100644 --- a/dje/templates/includes/navbar_header.html +++ b/dje/templates/includes/navbar_header.html @@ -6,6 +6,7 @@ {% 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 %} diff --git a/dje/templates/includes/navbar_header_tools_menu.html b/dje/templates/includes/navbar_header_tools_menu.html index 6bd6440a..ced30d5c 100644 --- a/dje/templates/includes/navbar_header_tools_menu.html +++ b/dje/templates/includes/navbar_header_tools_menu.html @@ -5,6 +5,12 @@ Tools
| {% trans "Product" %} | +{% trans "Packages" %} | +{% trans "License compliance" %} | +{% trans "Security compliance" %} | +{% trans "Vulnerabilities" %} | +
|---|---|---|---|---|
| + + {{ product }} + + | ++ + {{ product.package_count|intcomma }} + + | ++ {% if product.license_error_count %} + + {{ product.license_error_count }} {% trans "error" %}{{ product.license_error_count|pluralize }} + + {% endif %} + {% if product.license_warning_count %} + + {{ product.license_warning_count }} {% trans "warning" %}{{ product.license_warning_count|pluralize }} + + {% endif %} + {% if not product.license_error_count and not product.license_warning_count %} + {% trans "OK" %} + {% endif %} + | ++ {% if product.max_risk_level == "critical" %} + {% trans "Critical" %} + {% elif product.max_risk_level == "high" %} + {% trans "High" %} + {% elif product.max_risk_level == "medium" %} + {% trans "Medium" %} + {% elif product.max_risk_level == "low" %} + {% trans "Low" %} + {% else %} + {% trans "OK" %} + {% endif %} + | ++ {% if product.critical_count %} + {{ product.critical_count }} {% trans "critical" %} + {% endif %} + {% if product.high_count %} + {{ product.high_count }} {% trans "high" %} + {% endif %} + {% if product.medium_count %} + {{ product.medium_count }} {% trans "medium" %} + {% endif %} + {% if product.low_count %} + {{ product.low_count }} {% trans "low" %} + {% endif %} + {% if not product.vulnerability_count %} + {% trans "None" %} + {% endif %} + | +
| + {% trans "No active products" %} + | +||||