From 5ab876aeab229ab69109a773ec74b98d20bd40c6 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 19 Sep 2018 11:34:20 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Don=E2=80=99t=20trigger=20HTML5=20validatio?= =?UTF-8?q?n=20on=20go=20live=20request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We should probably have a reusable thing for this… --- .../views/service-settings/submit-request-to-go-live.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/service-settings/submit-request-to-go-live.html b/app/templates/views/service-settings/submit-request-to-go-live.html index b5d888b3c..af645d9f6 100644 --- a/app/templates/views/service-settings/submit-request-to-go-live.html +++ b/app/templates/views/service-settings/submit-request-to-go-live.html @@ -13,7 +13,7 @@

Request to go live

-
+
{{ textbox(form.volume_email, width='1-2', hint='For example, 1,000,000') }} {{ textbox(form.volume_sms, width='1-2', hint='For example, 500,000') }} From d9da219b7e02e4c4bcc9ae23f216c6adabe8af0c Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 19 Sep 2018 12:39:36 +0100 Subject: [PATCH 2/2] Use a macro for form tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will stop us repeatedly forgetting to add `novalidate` and `autocomplete='off'` to our forms (which is how most of them are set up). It uses sensible defaults, based on how we most-commonly configure forms: - most of our forms are `post`ed (but this can be overridden) - `autocomplete` should only be enabled where it makes sense, otherwise it’s more annoying than useful (but this can be overriden) - we should never be using HTML5 form validation because our own error styles and messages are better --- app/templates/components/form.html | 20 +++++++++++++++++++ .../partials/jobs/notifications.html | 5 +++-- app/templates/views/add-service.html | 5 +++-- .../callbacks/delivery-status-callback.html | 9 +++++---- .../received-text-messages-callback.html | 9 +++++---- app/templates/views/api/keys/create.html | 5 +++-- app/templates/views/api/whitelist.html | 5 +++-- app/templates/views/edit-email-template.html | 5 +++-- app/templates/views/edit-letter-template.html | 5 +++-- app/templates/views/edit-sms-template.html | 5 +++-- .../views/edit-user-permissions.html | 5 +++-- .../views/email-branding/manage-branding.html | 5 +++-- .../views/find-users/find-users-by-email.html | 17 ++++++++-------- app/templates/views/forgot-password.html | 5 +++-- app/templates/views/invite-user.html | 5 +++-- app/templates/views/letter-jobs.html | 5 +++-- app/templates/views/new-password.html | 5 +++-- app/templates/views/notifications.html | 18 ++++++++--------- .../views/organisations/add-organisation.html | 5 +++-- .../settings/edit-name/confirm.html | 5 +++-- .../settings/edit-name/index.html | 5 +++-- .../organisation/users/invite-org-user.html | 5 +++-- .../organisation/users/user/index.html | 6 ++++-- app/templates/views/platform-admin/index.html | 5 +++-- .../platform-admin/returned-letters.html | 5 +++-- .../views/platform-admin/services.html | 5 +++-- .../views/providers/edit-provider.html | 6 +++--- app/templates/views/register-from-invite.html | 5 +++-- .../views/register-from-org-invite.html | 5 +++-- app/templates/views/register.html | 5 +++-- app/templates/views/send-test.html | 5 +++-- .../branding/email-options.html | 5 +++-- .../views/service-settings/confirm.html | 5 +++-- .../views/service-settings/contact_link.html | 5 +++-- .../service-settings/data-retention/add.html | 8 ++++---- .../service-settings/data-retention/edit.html | 8 ++++---- .../views/service-settings/delete.html | 5 +++-- .../service-settings/email-reply-to/add.html | 5 +++-- .../service-settings/email-reply-to/edit.html | 5 +++-- .../service-settings/letter-contact/add.html | 5 +++-- .../service-settings/letter-contact/edit.html | 5 +++-- .../link-service-to-organisation.html | 5 +++-- .../views/service-settings/name.html | 5 +++-- .../preview-email-branding.html | 6 +++--- .../service-settings/set-email-branding.html | 5 +++-- .../set-free-sms-allowance.html | 5 +++-- .../service-settings/set-inbound-number.html | 8 ++++---- .../set-international-sms.html | 5 +++-- .../service-settings/set-letter-branding.html | 5 +++-- .../set-letter-contact-block.html | 5 +++-- .../views/service-settings/set-letters.html | 5 +++-- .../set-organisation-type.html | 5 +++-- .../service-settings/set-reply-to-email.html | 7 ++++--- .../views/service-settings/sms-prefix.html | 5 +++-- .../service-settings/sms-sender/add.html | 9 +++++---- .../service-settings/sms-sender/edit.html | 5 +++-- .../submit-request-to-go-live.html | 5 +++-- app/templates/views/signin.html | 5 +++-- .../support/ask-question-give-feedback.html | 5 +++-- app/templates/views/support/index.html | 6 ++++-- .../views/support/report-problem.html | 5 +++-- app/templates/views/support/triage.html | 5 +++-- app/templates/views/templates/add.html | 5 +++-- .../views/templates/breaking-change.html | 5 +++-- app/templates/views/templates/set-sender.html | 5 +++-- .../views/templates/set-template-sender.html | 5 +++-- app/templates/views/text-not-received.html | 5 +++-- app/templates/views/two-factor.html | 5 +++-- .../views/user-profile/authenticate.html | 5 +++-- .../views/user-profile/change-password.html | 5 +++-- app/templates/views/user-profile/change.html | 5 +++-- app/templates/views/user-profile/confirm.html | 5 +++-- 72 files changed, 257 insertions(+), 170 deletions(-) create mode 100644 app/templates/components/form.html diff --git a/app/templates/components/form.html b/app/templates/components/form.html new file mode 100644 index 000000000..f01ee87f4 --- /dev/null +++ b/app/templates/components/form.html @@ -0,0 +1,20 @@ +{% macro form_wrapper( + method="post", + action=None, + autocomplete=False, + class=None, + id=None, + module=None +) %} + + {{ caller() }} + +{% endmacro %} diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html index 1408e530b..9bf9bc4bb 100644 --- a/app/templates/partials/jobs/notifications.html +++ b/app/templates/partials/jobs/notifications.html @@ -1,5 +1,6 @@ {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading, notification_status_field %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %}
{% if job.job_status == 'scheduled' %} @@ -10,12 +11,12 @@ {{ job.scheduled_for|format_datetime_relative }}

-
+ {% call form_wrapper() %} {{ page_footer( button_text="Cancel sending", destructive=True ) }} -
+ {% endcall %}
{% else %} diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html index a7c88d2d2..639016362 100644 --- a/app/templates/views/add-service.html +++ b/app/templates/views/add-service.html @@ -2,6 +2,7 @@ {% from "components/radios.html" import radios %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} {{ heading }} @@ -16,7 +17,7 @@ About your service -
+ {% call form_wrapper() %} {{ textbox(form.name, hint="You can change this later") }} @@ -24,7 +25,7 @@ {{ page_footer('Add service') }} -
+ {% endcall %}
diff --git a/app/templates/views/api/callbacks/delivery-status-callback.html b/app/templates/views/api/callbacks/delivery-status-callback.html index a8c188c75..f5e7be807 100644 --- a/app/templates/views/api/callbacks/delivery-status-callback.html +++ b/app/templates/views/api/callbacks/delivery-status-callback.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Callbacks for delivery receipts @@ -15,7 +16,7 @@ Check the callback documentation for more information.

-
+ {% call form_wrapper() %} {{ textbox( form.url, width='1-1', @@ -27,12 +28,12 @@ hint='At least 10 characters', autocomplete='new-password' ) }} - {{ page_footer( + {{ page_footer( 'Save', back_link=url_for(back_link, service_id=current_service.id), back_link_text='Back to settings' - ) }} -
+ ) }} + {% endcall %} diff --git a/app/templates/views/api/callbacks/received-text-messages-callback.html b/app/templates/views/api/callbacks/received-text-messages-callback.html index 0ac44c3c6..b8ede67a5 100644 --- a/app/templates/views/api/callbacks/received-text-messages-callback.html +++ b/app/templates/views/api/callbacks/received-text-messages-callback.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Callbacks for received text messages @@ -15,7 +16,7 @@ Check the callback documentation for more information.

-
+ {% call form_wrapper() %} {{ textbox( form.url, width='1-1', @@ -27,12 +28,12 @@ hint='At least 10 characters', autocomplete='new-password' ) }} - {{ page_footer( + {{ page_footer( 'Save', back_link=url_for('.api_callbacks', service_id=current_service.id), back_link_text='Back to settings' - ) }} -
+ ) }} + {% endcall %} diff --git a/app/templates/views/api/keys/create.html b/app/templates/views/api/keys/create.html index 7baf06680..c31e307ad 100644 --- a/app/templates/views/api/keys/create.html +++ b/app/templates/views/api/keys/create.html @@ -3,6 +3,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/radios.html" import radios %} {% from "components/banner.html" import banner_wrapper %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Create an API key @@ -14,10 +15,10 @@ Create an API key -
+ {% call form_wrapper() %} {{ textbox(form.key_name, label='Name for this key') }} {{ radios(form.key_type, disable=disabled_options, option_hints=option_hints) }} {{ page_footer('Continue') }} -
+ {% endcall %} {% endblock %} diff --git a/app/templates/views/api/whitelist.html b/app/templates/views/api/whitelist.html index 4e880cc10..9d227e294 100644 --- a/app/templates/views/api/whitelist.html +++ b/app/templates/views/api/whitelist.html @@ -4,6 +4,7 @@ {% from "components/api-key.html" import api_key %} {% from "components/page-footer.html" import page_footer %} {% from "components/list-entry.html" import list_entry %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Whitelist @@ -42,7 +43,7 @@ are included in the whitelist automatically.

-
+ {% call form_wrapper() %}
@@ -68,6 +69,6 @@ secondary_link_text='Back to API integration' ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/edit-email-template.html b/app/templates/views/edit-email-template.html index 1a3a40bc9..695983d40 100644 --- a/app/templates/views/edit-email-template.html +++ b/app/templates/views/edit-email-template.html @@ -2,6 +2,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} {% from "components/radios.html" import radios %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{ heading_action }} email template @@ -13,7 +14,7 @@ {{ heading_action }} email template -
+ {% call form_wrapper() %}
{{ textbox(form.name, width='1-1', hint='Your recipients won’t see this', rows=10) }} @@ -36,6 +37,6 @@ {% endif %}
- + {% endcall %} {% endblock %} diff --git a/app/templates/views/edit-letter-template.html b/app/templates/views/edit-letter-template.html index 804e40339..4d0c62163 100644 --- a/app/templates/views/edit-letter-template.html +++ b/app/templates/views/edit-letter-template.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{ heading_action }} letter template @@ -12,7 +13,7 @@ {{ heading_action }} letter template -
+ {% call form_wrapper() %}
{{ textbox(form.name, width='1-1', hint='Your recipients won’t see this', rows=10) }} @@ -27,6 +28,6 @@ {% include "partials/templates/guidance-personalisation.html" %}
- + {% endcall %} {% endblock %} diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html index e7578aee0..2b56c4852 100644 --- a/app/templates/views/edit-sms-template.html +++ b/app/templates/views/edit-sms-template.html @@ -2,6 +2,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} {% from "components/radios.html" import radios %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{ heading_action }} text message template @@ -13,7 +14,7 @@ {{ heading_action }} text message template -
+ {% call form_wrapper() %}
{{ textbox(form.name, width='1-1', hint='Your recipients won’t see this') }} @@ -34,7 +35,7 @@ {% include "partials/templates/guidance-character-count.html" %}
- + {% endcall %} {% endblock %} diff --git a/app/templates/views/edit-user-permissions.html b/app/templates/views/edit-user-permissions.html index eef384425..4a59b6363 100644 --- a/app/templates/views/edit-user-permissions.html +++ b/app/templates/views/edit-user-permissions.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{ user.name or user.email_localpart }} @@ -17,7 +18,7 @@

-
+ {% call form_wrapper(class="column-three-quarters") %} {% include 'views/manage-users/permissions.html' %} @@ -27,6 +28,6 @@ delete_link_text='Remove user from service' ) }} -
+ {% endcall %}
{% endblock %} diff --git a/app/templates/views/email-branding/manage-branding.html b/app/templates/views/email-branding/manage-branding.html index 7ff461304..06c587c37 100644 --- a/app/templates/views/email-branding/manage-branding.html +++ b/app/templates/views/email-branding/manage-branding.html @@ -3,6 +3,7 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/textbox.html" import textbox %} {% from "components/radios.html" import radios %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{ '{} email branding'.format('Update' if email_branding else 'Create')}} @@ -19,7 +20,7 @@
{% endif %} {{ file_upload(form.file, button_text='{} logo'.format('Update' if email_branding else 'Upload')) }} -
+ {% call form_wrapper() %}
{{textbox(form.name)}}
{{textbox(form.text)}}
@@ -32,7 +33,7 @@ back_link_text='Back to email branding selection', ) }}
-
+ {% endcall %}
{% endblock %} diff --git a/app/templates/views/find-users/find-users-by-email.html b/app/templates/views/find-users/find-users-by-email.html index 2237b70c5..c4b09dc94 100644 --- a/app/templates/views/find-users/find-users-by-email.html +++ b/app/templates/views/find-users/find-users-by-email.html @@ -1,5 +1,6 @@ {% extends "views/platform-admin/_base_template.html" %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Find users by email @@ -11,11 +12,11 @@ Find users by email -
+ + {% call form_wrapper( + action=url_for('.find_users_by_email'), + class='grid-row' + ) %}
{{ textbox( form.search, @@ -27,11 +28,11 @@
-
+ {% endcall %} -
+ {% call form_wrapper(id='search-form' ) %} -
+ {% endcall %} {% if users_found %}
diff --git a/app/templates/views/invite-user.html b/app/templates/views/invite-user.html index e5e7eb165..1743800e6 100644 --- a/app/templates/views/invite-user.html +++ b/app/templates/views/invite-user.html @@ -2,6 +2,7 @@ {% from "components/checkbox.html" import checkbox %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Invite a team member @@ -14,7 +15,7 @@
-
+ {% call form_wrapper() %} {{ textbox(form.email_address, width='1-1', safe_error_message=True) }} @@ -22,6 +23,6 @@ {{ page_footer('Send invitation email') }} -
+ {% endcall %}
{% endblock %} diff --git a/app/templates/views/letter-jobs.html b/app/templates/views/letter-jobs.html index d314acfa0..916160fcf 100644 --- a/app/templates/views/letter-jobs.html +++ b/app/templates/views/letter-jobs.html @@ -1,5 +1,6 @@ {% extends "views/platform-admin/_base_template.html" %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Letter jobs @@ -9,7 +10,7 @@

Letter jobs

-
+ {% call form_wrapper() %}

@@ -46,6 +47,6 @@ {% endif %}

{% endif %} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/new-password.html b/app/templates/views/new-password.html index 082189374..56e31416a 100644 --- a/app/templates/views/new-password.html +++ b/app/templates/views/new-password.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Create a new password @@ -17,10 +18,10 @@

You can now create a new password for your account.

- + {% call form_wrapper() %} {{ textbox(form.new_password, hint="At least 8 characters") }} {{ page_footer("Continue") }} - + {% endcall %} {% else %}

Message about email address does not exist. Some one needs to figure out the words here. diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html index 41c89b5d6..efd758f3e 100644 --- a/app/templates/views/notifications.html +++ b/app/templates/views/notifications.html @@ -3,6 +3,7 @@ {% from "components/message-count-label.html" import message_count_label, recipient_count_label %} {% from "components/page-footer.html" import page_footer %} {% from "components/textbox.html" import textbox %} +{% from "components/form.html" import form_wrapper %} {% set page_title = ( message_count_label(99, message_type, suffix='') | capitalize @@ -27,11 +28,10 @@ 'counts' ) }} -
+ ) %}

{{ textbox( search_form.to, @@ -42,16 +42,16 @@
- + {% endcall %} - + {% call form_wrapper(id="search-form") %} - + {% endcall %} {% else %} - + {% call form_wrapper(id="search-form") %} - + {% endcall %} {% endif %} {% if current_user.has_permissions('view_activity') %} diff --git a/app/templates/views/organisations/add-organisation.html b/app/templates/views/organisations/add-organisation.html index a67a0c360..7ccd4d99b 100644 --- a/app/templates/views/organisations/add-organisation.html +++ b/app/templates/views/organisations/add-organisation.html @@ -1,6 +1,7 @@ {% extends "views/platform-admin/_base_template.html" %} {% from "components/page-footer.html" import page_footer %} {% from "components/textbox.html" import textbox %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Create an organisation @@ -13,13 +14,13 @@ {% block platform_admin_content %}

Create an organisation

- + {% call form_wrapper() %} {{textbox(form.name)}} {{ page_footer( 'Save', back_link=url_for('.organisations'), back_link_text='Back to organisations', ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/organisations/organisation/settings/edit-name/confirm.html b/app/templates/views/organisations/organisation/settings/edit-name/confirm.html index 6fa3d5c77..bee677b1a 100644 --- a/app/templates/views/organisations/organisation/settings/edit-name/confirm.html +++ b/app/templates/views/organisations/organisation/settings/edit-name/confirm.html @@ -1,6 +1,7 @@ {% extends "org_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block org_page_title %} Confirm organisation name change @@ -13,7 +14,7 @@
-
+ {% call form_wrapper() %} {{ textbox(form.password) }}

Your organisation name will be changed from {{ current_org.name }} to {{ new_name }}

{{ page_footer( @@ -21,7 +22,7 @@ destructive=destructive, back_link=url_for('.organisation_settings', org_id=current_org.id) ) }} - + {% endcall %}
diff --git a/app/templates/views/organisations/organisation/settings/edit-name/index.html b/app/templates/views/organisations/organisation/settings/edit-name/index.html index 1e710f166..abc35a0cc 100644 --- a/app/templates/views/organisations/organisation/settings/edit-name/index.html +++ b/app/templates/views/organisations/organisation/settings/edit-name/index.html @@ -1,6 +1,7 @@ {% extends "org_template.html" %} {% from "components/page-footer.html" import page_footer %} {% from "components/textbox.html" import textbox %} +{% from "components/form.html" import form_wrapper %} {% block org_page_title %} Change organisation name @@ -9,13 +10,13 @@ {% block maincolumn_content %}

Change organisation name

- + {% call form_wrapper() %} {{textbox(form.name)}} {{ page_footer( 'Save', back_link=url_for('.organisation_settings', org_id=current_org.id), back_link_text='Back to settings', ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/organisations/organisation/users/invite-org-user.html b/app/templates/views/organisations/organisation/users/invite-org-user.html index 8e7ee3645..ac54d27d4 100644 --- a/app/templates/views/organisations/organisation/users/invite-org-user.html +++ b/app/templates/views/organisations/organisation/users/invite-org-user.html @@ -2,6 +2,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Invite a team member @@ -13,7 +14,7 @@ Invite a team member
-
+ {% call form_wrapper(class="column-three-quarters") %} {{ textbox(form.email_address, width='1-1', safe_error_message=True) }}
@@ -27,7 +28,7 @@
{{ page_footer('Send invitation email') }} - + {% endcall %}
{% endblock %} diff --git a/app/templates/views/organisations/organisation/users/user/index.html b/app/templates/views/organisations/organisation/users/user/index.html index 2d7615141..1f52a3115 100644 --- a/app/templates/views/organisations/organisation/users/user/index.html +++ b/app/templates/views/organisations/organisation/users/user/index.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{ user.name or user.email_localpart }} @@ -15,7 +16,8 @@

{{ user.email_address }}

- + + {% call form_wrapper(class="column-three-quarters") %} {{ page_footer( 'Save', back_link=url_for('.manage_org_users', org_id=current_org.id), @@ -23,6 +25,6 @@ delete_link=url_for('.remove_user_from_organisation', org_id=current_org.id, user_id=user.id) if user or None, delete_link_text='Remove user from organisation' ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/platform-admin/index.html b/app/templates/views/platform-admin/index.html index 4754af1b0..6da4e87d2 100644 --- a/app/templates/views/platform-admin/index.html +++ b/app/templates/views/platform-admin/index.html @@ -3,6 +3,7 @@ {% from "components/big-number.html" import big_number_simple %} {% from "components/message-count-label.html" import message_count_label %} {% from "components/status-box.html" import status_box %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Platform admin @@ -15,12 +16,12 @@
Apply filters -
+ {% call form_wrapper(method="get") %} {{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }} {{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }}
- + {% endcall %}
diff --git a/app/templates/views/platform-admin/returned-letters.html b/app/templates/views/platform-admin/returned-letters.html index d8b2080cf..63de0e1f8 100644 --- a/app/templates/views/platform-admin/returned-letters.html +++ b/app/templates/views/platform-admin/returned-letters.html @@ -1,6 +1,7 @@ {% extends "views/platform-admin/_base_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} {{ page_title|capitalize }} @@ -11,10 +12,10 @@

Submit returned letters

-
+ {% call form_wrapper() %} {{ textbox(form.references, width='1-1', rows=8) }} {{ page_footer("Submit") }} - + {% endcall %}
diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html index 975514381..c10abb095 100644 --- a/app/templates/views/platform-admin/services.html +++ b/app/templates/views/platform-admin/services.html @@ -5,6 +5,7 @@ {% from "components/big-number.html" import big_number, big_number_with_status %} {% from "components/message-count-label.html" import message_count_label %} {% from "components/table.html" import mapping_table, field, stats_fields, row_group, row, right_aligned_field_heading, hidden_field_heading, text_field %} +{% from "components/form.html" import form_wrapper %} {% macro stats_fields(channel, data) -%} @@ -102,13 +103,13 @@
Apply filters -
+ {% call form_wrapper(method="get") %} {{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }} {{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }} {{ checkbox(form.include_from_test_key) }}
- + {% endcall %}
{% include "views/platform-admin/_global_stats.html" %} diff --git a/app/templates/views/providers/edit-provider.html b/app/templates/views/providers/edit-provider.html index 7898ca6aa..4fbe4acbd 100644 --- a/app/templates/views/providers/edit-provider.html +++ b/app/templates/views/providers/edit-provider.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} -{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Provider - {{provider.display_name}} @@ -20,10 +20,10 @@ Provider - {{provider.display_name}}
  • We only send from the highest priority provider
    • -
    + {% call form_wrapper() %} {{ textbox(form.priority) }} {{ page_footer('Save', back_link=url_for('.view_providers'), back_link_text="Back to providers") }} - + {% endcall %}
    diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html index 466b2f276..9a19ba145 100644 --- a/app/templates/views/register-from-invite.html +++ b/app/templates/views/register-from-invite.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Create an account @@ -15,7 +16,7 @@ Create an account Your account will be created with this email address: {{invited_user.email_address}}

    - + {% call form_wrapper() %} {{ textbox(form.name, width='3-4') }} {% if invited_user.auth_type == 'sms_auth' %}
    @@ -27,7 +28,7 @@ Create an account {{form.service}} {{form.email_address}} {{form.auth_type}} - + {% endcall %}
    diff --git a/app/templates/views/register-from-org-invite.html b/app/templates/views/register-from-org-invite.html index 717e19992..c5e32b704 100644 --- a/app/templates/views/register-from-org-invite.html +++ b/app/templates/views/register-from-org-invite.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Create an account @@ -12,7 +13,7 @@ Create an account

    Create an account

    Your account will be created with this email: {{invited_org_user.email_address}}

    -
    + {% call form_wrapper() %} {{ textbox(form.name, width='3-4') }}
    {{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a security code by text message') }} @@ -21,7 +22,7 @@ Create an account {{ page_footer("Continue") }} {{form.organisation}} {{form.email_address}} - + {% endcall %}
    diff --git a/app/templates/views/register.html b/app/templates/views/register.html index 43d07bb14..04acc1b8b 100644 --- a/app/templates/views/register.html +++ b/app/templates/views/register.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Create an account @@ -11,7 +12,7 @@ Create an account

    Create an account

    -
    + {% call form_wrapper(autocomplete=True) %} {{ textbox(form.name, width='3-4') }} {{ textbox(form.email_address, hint="Must be from a government organisation", width='3-4', safe_error_message=True) }}
    @@ -21,7 +22,7 @@ Create an account {{ textbox(form.password, hint="At least 8 characters", width='3-4') }} {{form.auth_type}} {{ page_footer("Continue") }} - + {% endcall %}
    diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html index 1691c8244..206ad1734 100644 --- a/app/templates/views/send-test.html +++ b/app/templates/views/send-test.html @@ -2,6 +2,7 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/message-count-label.html" import recipient_count_label %} {% from "components/textbox.html" import textbox %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{ page_title }} @@ -13,7 +14,7 @@ {{ page_title }} -
    + {% call form_wrapper(class="js-stick-at-top-when-scrolling", module="autofocus") %}
    {{ textbox( @@ -36,7 +37,7 @@

    {% endif %} {{ page_footer('Continue', back_link=back_link) }} - + {% endcall %} {{ template|string }} diff --git a/app/templates/views/service-settings/branding/email-options.html b/app/templates/views/service-settings/branding/email-options.html index e9a93355f..c976fbaf7 100644 --- a/app/templates/views/service-settings/branding/email-options.html +++ b/app/templates/views/service-settings/branding/email-options.html @@ -2,6 +2,7 @@ {% from "components/radios.html" import radio %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Email branding @@ -11,7 +12,7 @@

    Email branding

    -
    + {% call form_wrapper() %}
    Choose the branding you’d like on your emails. @@ -41,6 +42,6 @@ destructive=destructive, back_link=url_for('.service_settings', service_id=current_service.id) ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/confirm.html b/app/templates/views/service-settings/confirm.html index 72b372e98..0162d5510 100644 --- a/app/templates/views/service-settings/confirm.html +++ b/app/templates/views/service-settings/confirm.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{ heading }} @@ -13,14 +14,14 @@
    -
    + {% call form_wrapper() %} {{ textbox(form.password) }} {{ page_footer( 'Confirm', destructive=destructive, back_link=url_for('.service_settings', service_id=current_service.id) ) }} - + {% endcall %}
    diff --git a/app/templates/views/service-settings/contact_link.html b/app/templates/views/service-settings/contact_link.html index 7b1463899..d4b5bb385 100644 --- a/app/templates/views/service-settings/contact_link.html +++ b/app/templates/views/service-settings/contact_link.html @@ -2,6 +2,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} {% from "components/radios.html" import radio, radios_wrapper %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{ 'Change' if 'upload_document' in current_service.permissions else 'Add' }} contact details for ‘Download your document’ page @@ -18,7 +19,7 @@ on the download page. This is so users can contact you if there’s a problem (for example, if the link to download the document has expired).

    -
    + {% call form_wrapper() %} {% call radios_wrapper(form.contact_details_type, hide_legend=true) %} {% for option in form.contact_details_type %} @@ -36,7 +37,7 @@ back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %}
    {% endblock %} diff --git a/app/templates/views/service-settings/data-retention/add.html b/app/templates/views/service-settings/data-retention/add.html index da70d086f..23259d9ab 100644 --- a/app/templates/views/service-settings/data-retention/add.html +++ b/app/templates/views/service-settings/data-retention/add.html @@ -1,7 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} - +{% from "components/form.html" import form_wrapper %} {% from "components/radios.html" import radios %} {% block service_page_title %} @@ -12,7 +12,7 @@

    Set data retention

    -
    + {% call form_wrapper() %} {{ radios(form.notification_type) }} {{ textbox(form.days_of_retention) }} {{ page_footer( @@ -20,6 +20,6 @@ back_link=url_for('.add_data_retention', service_id=current_service.id), back_link_text='Back' ) }} - + {% endcall %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/views/service-settings/data-retention/edit.html b/app/templates/views/service-settings/data-retention/edit.html index 21a7c8736..f899ff3e3 100644 --- a/app/templates/views/service-settings/data-retention/edit.html +++ b/app/templates/views/service-settings/data-retention/edit.html @@ -1,7 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} - +{% from "components/form.html" import form_wrapper %} {% from "components/radios.html" import radios %} {% block service_page_title %} @@ -12,7 +12,7 @@

    Set data retention

    -
    + {% call form_wrapper() %} {{ notification_type | capitalize}} {{ textbox(form.days_of_retention) }} {{ page_footer( @@ -20,6 +20,6 @@ back_link=url_for('.edit_data_retention', service_id=current_service.id, data_retention_id=data_retention_id), back_link_text='Back' ) }} - + {% endcall %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/views/service-settings/delete.html b/app/templates/views/service-settings/delete.html index 5880c6481..4d00b0d86 100644 --- a/app/templates/views/service-settings/delete.html +++ b/app/templates/views/service-settings/delete.html @@ -1,5 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Delete service @@ -33,13 +34,13 @@ -
    + {% call form_wrapper() %} {{ page_footer( 'Yes, delete ‘{}’'.format(current_service.name), destructive=True, back_link=url_for('.service_settings', service_id=current_service.id) ) }} - + {% endcall %}
    diff --git a/app/templates/views/service-settings/email-reply-to/add.html b/app/templates/views/service-settings/email-reply-to/add.html index b83b820ad..63cf9e4e2 100644 --- a/app/templates/views/service-settings/email-reply-to/add.html +++ b/app/templates/views/service-settings/email-reply-to/add.html @@ -2,6 +2,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Add email reply-to address @@ -12,7 +13,7 @@

    Add email reply-to address

    - + {% call form_wrapper() %} {{ textbox( form.email_address, width='2-3', @@ -28,6 +29,6 @@ back_link=url_for('.service_email_reply_to', service_id=current_service.id), back_link_text='Back' ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/email-reply-to/edit.html b/app/templates/views/service-settings/email-reply-to/edit.html index 4687dc022..f45c2dd5a 100644 --- a/app/templates/views/service-settings/email-reply-to/edit.html +++ b/app/templates/views/service-settings/email-reply-to/edit.html @@ -3,6 +3,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Edit email reply to address @@ -24,7 +25,7 @@ Edit email reply to address {% endif %} - + {% call form_wrapper() %} {{ textbox( form.email_address, width='2-3', @@ -51,6 +52,6 @@ delete_link_text='Delete' ) }} {% endif %} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/letter-contact/add.html b/app/templates/views/service-settings/letter-contact/add.html index dfcecd45a..9aac44217 100644 --- a/app/templates/views/service-settings/letter-contact/add.html +++ b/app/templates/views/service-settings/letter-contact/add.html @@ -2,6 +2,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Add a new address @@ -13,7 +14,7 @@ Add a new address
    -
    + {% call form_wrapper() %} {{ textbox( form.letter_contact_block, label='This will appear as the ‘sender’ address on your letters.'|safe, @@ -32,7 +33,7 @@ back_link=None if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id), back_link_text='Back' ) }} - + {% endcall %}
    {% endblock %} diff --git a/app/templates/views/service-settings/letter-contact/edit.html b/app/templates/views/service-settings/letter-contact/edit.html index c84381c4a..389d4a1a3 100644 --- a/app/templates/views/service-settings/letter-contact/edit.html +++ b/app/templates/views/service-settings/letter-contact/edit.html @@ -2,6 +2,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Edit an address @@ -13,7 +14,7 @@ Edit an address
    -
    + {% call form_wrapper() %} {{ textbox( form.letter_contact_block, label='This will appear as the ‘sender’ address on your letters.'|safe, @@ -36,7 +37,7 @@ back_link=None if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %}
    {% endblock %} diff --git a/app/templates/views/service-settings/link-service-to-organisation.html b/app/templates/views/service-settings/link-service-to-organisation.html index 002b5d863..9a554aa4b 100644 --- a/app/templates/views/service-settings/link-service-to-organisation.html +++ b/app/templates/views/service-settings/link-service-to-organisation.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Link service to organisation @@ -13,7 +14,7 @@

    Link service to organisation

    - + {% call form_wrapper() %} {% if has_organisations %} {{ radios(form.organisations) }} {% else %} @@ -24,7 +25,7 @@ back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/name.html b/app/templates/views/service-settings/name.html index 223d079e9..33694395d 100644 --- a/app/templates/views/service-settings/name.html +++ b/app/templates/views/service-settings/name.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Change your service name @@ -22,13 +23,13 @@ {% endif %} - + {% call form_wrapper() %} {{ textbox(form.name) }} {{ page_footer( 'Save', back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/preview-email-branding.html b/app/templates/views/service-settings/preview-email-branding.html index 917a0bc44..20d5478d3 100644 --- a/app/templates/views/service-settings/preview-email-branding.html +++ b/app/templates/views/service-settings/preview-email-branding.html @@ -1,5 +1,5 @@ {% extends "views/platform-admin/_base_template.html" %} - +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Preview email branding {% endblock %} @@ -10,7 +10,7 @@
    -
    + {% call form_wrapper(action=action) %}
    {{ form.hidden_tag() }}
    @@ -18,7 +18,7 @@ Back to service settings
    - + {% endcall %}
    {% endblock %} diff --git a/app/templates/views/service-settings/set-email-branding.html b/app/templates/views/service-settings/set-email-branding.html index 0e893a079..fde3f9267 100644 --- a/app/templates/views/service-settings/set-email-branding.html +++ b/app/templates/views/service-settings/set-email-branding.html @@ -2,6 +2,7 @@ {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} {% from "components/live-search.html" import live_search %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Set email branding @@ -10,7 +11,7 @@ {% block maincolumn_content %}

    Set email branding

    - + {% call form_wrapper() %}
    @@ -30,6 +31,6 @@ ) }}
    - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/set-free-sms-allowance.html b/app/templates/views/service-settings/set-free-sms-allowance.html index 58ff3b36d..566e75b2d 100644 --- a/app/templates/views/service-settings/set-free-sms-allowance.html +++ b/app/templates/views/service-settings/set-free-sms-allowance.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Emails @@ -8,7 +9,7 @@ {% block maincolumn_content %} - + {% call form_wrapper() %}

    Free text message allowance

    {{ textbox(form.free_sms_allowance) }} {{ page_footer( @@ -16,6 +17,6 @@ back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/set-inbound-number.html b/app/templates/views/service-settings/set-inbound-number.html index 72a11b5b8..91324bf94 100644 --- a/app/templates/views/service-settings/set-inbound-number.html +++ b/app/templates/views/service-settings/set-inbound-number.html @@ -22,14 +22,14 @@ back_link_text='Back to settings' ) }} {% else %} - + {% call form_wrapper() %} {{ radios(form.inbound_number) }} {{ page_footer( 'Save', back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back' - ) }} - + ) }} + {% endcall %} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/views/service-settings/set-international-sms.html b/app/templates/views/service-settings/set-international-sms.html index 13568c94a..b558bb9b9 100644 --- a/app/templates/views/service-settings/set-international-sms.html +++ b/app/templates/views/service-settings/set-international-sms.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} International text messages @@ -18,14 +19,14 @@ See pricing for the list of rates.

    - + {% call form_wrapper() %} {{ radios(form.enabled) }} {{ page_footer( button_text="Save", back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %} diff --git a/app/templates/views/service-settings/set-letter-branding.html b/app/templates/views/service-settings/set-letter-branding.html index febee5f8d..de1adfe66 100644 --- a/app/templates/views/service-settings/set-letter-branding.html +++ b/app/templates/views/service-settings/set-letter-branding.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Set letter branding @@ -11,14 +12,14 @@

    Set letter branding

    -
    + {% call form_wrapper() %} {{ radios(form.dvla_org_id) }} {{ page_footer( 'Save', back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %}
    diff --git a/app/templates/views/service-settings/set-letter-contact-block.html b/app/templates/views/service-settings/set-letter-contact-block.html index ddd46ffe6..01e9b6118 100644 --- a/app/templates/views/service-settings/set-letter-contact-block.html +++ b/app/templates/views/service-settings/set-letter-contact-block.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Letter contact details @@ -12,7 +13,7 @@ Letter contact details
    -
    + {% call form_wrapper(class="column-half") %} {{ textbox( form.letter_contact_block, label='How should users contact your service?
    This applies to all the letters you send.'|safe, @@ -26,7 +27,7 @@ back_link=None if request.args.get('from_template') else url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %}
    {% endblock %} diff --git a/app/templates/views/service-settings/set-letters.html b/app/templates/views/service-settings/set-letters.html index dcb13e0ad..31c1a09d6 100644 --- a/app/templates/views/service-settings/set-letters.html +++ b/app/templates/views/service-settings/set-letters.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Send letters @@ -18,14 +19,14 @@ See pricing for the list of rates.

    - + {% call form_wrapper() %} {{ radios(form.enabled) }} {{ page_footer( 'Save', back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %} diff --git a/app/templates/views/service-settings/set-organisation-type.html b/app/templates/views/service-settings/set-organisation-type.html index 8e136dc5c..e470c6cd8 100644 --- a/app/templates/views/service-settings/set-organisation-type.html +++ b/app/templates/views/service-settings/set-organisation-type.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Set branding and organisation @@ -9,14 +10,14 @@ {% block maincolumn_content %}

    Set organisation type

    - + {% call form_wrapper() %} {{ radios(form.organisation_type) }} {{ page_footer( 'Save', back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/set-reply-to-email.html b/app/templates/views/service-settings/set-reply-to-email.html index f5ad4d526..9d65d1a17 100644 --- a/app/templates/views/service-settings/set-reply-to-email.html +++ b/app/templates/views/service-settings/set-reply-to-email.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Email reply-to address @@ -26,7 +27,7 @@ Your service can’t go live until you’ve done this.

    {% endif %} - + {% call form () %} {{ textbox( form.email_address, width='2-3', @@ -36,7 +37,7 @@ 'Save', back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' - ) }} - + ) }} + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/sms-prefix.html b/app/templates/views/service-settings/sms-prefix.html index e74508596..9cb8e38ac 100644 --- a/app/templates/views/service-settings/sms-prefix.html +++ b/app/templates/views/service-settings/sms-prefix.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Text messages start with service name @@ -9,13 +10,13 @@ {% block maincolumn_content %}

    Text messages start with service name

    - + {% call form_wrapper() %} {{ radios(form.enabled) }} {{ page_footer( button_text="Save", back_link=url_for('.service_settings', service_id=current_service.id), back_link_text='Back to settings' ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/sms-sender/add.html b/app/templates/views/service-settings/sms-sender/add.html index e670d67b7..ec462941c 100644 --- a/app/templates/views/service-settings/sms-sender/add.html +++ b/app/templates/views/service-settings/sms-sender/add.html @@ -2,6 +2,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Add text message sender @@ -10,7 +11,7 @@ {% block maincolumn_content %}

    Add text message sender

    - + {% call form_wrapper() %} {{ textbox( form.sms_sender, width='1-4', @@ -25,7 +26,7 @@ 'Save', back_link=url_for('.service_sms_senders', service_id=current_service.id), back_link_text='Back' - ) }} - + ) }} + {% endcall %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/views/service-settings/sms-sender/edit.html b/app/templates/views/service-settings/sms-sender/edit.html index d32250884..3a82dfbc6 100644 --- a/app/templates/views/service-settings/sms-sender/edit.html +++ b/app/templates/views/service-settings/sms-sender/edit.html @@ -3,6 +3,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Edit text message sender @@ -24,7 +25,7 @@ Edit text message sender {% endif %} - + {% call form_wrapper() %} {% if inbound_number %}

    {{ sms_sender.sms_sender }} @@ -66,6 +67,6 @@ ) }} {% endif %} {% endif %} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/service-settings/submit-request-to-go-live.html b/app/templates/views/service-settings/submit-request-to-go-live.html index af645d9f6..fcf8ba6a7 100644 --- a/app/templates/views/service-settings/submit-request-to-go-live.html +++ b/app/templates/views/service-settings/submit-request-to-go-live.html @@ -4,6 +4,7 @@ {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} {% from "components/banner.html" import banner_wrapper %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Request to go live @@ -13,7 +14,7 @@

    Request to go live

    - + {% call form_wrapper() %}
    {{ textbox(form.volume_email, width='1-2', hint='For example, 1,000,000') }} {{ textbox(form.volume_sms, width='1-2', hint='For example, 500,000') }} @@ -29,6 +30,6 @@ By requesting to go live you’re agreeing to our terms of use.

    {{ page_footer('Request to go live') }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index 031ac928c..3d23afab6 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Sign in @@ -30,11 +31,11 @@

    {% endif %} -
    + {% call form_wrapper(autocomplete=True) %} {{ textbox(form.email_address) }} {{ textbox(form.password) }} {{ page_footer("Continue", secondary_link=url_for('.forgot_password'), secondary_link_text="Forgot your password?") }} - + {% endcall %}
    diff --git a/app/templates/views/support/ask-question-give-feedback.html b/app/templates/views/support/ask-question-give-feedback.html index 52f9ad1e8..6c0adfde7 100644 --- a/app/templates/views/support/ask-question-give-feedback.html +++ b/app/templates/views/support/ask-question-give-feedback.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Ask a question or give feedback @@ -13,7 +14,7 @@
    -
    + {% call form_wrapper() %} {{ textbox(form.feedback, width='1-1', hint='', rows=10) }} {% if not current_user.is_authenticated %}

    Do you want a reply?

    @@ -28,7 +29,7 @@ secondary_link=url_for('.support'), secondary_link_text='Back to support', ) }} - + {% endcall %}
    diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 38193daaf..7c909aff5 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Support @@ -13,10 +14,11 @@

    Support

    - + {% call form_wrapper(class="bottom-gutter-2") %} {{ radios(form.support_type) }} {{ page_footer('Continue') }} - + {% endcall %} +

    If something’s wrong, you can check the GOV.UK Notify system status page to see if we’re already aware of it.

    24-hour support

    diff --git a/app/templates/views/support/report-problem.html b/app/templates/views/support/report-problem.html index 7a961ad9b..9bce16aec 100644 --- a/app/templates/views/support/report-problem.html +++ b/app/templates/views/support/report-problem.html @@ -2,6 +2,7 @@ {% from "components/checkbox.html" import checkbox %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Report a problem @@ -20,7 +21,7 @@ page to see if there are any known issues with GOV.UK Notify.

    - + {% call form_wrapper() %} {{ textbox(form.feedback, width='1-1', hint='', rows=10) }} {% if not current_user.is_authenticated %} {{ textbox(form.name, width='1-1') }} @@ -33,7 +34,7 @@ secondary_link=url_for('.support'), secondary_link_text='Back to support', ) }} - + {% endcall %} diff --git a/app/templates/views/support/triage.html b/app/templates/views/support/triage.html index e4d63d8df..a4ef97b42 100644 --- a/app/templates/views/support/triage.html +++ b/app/templates/views/support/triage.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Feedback @@ -13,10 +14,10 @@

    Report a problem

    - + {% call form_wrapper() %} {{ radios(form.severe) }} {{ page_footer('Continue') }} - + {% endcall %}

    It’s only an emergency if:

    diff --git a/app/templates/views/templates/add.html b/app/templates/views/templates/add.html index 94be364f1..c46f73da4 100644 --- a/app/templates/views/templates/add.html +++ b/app/templates/views/templates/add.html @@ -1,5 +1,6 @@ {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% extends "withnav_template.html" %} @@ -11,11 +12,11 @@

    Add new template

    - + {% call form_wrapper() %} {{ radios(form.template_type) }} {{ page_footer( 'Continue' ) }} - + {% endcall %} {% endblock %} diff --git a/app/templates/views/templates/breaking-change.html b/app/templates/views/templates/breaking-change.html index 8bd486584..ede5cbb8b 100644 --- a/app/templates/views/templates/breaking-change.html +++ b/app/templates/views/templates/breaking-change.html @@ -3,6 +3,7 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/table.html" import list_table, text_field, index_field, index_field_heading %} {% from "components/list.html" import list_of_placeholders %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Confirm changes @@ -25,7 +26,7 @@ {% endif %} - + {% call form_wrapper() %} @@ -37,7 +38,7 @@ back_link=url_for(".edit_service_template", service_id=current_service.id, template_id=new_template.id), back_link_text="Back" ) }} - + {% endcall %}

    When you send messages using this template you’ll need diff --git a/app/templates/views/templates/set-sender.html b/app/templates/views/templates/set-sender.html index 7cfa343cc..539199023 100644 --- a/app/templates/views/templates/set-sender.html +++ b/app/templates/views/templates/set-sender.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} {{sender_context['title']}} @@ -11,7 +12,7 @@

    {{sender_context['title']}}

    -
    + {% call form_wrapper() %} {{ radios( form.sender, option_hints=option_hints, @@ -22,7 +23,7 @@ back_link=url_for('.view_template', service_id=current_service.id, template_id=template_id), back_link_text='Back to template' ) }} - + {% endcall %}
    diff --git a/app/templates/views/templates/set-template-sender.html b/app/templates/views/templates/set-template-sender.html index 1cbbc34ae..e9185d7ff 100644 --- a/app/templates/views/templates/set-template-sender.html +++ b/app/templates/views/templates/set-template-sender.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block service_page_title %} Set letter contact block @@ -11,7 +12,7 @@

    Set letter contact block

    -
    + {% call form_wrapper() %} {{ radios( form.sender, option_hints=option_hints, @@ -25,7 +26,7 @@ {% if no_senders %} Add new sender {% endif %} - + {% endcall %}
    diff --git a/app/templates/views/text-not-received.html b/app/templates/views/text-not-received.html index 7730ac917..56a4a2aa4 100644 --- a/app/templates/views/text-not-received.html +++ b/app/templates/views/text-not-received.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Check your mobile number @@ -14,10 +15,10 @@ Check your mobile number

    Check your mobile phone number is correct and then resend the security code.

    - + {% call form_wrapper() %} {{ textbox(form.mobile_number) }} {{ page_footer("Resend security code") }} - + {% endcall %} diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html index d7177c4c6..1a5faaadc 100644 --- a/app/templates/views/two-factor.html +++ b/app/templates/views/two-factor.html @@ -2,6 +2,7 @@ {% from "components/textbox.html" import textbox %} {% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Text verification @@ -15,7 +16,7 @@

    We’ve sent you a text message with a security code.

    - + {% call form_wrapper(class="extra-tracking") %} {{ textbox( form.sms_code, width='5em', @@ -26,7 +27,7 @@ secondary_link=url_for('main.check_and_resend_text_code'), secondary_link_text='Not received a text message?' ) }} - + {% endcall %} diff --git a/app/templates/views/user-profile/authenticate.html b/app/templates/views/user-profile/authenticate.html index 9a5da89ab..fbcfe647e 100644 --- a/app/templates/views/user-profile/authenticate.html +++ b/app/templates/views/user-profile/authenticate.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Change your {{ thing }} @@ -13,13 +14,13 @@
    -
    + {% call form_wrapper(autocomplete=True) %} {{ textbox(form.password) }} {{ page_footer( 'Confirm', back_link=back_link ) }} - + {% endcall %}
    diff --git a/app/templates/views/user-profile/change-password.html b/app/templates/views/user-profile/change-password.html index e0e9a258b..856107638 100644 --- a/app/templates/views/user-profile/change-password.html +++ b/app/templates/views/user-profile/change-password.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Change your password @@ -12,7 +13,7 @@
    -
    + {% call form_wrapper(autocomplete=True) %} {{ textbox(form.old_password) }} {{ textbox(form.new_password) }} {{ page_footer( @@ -20,7 +21,7 @@ secondary_link=url_for('.user_profile'), secondary_link_text="Back to your profile" ) }} - + {% endcall %}
    diff --git a/app/templates/views/user-profile/change.html b/app/templates/views/user-profile/change.html index 3deadd2d1..02791484e 100644 --- a/app/templates/views/user-profile/change.html +++ b/app/templates/views/user-profile/change.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Change your {{ thing }} @@ -17,14 +18,14 @@

    {% endif %}
    -
    + {% call form_wrapper() %} {{ textbox(form_field, safe_error_message=True) }} {{ page_footer( 'Save', back_link=url_for('.user_profile'), back_link_text="Back to your profile" ) }} - + {% endcall %}
    diff --git a/app/templates/views/user-profile/confirm.html b/app/templates/views/user-profile/confirm.html index 0ea5c72ab..5eb572796 100644 --- a/app/templates/views/user-profile/confirm.html +++ b/app/templates/views/user-profile/confirm.html @@ -1,6 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} {% block per_page_title %} Change your {{ thing }} @@ -15,7 +16,7 @@

    We’ve sent a security code to your new {{ thing }}.

    - + {% call form_wrapper() %} {{ textbox( form_field, width='5em', @@ -26,7 +27,7 @@ destructive=destructive, back_link=url_for('.user_profile') ) }} - + {% endcall %}