diff --git a/app/templates/components/list-entry.html b/app/templates/components/list-entry.html index c7884ce6f..bc01ab655 100644 --- a/app/templates/components/list-entry.html +++ b/app/templates/components/list-entry.html @@ -1,6 +1,3 @@ -{% from "components/components/fieldset/macro.njk" import govukFieldset %} -{% from "components/components/error-message/macro.njk" import usaErrorMessage %} - {% macro list_entry( field, item_name, @@ -9,53 +6,43 @@ ) %}
- {% if hint %} - {% set attributes = {"aria-describedby": field.name + '-hint'} %} - {% else %} - {% set attributes = {} %} - {% endif %} - {% call govukFieldset({ - "legend": { - "text": field.label.text, - "isPageHeading": False, - "classes": "text-bold" - }, - "attributes": attributes - }) - %} - {% if hint %} -
- {{ hint }} -
- {% endif %} -
- {% for entry in field.entries %} -
- {% if not autocomplete %} - {% set autocomplete = "off" %} - {% else %} - {% set autocomplete = "" %} - {% endif %} - {% if entry.errors %} - {% set label_classes = "usa-label usa-label--error" %} - {% else %} - {% set label_classes = "usa-label" %} - {% endif %} - {% set field_name = field.name + "-" + loop.index|string %} - {{ entry(param_extensions={ - "id": "input-" + field_name, - "name": field_name, - "label": { - "html": '' + item_name + ' number ' + loop.index|string + '.', - "classes": label_classes - }, - "classes": "usa-input", - "value": field.data[loop.index0], - "autocomplete": autocomplete - }) }} +
+ + {{ field.label.text }} + + {% if hint %} +
+ {{ hint }}
- {% endfor %} -
- {% endcall %} + {% endif %} +
+ {% for entry in field.entries %} +
+ {% if not autocomplete %} + {% set autocomplete = "off" %} + {% else %} + {% set autocomplete = "" %} + {% endif %} + {% if entry.errors %} + {% set label_classes = "usa-label usa-label--error" %} + {% else %} + {% set label_classes = "usa-label" %} + {% endif %} + {% set field_name = field.name + "-" + loop.index|string %} + {{ entry(param_extensions={ + "id": "input-" + field_name, + "name": field_name, + "label": { + "html": '' + item_name + ' number ' + loop.index|string + '.', + "classes": label_classes + }, + "classes": "usa-input", + "value": field.data[loop.index0], + "autocomplete": autocomplete + }) }} +
+ {% endfor %} +
+ {% endmacro %} diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html index 95b2055bc..46a9c1458 100644 --- a/app/templates/partials/jobs/notifications.html +++ b/app/templates/partials/jobs/notifications.html @@ -25,7 +25,7 @@
{% endif %} {% if job.still_processing %} -

+

Report is {{ "{:.0f}%".format(job.percentage_complete * 0.99) }} complete…

{% elif notifications and time_left != "Data no longer available" %} diff --git a/app/templates/partials/tour.html b/app/templates/partials/tour.html index 598129641..3982686d9 100644 --- a/app/templates/partials/tour.html +++ b/app/templates/partials/tour.html @@ -2,7 +2,7 @@ {% call banner_wrapper(type='tour') %}

Try sending yourself this example

-
+

1.

@@ -12,7 +12,7 @@

-
+

2.

@@ -22,7 +22,7 @@

-
+

3.

diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html index a1b3bdca8..a2ac22eb3 100644 --- a/app/templates/views/api/keys.html +++ b/app/templates/views/api/keys.html @@ -31,7 +31,7 @@ {% call field() %}
{{ item.name }} -
+
{% if item.key_type == 'normal' %} Live – sends to anyone {% elif item.key_type == 'team' %} @@ -44,7 +44,7 @@ {% endcall %} {% if item.expiry_date %} {% call field(align='right') %} - Revoked {{ item.expiry_date|format_datetime_table }} + Revoked {{ item.expiry_date|format_datetime_table }} {% endcall %} {% else %} {% call field(align='right', status='error') %} diff --git a/app/templates/views/find-users/user-information.html b/app/templates/views/find-users/user-information.html index 16546fe4f..0903c72d5 100644 --- a/app/templates/views/find-users/user-information.html +++ b/app/templates/views/find-users/user-information.html @@ -12,7 +12,7 @@ {{ user.name }}

{{ user.email_address }}

-

{{ user.mobile_number or 'No mobile number'}}

+

{{ user.mobile_number or 'No mobile number'}}

Live services