ccs-digitalmarketplace-frontend-jinja 4.9.0__tar.gz → 4.9.2__tar.gz

{ccs_digitalmarketplace_frontend_jinja-4.9.0/ccs_digitalmarketplace_frontend_jinja.egg-info → ccs_digitalmarketplace_frontend_jinja-4.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.9.0
+Version: 4.9.2
 Summary: Jinja templates for Digital Marketplace apps.
 Author: CCS Developers
 Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -17,7 +17,7 @@ Provides-Extra: dev
 Requires-Dist: flake8==7.3.0; extra == "dev"
 Requires-Dist: mypy==1.16.1; extra == "dev"
 Requires-Dist: pytest==8.4.1; extra == "dev"
-Requires-Dist: lxml==5.4.0; extra == "dev"
+Requires-Dist: lxml==6.0.0; extra == "dev"
 Requires-Dist: xmldiff==2.7.0; extra == "dev"
 Requires-Dist: flask==3.1.1; extra == "dev"
 Requires-Dist: pre-commit==4.2.0; extra == "dev"
@@ -41,6 +41,8 @@ The following table shows the version of Digital Marketplace Frontend Jinja that
 
 | Digital Marketplace Frontend Jinja Version | Target CCS Digital Marketplace GOV.UK Frontend Version |
 | ------------------------------------------ | ------------------------------------------------------ |
+| [4.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.2) | [3.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.2) |
+| [4.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.1) | [3.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.1) |
 | [4.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.0) | [3.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.0) |
 | [4.8.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.8.0) | [3.8.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.8.0) |
 | [4.7.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.7.0) | [3.7.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.7.0) |

{ccs_digitalmarketplace_frontend_jinja-4.9.0 → ccs_digitalmarketplace_frontend_jinja-4.9.2}/README.md

@@ -16,6 +16,8 @@ The following table shows the version of Digital Marketplace Frontend Jinja that
 
 | Digital Marketplace Frontend Jinja Version | Target CCS Digital Marketplace GOV.UK Frontend Version |
 | ------------------------------------------ | ------------------------------------------------------ |
+| [4.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.2) | [3.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.2) |
+| [4.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.1) | [3.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.1) |
 | [4.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.0) | [3.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.0) |
 | [4.8.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.8.0) | [3.8.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.8.0) |
 | [4.7.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.7.0) | [3.7.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.7.0) |

{ccs_digitalmarketplace_frontend_jinja-4.9.0 → ccs_digitalmarketplace_frontend_jinja-4.9.2/ccs_digitalmarketplace_frontend_jinja.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.9.0
+Version: 4.9.2
 Summary: Jinja templates for Digital Marketplace apps.
 Author: CCS Developers
 Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -17,7 +17,7 @@ Provides-Extra: dev
 Requires-Dist: flake8==7.3.0; extra == "dev"
 Requires-Dist: mypy==1.16.1; extra == "dev"
 Requires-Dist: pytest==8.4.1; extra == "dev"
-Requires-Dist: lxml==5.4.0; extra == "dev"
+Requires-Dist: lxml==6.0.0; extra == "dev"
 Requires-Dist: xmldiff==2.7.0; extra == "dev"
 Requires-Dist: flask==3.1.1; extra == "dev"
 Requires-Dist: pre-commit==4.2.0; extra == "dev"
@@ -41,6 +41,8 @@ The following table shows the version of Digital Marketplace Frontend Jinja that
 
 | Digital Marketplace Frontend Jinja Version | Target CCS Digital Marketplace GOV.UK Frontend Version |
 | ------------------------------------------ | ------------------------------------------------------ |
+| [4.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.2) | [3.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.2) |
+| [4.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.1) | [3.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.1) |
 | [4.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.0) | [3.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.0) |
 | [4.8.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.8.0) | [3.8.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.8.0) |
 | [4.7.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.7.0) | [3.7.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.7.0) |

{ccs_digitalmarketplace_frontend_jinja-4.9.0 → ccs_digitalmarketplace_frontend_jinja-4.9.2}/ccs_digitalmarketplace_frontend_jinja.egg-info/requires.txt

@@ -6,7 +6,7 @@ ccs-digitalmarketplace-utils>=69.0.0
 flake8==7.3.0
 mypy==1.16.1
 pytest==8.4.1
-lxml==5.4.0
+lxml==6.0.0
 xmldiff==2.7.0
 flask==3.1.1
 pre-commit==4.2.0

ccs_digitalmarketplace_frontend_jinja-4.9.2/digitalmarketplace_frontend_jinja/__init__.py

@@ -0,0 +1 @@
+__version__ = '4.9.2'

{ccs_digitalmarketplace_frontend_jinja-4.9.0 → ccs_digitalmarketplace_frontend_jinja-4.9.2}/digitalmarketplace_frontend_jinja/templates/components/header/macro.html

@@ -9,15 +9,17 @@
 
 {% if isAdmin %}
   {% set adminAppClass = 'dm-admin-header govuk-header--full-width-border' %}
+  {% set adminServiceNavigationClass = 'dm-admin-service-navigation' %}
   {% set productName = 'Digital Marketplace Admin' %}
 {% else %}
   {% set adminAppClass = 'govuk-header--full-width-border' %}
+  {% set adminServiceNavigationClass = '' %}
   {% set productName = 'Digital Marketplace' %}
 {% endif %}
 
 {% if user_logged_in %}
   {% if users_role in['buyer', 'supplier'] %}
-    {% set headerNavigation = [
+    {% set serviceNavigation = [
       {
         'text': 'Guidance',
         'href': 'https://www.gov.uk/guidance/buying-and-selling-on-the-digital-marketplace'
@@ -35,7 +37,7 @@
     ]%}
   {% else %}
     {# Any other role #}
-    {% set headerNavigation = [
+    {% set serviceNavigation = [
       {
         'text': 'Guidance',
         'href': 'https://www.gov.uk/guidance/buying-and-selling-on-the-digital-marketplace'
@@ -48,7 +50,7 @@
     ]%}
   {% endif %}
 {% else %}
-  {% set headerNavigation = [
+  {% set serviceNavigation = [
     {
       'text': 'Guidance',
       'href': 'https://www.gov.uk/guidance/buying-and-selling-on-the-digital-marketplace'
@@ -65,8 +67,9 @@
   'classes': adminAppClass
 }) }}
 {{ govukServiceNavigation({
-  'navigation': headerNavigation,
+  'navigation': serviceNavigation,
   'serviceName': productName,
-  'serviceUrl': '/'
+  'serviceUrl': '/',
+  'classes': adminServiceNavigationClass
 }) }}
 {% endmacro %}

{ccs_digitalmarketplace_frontend_jinja-4.9.0 → ccs_digitalmarketplace_frontend_jinja-4.9.2}/digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html

@@ -58,10 +58,11 @@
             {% set checkboxItems = [] %}
 
             {% for label in option.options %}
+              {% set value = label.value if label.value else label.label %}
               {% set _checkboxItems = checkboxItems.append({
                 "text": label.label,
-                "value": label.label,
-                "checked": label.label in values
+                "value": value,
+                "checked": value in values
               }) %}
             {% endfor %}
 

{ccs_digitalmarketplace_frontend_jinja-4.9.0 → ccs_digitalmarketplace_frontend_jinja-4.9.2}/digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html

@@ -43,10 +43,11 @@
           {% set checkboxItems = [] %}
 
           {% for label in option.options %}
+            {% set value = label.value if label.value else label.label %}
             {% set checkboxItem = {
               "text": label.label,
-              "value": label.label,
-              "checked": label.label in values
+              "value": value,
+              "checked": value in values
             } %}
             {% if label.description %}
               {% set _checkboxItem = checkboxItem.__setitem__("hint", { "html": label.description }) %}

{ccs_digitalmarketplace_frontend_jinja-4.9.0 → ccs_digitalmarketplace_frontend_jinja-4.9.2}/pyproject.toml

@@ -29,7 +29,7 @@ dev = [
   'flake8==7.3.0',
   'mypy==1.16.1',
   'pytest==8.4.1',
-  'lxml==5.4.0',
+  'lxml==6.0.0',
   'xmldiff==2.7.0',
   'flask==3.1.1',
   'pre-commit==4.2.0',

ccs_digitalmarketplace_frontend_jinja-4.9.0/digitalmarketplace_frontend_jinja/__init__.py

@@ -1 +0,0 @@
-__version__ = '4.9.0'