ccs-digitalmarketplace-frontend-jinja 4.9.0__py3-none-any.whl → 4.9.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. {ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info}/METADATA +4 -2
  2. {ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info}/RECORD +9 -9
  3. digitalmarketplace_frontend_jinja/__init__.py +1 -1
  4. digitalmarketplace_frontend_jinja/templates/components/header/macro.html +8 -5
  5. digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html +3 -2
  6. digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html +3 -2
  7. {ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info}/WHEEL +0 -0
  8. {ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info}/licenses/LICENCE +0 -0
  9. {ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info}/top_level.txt +0 -0
{ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ccs-digitalmarketplace-frontend-jinja
3
- Version: 4.9.0
3
+ Version: 4.9.2
4
4
  Summary: Jinja templates for Digital Marketplace apps.
5
5
  Author: CCS Developers
6
6
  Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -17,7 +17,7 @@ Provides-Extra: dev
17
17
  Requires-Dist: flake8==7.3.0; extra == "dev"
18
18
  Requires-Dist: mypy==1.16.1; extra == "dev"
19
19
  Requires-Dist: pytest==8.4.1; extra == "dev"
20
- Requires-Dist: lxml==5.4.0; extra == "dev"
20
+ Requires-Dist: lxml==6.0.0; extra == "dev"
21
21
  Requires-Dist: xmldiff==2.7.0; extra == "dev"
22
22
  Requires-Dist: flask==3.1.1; extra == "dev"
23
23
  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
41
41
 
42
42
  | Digital Marketplace Frontend Jinja Version | Target CCS Digital Marketplace GOV.UK Frontend Version |
43
43
  | ------------------------------------------ | ------------------------------------------------------ |
44
+ | [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) |
45
+ | [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) |
44
46
  | [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) |
45
47
  | [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) |
46
48
  | [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.dist-info → ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info}/RECORD RENAMED
@@ -1,5 +1,5 @@
1
- ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
2
- digitalmarketplace_frontend_jinja/__init__.py,sha256=TGjqTJXDefd_lENnFYB6xPAor-aV9NiN2jxNvO-G1FA,22
1
+ ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
2
+ digitalmarketplace_frontend_jinja/__init__.py,sha256=y4Ei3Es_AJyfd9oJGiUhtxfX8HtJs-wcbmr1otB2s4Y,22
3
3
  digitalmarketplace_frontend_jinja/templates/components/alert/macro.html,sha256=W4hQmVTEOTSON6ypLoV3cJNgBcCYN1akxy-Y1QZH8X0,992
4
4
  digitalmarketplace_frontend_jinja/templates/components/attachment/macro.html,sha256=0Fi8QqqwmPpZ3UBOjCDiUkfSOYxMYyTlBngnPJrZ7Zo,6452
5
5
  digitalmarketplace_frontend_jinja/templates/components/banner/macro.html,sha256=AsPQydTvw-SwcgczVZmbdlGMXT0SoilvhAtKrTskpME,905
@@ -11,7 +11,7 @@ digitalmarketplace_frontend_jinja/templates/components/cookie-banner/macro.html,
11
11
  digitalmarketplace_frontend_jinja/templates/components/documents/macro.html,sha256=EbAsdIIMZrv6G1pV_6lQ1IWNl00vIkqNL-XoxEFqTPc,1103
12
12
  digitalmarketplace_frontend_jinja/templates/components/file-upload-from-form/macro.html,sha256=OSBAykGawAnJ4iTwILasP9noguoksWl4XdB9TSA6uAg,852
13
13
  digitalmarketplace_frontend_jinja/templates/components/footer/macro.html,sha256=LlrwA2zxQFvMolJL42C9qeZPusrFGLel-j1xqLNLRpc,2829
14
- digitalmarketplace_frontend_jinja/templates/components/header/macro.html,sha256=Gk-fygWWhx91bBOC3mgZIPiE85m3V8LXTw_-z58RDdc,2236
14
+ digitalmarketplace_frontend_jinja/templates/components/header/macro.html,sha256=nlsN4yGnKYuH7zBIJbLzCDViheGPIou_PsbtAAqTMhE,2399
15
15
  digitalmarketplace_frontend_jinja/templates/components/input-from-form/macro.html,sha256=0dywXvofmpkTR77m5ybKvmzTTO1WaG9QVK-WCgRw33E,899
16
16
  digitalmarketplace_frontend_jinja/templates/components/list-input/macro.html,sha256=MW0PA2jNKFaYJQtYrcEYBVTDBbFa7NL07QCXS3ozQhE,5756
17
17
  digitalmarketplace_frontend_jinja/templates/components/option-select/macro.html,sha256=YhQXBlqjPbONv1hTlaTMbEj4SO3wf-FAbeBETYpEB7c,2134
@@ -19,8 +19,8 @@ digitalmarketplace_frontend_jinja/templates/components/previous-next-pagination/
19
19
  digitalmarketplace_frontend_jinja/templates/components/question/macro.html,sha256=MY8f4PTxEBb7ifBx-kurXrLivHW_RN-UpcojJdAjHLk,3985
20
20
  digitalmarketplace_frontend_jinja/templates/components/question-boolean/macro.html,sha256=DVxnbPGYfEa_FgYwLPccvYmS2wD-PC_GI1B_fkYGHho,2878
21
21
  digitalmarketplace_frontend_jinja/templates/components/question-character-count/macro.html,sha256=YMOJiATKyLByuPq8SuPsjN4WZfpSp5PIPtKks1lGnT8,1501
22
- digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html,sha256=-nSYoI7rmStap6rp_0QIfcYVhs8EjyLW4r1Y0UsDF7A,4593
23
- digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html,sha256=UteO9Lz5VbDiE5TS9W5LCGHUihx010SPlDBga35ce2g,3168
22
+ digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html,sha256=4Q0U3R_9JqmHYL1hCvtlvTIzYf2ScY2g_wTDLyyNhg8,4657
23
+ digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html,sha256=FEZisjywePPAqwTfN4L5fHeJXWDkNcuehg6h-8BotNw,3230
24
24
  digitalmarketplace_frontend_jinja/templates/components/question-checkboxes/macro.html,sha256=LZzaZVJ8o1nkUBX4Lf_fjIoDeuxwpXnfJcYaOFYQUXY,2496
25
25
  digitalmarketplace_frontend_jinja/templates/components/question-date/macro.html,sha256=D8UUNZTKuBXoAeWKWL3SLq_IUysOBfkC7Svgl1eYHIM,1948
26
26
  digitalmarketplace_frontend_jinja/templates/components/question-format-hint/macro.html,sha256=x6xTgRJgucQ-FVzeTmHLRrD0ocKIOzzGJRIzYsNZIXw,368
@@ -60,7 +60,7 @@ digitalmarketplace_frontend_jinja/templates/errors/410.html,sha256=ub7W3MRbIPQvj
60
60
  digitalmarketplace_frontend_jinja/templates/errors/500.html,sha256=x1Lu8ATSPGGSXvjj1ZHVq-h9eBWLiUK2MxPHwqZCiDQ,408
61
61
  digitalmarketplace_frontend_jinja/templates/layouts/_custom_dimensions.html,sha256=SglUULyYlEWLWYQ7luwKONuI2BnWbOnd5MOIblKZR3E,731
62
62
  digitalmarketplace_frontend_jinja/templates/layouts/_site_verification.html,sha256=6YWaREd5cPw1u5V9zsVaCOWG_uJ9SUMNdZj9fLK2jU8,142
63
- ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/METADATA,sha256=JrSw5lFFDQ7oHJWKzSTzoBytdbtkVMPqOuow4rs8m0M,15742
64
- ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
65
- ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
66
- ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/RECORD,,
63
+ ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/METADATA,sha256=PcSHJTNb7d-bo5ItWVSE2Nu2CCbbFc6aN2GjKG6zkY0,16196
64
+ ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
65
+ ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
66
+ ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/RECORD,,
digitalmarketplace_frontend_jinja/__init__.py CHANGED
@@ -1 +1 @@
1
- __version__ = '4.9.0'
1
+ __version__ = '4.9.2'
digitalmarketplace_frontend_jinja/templates/components/header/macro.html CHANGED
@@ -9,15 +9,17 @@
9
9
 
10
10
  {% if isAdmin %}
11
11
  {% set adminAppClass = 'dm-admin-header govuk-header--full-width-border' %}
12
+ {% set adminServiceNavigationClass = 'dm-admin-service-navigation' %}
12
13
  {% set productName = 'Digital Marketplace Admin' %}
13
14
  {% else %}
14
15
  {% set adminAppClass = 'govuk-header--full-width-border' %}
16
+ {% set adminServiceNavigationClass = '' %}
15
17
  {% set productName = 'Digital Marketplace' %}
16
18
  {% endif %}
17
19
 
18
20
  {% if user_logged_in %}
19
21
  {% if users_role in['buyer', 'supplier'] %}
20
- {% set headerNavigation = [
22
+ {% set serviceNavigation = [
21
23
  {
22
24
  'text': 'Guidance',
23
25
  'href': 'https://www.gov.uk/guidance/buying-and-selling-on-the-digital-marketplace'
@@ -35,7 +37,7 @@
35
37
  ]%}
36
38
  {% else %}
37
39
  {# Any other role #}
38
- {% set headerNavigation = [
40
+ {% set serviceNavigation = [
39
41
  {
40
42
  'text': 'Guidance',
41
43
  'href': 'https://www.gov.uk/guidance/buying-and-selling-on-the-digital-marketplace'
@@ -48,7 +50,7 @@
48
50
  ]%}
49
51
  {% endif %}
50
52
  {% else %}
51
- {% set headerNavigation = [
53
+ {% set serviceNavigation = [
52
54
  {
53
55
  'text': 'Guidance',
54
56
  'href': 'https://www.gov.uk/guidance/buying-and-selling-on-the-digital-marketplace'
@@ -65,8 +67,9 @@
65
67
  'classes': adminAppClass
66
68
  }) }}
67
69
  {{ govukServiceNavigation({
68
- 'navigation': headerNavigation,
70
+ 'navigation': serviceNavigation,
69
71
  'serviceName': productName,
70
- 'serviceUrl': '/'
72
+ 'serviceUrl': '/',
73
+ 'classes': adminServiceNavigationClass
71
74
  }) }}
72
75
  {% endmacro %}
digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html CHANGED
@@ -58,10 +58,11 @@
58
58
  {% set checkboxItems = [] %}
59
59
 
60
60
  {% for label in option.options %}
61
+ {% set value = label.value if label.value else label.label %}
61
62
  {% set _checkboxItems = checkboxItems.append({
62
63
  "text": label.label,
63
- "value": label.label,
64
- "checked": label.label in values
64
+ "value": value,
65
+ "checked": value in values
65
66
  }) %}
66
67
  {% endfor %}
67
68
 
digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html CHANGED
@@ -43,10 +43,11 @@
43
43
  {% set checkboxItems = [] %}
44
44
 
45
45
  {% for label in option.options %}
46
+ {% set value = label.value if label.value else label.label %}
46
47
  {% set checkboxItem = {
47
48
  "text": label.label,
48
- "value": label.label,
49
- "checked": label.label in values
49
+ "value": value,
50
+ "checked": value in values
50
51
  } %}
51
52
  {% if label.description %}
52
53
  {% set _checkboxItem = checkboxItem.__setitem__("hint", { "html": label.description }) %}