ccs-digitalmarketplace-frontend-jinja 4.6.0__py3-none-any.whl → 4.8.0__py3-none-any.whl

{ccs_digitalmarketplace_frontend_jinja-4.6.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.6.0
+Version: 4.8.0
 Summary: Jinja templates for Digital Marketplace apps.
 Author: CCS Developers
 Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -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.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) |
 | [4.6.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.6.0) | [3.6.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.6.0) |
 | [4.5.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.5.0) | [3.5.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.5.0) |
 | [4.4.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.4.0) | [3.4.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.4.0) |

{ccs_digitalmarketplace_frontend_jinja-4.6.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.8.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ccs_digitalmarketplace_frontend_jinja-4.6.0.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
-digitalmarketplace_frontend_jinja/__init__.py,sha256=ZR4ZFfJw0RdvcztkKaNry8C740KFt1MZ0k_aZc63zjo,22
+ccs_digitalmarketplace_frontend_jinja-4.8.0.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
+digitalmarketplace_frontend_jinja/__init__.py,sha256=7aYkgOQT0badLEXhK2h5IVtpc3G2GMvJTt0OqArXcK8,22
 digitalmarketplace_frontend_jinja/templates/components/alert/macro.html,sha256=W4hQmVTEOTSON6ypLoV3cJNgBcCYN1akxy-Y1QZH8X0,992
 digitalmarketplace_frontend_jinja/templates/components/attachment/macro.html,sha256=0Fi8QqqwmPpZ3UBOjCDiUkfSOYxMYyTlBngnPJrZ7Zo,6452
 digitalmarketplace_frontend_jinja/templates/components/banner/macro.html,sha256=AsPQydTvw-SwcgczVZmbdlGMXT0SoilvhAtKrTskpME,905
@@ -19,7 +19,7 @@ digitalmarketplace_frontend_jinja/templates/components/previous-next-pagination/
 digitalmarketplace_frontend_jinja/templates/components/question/macro.html,sha256=lj0D5OopaFalkNG7_wRGHahHg7dbc7ddnMb_K7uv6QM,3722
 digitalmarketplace_frontend_jinja/templates/components/question-boolean/macro.html,sha256=DVxnbPGYfEa_FgYwLPccvYmS2wD-PC_GI1B_fkYGHho,2878
 digitalmarketplace_frontend_jinja/templates/components/question-character-count/macro.html,sha256=YMOJiATKyLByuPq8SuPsjN4WZfpSp5PIPtKks1lGnT8,1501
-digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html,sha256=0hMnmpSlsfAKJuvskVw2Prq2fdyRJ2DxADduDzKLwJQ,3737
+digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html,sha256=-nSYoI7rmStap6rp_0QIfcYVhs8EjyLW4r1Y0UsDF7A,4593
 digitalmarketplace_frontend_jinja/templates/components/question-checkboxes/macro.html,sha256=LZzaZVJ8o1nkUBX4Lf_fjIoDeuxwpXnfJcYaOFYQUXY,2496
 digitalmarketplace_frontend_jinja/templates/components/question-date/macro.html,sha256=D8UUNZTKuBXoAeWKWL3SLq_IUysOBfkC7Svgl1eYHIM,1948
 digitalmarketplace_frontend_jinja/templates/components/question-format-hint/macro.html,sha256=x6xTgRJgucQ-FVzeTmHLRrD0ocKIOzzGJRIzYsNZIXw,368
@@ -35,7 +35,7 @@ digitalmarketplace_frontend_jinja/templates/components/question-pricing/macro.ht
 digitalmarketplace_frontend_jinja/templates/components/question-radios/macro.html,sha256=UQVf1O4OxTJoA9kLLyLiaHBhxvRSUKXpnA5EkrvLLnw,2884
 digitalmarketplace_frontend_jinja/templates/components/question-select/macro.html,sha256=HUSQiYWv9jMRkV4FdiyVojkGSns_dKoi_FUj9d5w3u0,2031
 digitalmarketplace_frontend_jinja/templates/components/question-text/macro.html,sha256=OV3z43lBdJRYSJofygrWVu3Y4VxWuQAApgebN1kM0-o,1381
-digitalmarketplace_frontend_jinja/templates/components/question-upload/macro.html,sha256=Xyl5Sg67ZsZsYSp4vIGkazcCvLF3C9rrnkKpNEykEmE,1955
+digitalmarketplace_frontend_jinja/templates/components/question-upload/macro.html,sha256=FY3-g4U8BTsh0WmO41jsjL1UCj0E1j88WtCXTw99GsU,2635
 digitalmarketplace_frontend_jinja/templates/components/radios-from-form/macro.html,sha256=DqXM84BLsAfLRtfjlLgKQ3-gjPGWFt0O5QdVOQiih60,1776
 digitalmarketplace_frontend_jinja/templates/components/search-box/macro.html,sha256=QHf7Log2Gp31HHCVK3ufoLvJwLDusRmZXDmZ7ME9EtA,1028
 digitalmarketplace_frontend_jinja/templates/components/select-country-from-form/macro.html,sha256=AHWNjovdZoLz5LP17l1U4XJlPirFTdVxsvUNLTWw-ik,1117
@@ -59,7 +59,7 @@ digitalmarketplace_frontend_jinja/templates/errors/410.html,sha256=ub7W3MRbIPQvj
 digitalmarketplace_frontend_jinja/templates/errors/500.html,sha256=x1Lu8ATSPGGSXvjj1ZHVq-h9eBWLiUK2MxPHwqZCiDQ,408
 digitalmarketplace_frontend_jinja/templates/layouts/_custom_dimensions.html,sha256=SglUULyYlEWLWYQ7luwKONuI2BnWbOnd5MOIblKZR3E,731
 digitalmarketplace_frontend_jinja/templates/layouts/_site_verification.html,sha256=6YWaREd5cPw1u5V9zsVaCOWG_uJ9SUMNdZj9fLK2jU8,142
-ccs_digitalmarketplace_frontend_jinja-4.6.0.dist-info/METADATA,sha256=1T772meMXIzA8QzqsLAecFwx6xY1tB_bQu5mmTlcs24,15011
-ccs_digitalmarketplace_frontend_jinja-4.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ccs_digitalmarketplace_frontend_jinja-4.6.0.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
-ccs_digitalmarketplace_frontend_jinja-4.6.0.dist-info/RECORD,,
+ccs_digitalmarketplace_frontend_jinja-4.8.0.dist-info/METADATA,sha256=v8LtVCGrNAjDvTOqganseCMiUYF2POUAFK_uKoj66wU,15465
+ccs_digitalmarketplace_frontend_jinja-4.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ccs_digitalmarketplace_frontend_jinja-4.8.0.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
+ccs_digitalmarketplace_frontend_jinja-4.8.0.dist-info/RECORD,,

digitalmarketplace_frontend_jinja/__init__.py

@@ -1 +1 @@
-__version__ = '4.6.0'
+__version__ = '4.8.0'

digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html

@@ -1,8 +1,10 @@
 {% macro digitalmarketplaceQuestionCheckboxTree(params) %}
 {%- from "govuk_frontend_jinja/components/fieldset/macro.html" import govukFieldset -%}
 {%- from "govuk_frontend_jinja/components/checkboxes/macro.html" import govukCheckboxes -%}
+{%- from "govuk_frontend_jinja/components/hint/macro.html" import govukHint -%}
 {%- from "govuk_frontend_jinja/components/accordion/macro.html" import govukAccordion -%}
 {%- from "govuk_frontend_jinja/components/error-message/macro.html" import govukErrorMessage -%}
+{%- from "digitalmarketplace_frontend_jinja/components/question-format-hint/macro.html" import digitalmarketplaceQuestionFormatHint -%}
 
 {% set name = params.question.id %}
 {% set questionText = params.question.question + " ({})".format(params.question.optional_text if params.question.optional_text else "optional") if params.question.optional else params.question.question %}
@@ -18,9 +20,17 @@
     "classes": 'dm-checkbox-tree',
     "attributes": {
       'data-module': 'dm-question-checkbox-tree',
-      'aria-describedby': "input-" + name if errorMessage
+      'aria-describedby': "input-" + name if errorMessage,
+      'data-item-name-singular': params.question.item_name.singular if params.question.item_name else "category",
+      'data-item-name-plural': params.question.item_name.plural if params.question.item_name else "categories"
     }
   }) %}
+    {% if params.question.hint or params.question.question_advice %}
+      {{ govukHint({
+        "html": digitalmarketplaceQuestionFormatHint(params.question)
+      }) }}
+    {% endif %}
+
     {% if errorMessage %}
       {{ govukErrorMessage({
         "text": errorMessage["message"],
@@ -30,9 +40,11 @@
 
     <div class="govuk-grid-row">
       <div class="dm-checkbox-tree__summary govuk-grid-column-one-third">
-        <p class="govuk-body">
-          You can choose up to {{ params.question.number_of_items }} categories.
-        </p>
+        {% if params.question.number_of_items %}
+          <p class="govuk-body">
+            You can choose up to {{ params.question.number_of_items }} {{ params.question.item_name.plural if params.question.item_name else "categories" }}.
+          </p>
+        {% endif %}
         <p class="dm-checkbox-tree__summary-total govuk-body">
           <strong class="dm-checkbox-tree__summary-total-selected"></strong>
           <span class="dm-checkbox-tree__summary-total-selected-text"></span>
@@ -54,7 +66,7 @@
             {% endfor %}
 
             {% set summaryHtml %}
-              {{ option.options | length }} categories<span class="dm-checkbox-tree__options-number-selected"></span>
+              {{ option.options | length }} {{ params.question.item_name.plural if params.question.item_name else "categories" }}<span class="dm-checkbox-tree__options-number-selected"></span>
             {% endset %}
 
             {% set _accordionItems = accordionItems.append({

digitalmarketplace_frontend_jinja/templates/components/question-upload/macro.html

@@ -1,6 +1,7 @@
 {% macro digitalmarketplaceQuestionUpload(params) %}
 {%- from "govuk_frontend_jinja/components/file-upload/macro.html" import govukFileUpload -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-format-hint/macro.html" import digitalmarketplaceQuestionFormatHint -%}
+{% from "govuk_frontend_jinja/components/button/macro.html" import govukButton %}
 
 {% set name = params.question.id %}
 {% set questionText = params.question.question + " ({})".format(params.question.optional_text if params.question.optional_text else "optional") if params.question.optional else params.question.question %}
@@ -13,10 +14,25 @@
       <input type="hidden" id="input-{{ name }}-upload" name="{{ name }}-upload" value="{{ value }}">
       <ul class="dm-document-upload-list">
         <li class="dm-document-list-item">
-          <span class="dm-document-upload-with-icon">
-            <span class="dm-document-icon"></span>
-            Document uploaded {{ value | parse_document_upload_time | datetimeformat }}
-          </span>
+          <div class="govuk-grid-row">
+            <div class="govuk-grid-column-two-thirds">
+              <div class="dm-document-upload-with-icon">
+                <span class="dm-document-icon"></span>
+                Document uploaded {{ value | parse_document_upload_time | datetimeformat }}
+              </div>
+            </div>
+            <div class="govuk-grid-column-one-third">
+                {% if params.question.optional %}
+                    {{ govukButton({
+                      "text": "Remove upload",
+                      "name": "remove-upload",
+                      "value": name,
+                      "classes": "govuk-button--secondary",
+                      "preventDoubleClick": true
+                    }) }}
+                {% endif %}
+            </div>
+          </div>
         </li>
       </ul>
     {% endif %}