Merge pull request #2314 from alphagov/validate-rtgl

Don’t trigger HTML5 validation on any form
2026-02-07 11:53:52 -05:00 · 2018-10-01 14:18:16 +01:00
parent c698aa3d21 d9da219b7e
commit 351a3dc4f3
72 changed files with 257 additions and 170 deletions
--- a/app/templates/components/form.html
+++ 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
+) %}
+  <form
+    method="{{ method }}"
+    {% if action %}action="{{ action }}"{% endif %}
+    {% if not autocomplete %}autocomplete="off"{% endif %}
+    {% if class %}class="{{ class }}"{% endif %}
+    {% if id %}id="{{ id }}"{% endif %}
+    {% if module %}data-module="{{ module }}"{% endif %}
+    novalidate
+  >
+    {{ caller() }}
+  </form>
+{% endmacro %}
--- 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 %}

 <div class="ajax-block-container" aria-labelledby='pill-selected-item'>
  {% if job.job_status == 'scheduled' %}
@@ -10,12 +11,12 @@
      {{ job.scheduled_for|format_datetime_relative }}
    </p>
    <div class="page-footer">
-      <form method="post">
+      {% call form_wrapper() %}
        {{ page_footer(
          button_text="Cancel sending",
          destructive=True
        ) }}
-      </form>
+      {% endcall %}
    </div>

  {% else %}
--- 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
    </h1>

-    <form autocomplete="off" method="post">
+    {% call form_wrapper() %}

      {{ textbox(form.name, hint="You can change this later") }}

@@ -24,7 +25,7 @@

      {{ page_footer('Add service') }}

-    </form>
+    {% endcall %}

  </div>
 </div>
--- 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 <a href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information.
      </p>

-      <form method="post">
+      {% 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'
-      ) }}
-      </form>
+        ) }}
+      {% endcall %}
    </div>
  </div>

--- 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 <a href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information.
      </p>

-      <form method="post">
+      {% 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'
-      ) }}
-      </form>
+        ) }}
+      {% endcall %}
    </div>
  </div>

--- 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
  </h1>

-  <form method="post">
+  {% 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') }}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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.
  </p>

-  <form method="post" autocomplete="off" novalidate>
+  {% call form_wrapper() %}

    <div class="grid-row">
      <div class="column-two-thirds">
@@ -68,6 +69,6 @@
      secondary_link_text='Back to API integration'
    ) }}

-  </form>
+  {% endcall %}

 {% endblock %}
--- 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
    </h1>

-    <form method="post">
+    {% call form_wrapper() %}
      <div class="grid-row">
        <div class="column-five-sixths">
          {{ textbox(form.name, width='1-1', hint='Your recipients won’t see this', rows=10) }}
@@ -36,6 +37,6 @@
          {% endif %}
        </aside>
      </div>
-    </form>
+    {% endcall %}

 {% endblock %}
--- 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
    </h1>

-    <form method="post">
+    {% call form_wrapper() %}
      <div class="grid-row">
        <div class="column-five-sixths">
          {{ 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" %}
        </aside>
      </div>
-    </form>
+    {% endcall %}

 {% endblock %}
--- 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
    </h1>

-    <form method="post">
+    {% call form_wrapper() %}
      <div class="grid-row">
        <div class="column-two-thirds">
          {{ textbox(form.name, width='1-1', hint='Your recipients won’t see this') }}
@@ -34,7 +35,7 @@
          {% include "partials/templates/guidance-character-count.html" %}
        </aside>
      </div>
-    </form>
+    {% endcall %}


 {% endblock %}
--- 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 @@
  </p>

  <div class="grid-row">
-    <form method="post" class="column-three-quarters">
+    {% call form_wrapper(class="column-three-quarters") %}

      {% include 'views/manage-users/permissions.html' %}

@@ -27,6 +28,6 @@
          delete_link_text='Remove user from service'
        ) }}

-    </form>
+    {% endcall %}
  </div>
 {% endblock %}
--- 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 @@
        </div>
      {% endif %}
      {{ file_upload(form.file, button_text='{} logo'.format('Update' if email_branding else 'Upload')) }}
-      <form method="post" novalidate>
+      {% call form_wrapper() %}
        <div class="form-group">
          <div style='margin-top:15px;'>{{textbox(form.name)}}</div>
          <div style='margin-top:15px;'>{{textbox(form.text)}}</div>
@@ -32,7 +33,7 @@
            back_link_text='Back to email branding selection',
          ) }}
        </div>
-      </form>
+      {% endcall %}
    </div>

 {% endblock %}
--- 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
  </h1>

-  <form
-    method="post"
-    action="{{ url_for('.find_users_by_email') }}"
-    class="grid-row"
-  >
+
+  {% call form_wrapper(
+      action=url_for('.find_users_by_email'),
+      class='grid-row'
+  ) %}
    <div class="column-three-quarters">
      {{ textbox(
        form.search,
@@ -27,11 +28,11 @@
      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
      <button type="submit" class="button">Search</button>
    </div>
-  </form>
+  {% endcall %}

-  <form id="search-form" method="post">
+  {% call form_wrapper(id='search-form' ) %}
    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-  </form>
+  {% endcall %}

  {% if users_found %}
  <nav class="browse-list">
--- a/app/templates/views/forgot-password.html
+++ b/app/templates/views/forgot-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
@@ -14,10 +15,10 @@ Create a new password

    <p>We’ll send you an email to create a new password.</p>

-    <form autocomplete="off" method="post" novalidate>
+    {% call form_wrapper() %}
      {{ textbox(form.email_address, safe_error_message=True) }}
      {{ page_footer("Send email") }}
-    </form>
+    {% endcall %}

  </div>
 </div>
--- 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 @@
  </h1>

  <div class="grid-row">
-    <form method="post" class="column-three-quarters" novalidate>
+    {% call form_wrapper() %}

      {{ textbox(form.email_address, width='1-1', safe_error_message=True) }}

@@ -22,6 +23,6 @@

      {{ page_footer('Send invitation email') }}

-    </form>
+    {% endcall %}
  </div>
 {% endblock %}
--- 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 @@

    <h1 class="heading-large">Letter jobs</h1>

-    <form autocomplete="off" method="post">
+    {% call form_wrapper() %}
      <p>
        <table>
          <thead>
@@ -46,6 +47,6 @@
        {% endif %}
      </p>
      {% endif %}
-    </form>
+    {% endcall %}

 {% endblock %}
--- 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 @@
      <p>
        You can now create a new password for your account.
      </p>
-      <form method="post" autocomplete="off">
+      {% call form_wrapper() %}
        {{ textbox(form.new_password, hint="At least 8 characters") }}
        {{ page_footer("Continue") }}
-      </form>
+      {% endcall %}
    {% else %}
      <p>
        Message about email address does not exist. Some one needs to figure out the words here.
--- 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'
    ) }}

-    <form
-      method="post"
-      action="{{ url_for('.view_notifications', service_id=current_service.id, message_type=message_type) }}"
+    {% call form_wrapper(
+      action=url_for('.view_notifications', service_id=current_service.id, message_type=message_type),
      class="grid-row"
-    >
+    ) %}
      <div class="column-three-quarters {% if message_type == 'sms' %}extra-tracking{% endif %}">
        {{ textbox(
          search_form.to,
@@ -42,16 +42,16 @@
        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
        <button type="submit" class="button">Search</button>
      </div>
-    </form>
+    {% endcall %}

-    <form id="search-form" method="post">
+    {% call form_wrapper(id="search-form") %}
      <input type="hidden" name="to" value="{{ search_form.to.data }}">
      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-    </form>
+    {% endcall %}
  {% else %}
-    <form id="search-form" method="post">
+    {% call form_wrapper(id="search-form") %}
      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
-    </form>
+    {% endcall %}
  {% endif %}

  {% if current_user.has_permissions('view_activity') %}
--- 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 %}

  <h1 class="heading-large">Create an organisation</h1>
-  <form method="post">
+  {% call form_wrapper() %}
    {{textbox(form.name)}}
    {{ page_footer(
      'Save',
      back_link=url_for('.organisations'),
      back_link_text='Back to organisations',
    ) }}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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 @@
  <div class="grid-row">
    <div class="column-three-quarters">

-    <form autocomplete="off" method="post">
+    {% call form_wrapper() %}
      {{ textbox(form.password) }}
      <p> Your organisation name will be changed from {{ current_org.name }} to {{ new_name }} </p>
      {{ page_footer(
@@ -21,7 +22,7 @@
        destructive=destructive,
        back_link=url_for('.organisation_settings', org_id=current_org.id)
      ) }}
-    </form>
+    {% endcall %}
    </div>
  </div>

--- 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 %}

  <h1 class="heading-large">Change organisation name</h1>
-  <form method="post">
+  {% 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',
    ) }}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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
  </h1>
  <div class="grid-row">
-	  <form method="post" class="column-three-quarters" novalidate>
+    {% call form_wrapper(class="column-three-quarters") %}
 	    {{ textbox(form.email_address, width='1-1', safe_error_message=True) }}

 	    <div class="bottom-gutter">
@@ -27,7 +28,7 @@
 			</div>

 	    {{ page_footer('Send invitation email') }}
-	  </form>
+	  {% endcall %}
  </div>

 {% endblock %}
--- 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 @@
  <p>
    {{ user.email_address }}
  </p>
-  <form method="post" class="column-three-quarters">
+
+  {% 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'
      ) }}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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 @@
  </h1>
  <details {% if form.errors %}open{% endif %}>
    <summary>Apply filters</summary>
-    <form autocomplete="off" method="get">
+    {% 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") }}
      </br>
      <button type="submit" class="button">Filter</button>
-    </form>
+    {% endcall %}
  </details>

  <div class="grid-row bottom-gutter">
--- 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 @@
 <div class="grid-row">
  <div class="column-two-thirds">
    <h1 class="heading-large">Submit returned letters</h1>
-    <form method="post" novalidate>
+    {% call form_wrapper() %}
      {{ textbox(form.references, width='1-1', rows=8) }}
      {{ page_footer("Submit") }}
-    </form>
+    {% endcall %}
  </div>
 </div>

--- 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 @@

    <details>
      <summary>Apply filters</summary>
-      <form autocomplete="off" method="get">
+      {% 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) }}
        </br>
        <button type="submit" class="button">Filter</button>
-      </form>
+      {% endcall %}
    </details>

  {% include "views/platform-admin/_global_stats.html" %}
--- 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}}
            <li>We only send from the highest priority provider</li>
        </ul>

-        <form method="post">
+        {% call form_wrapper() %}
            {{ textbox(form.priority) }}
            {{ page_footer('Save', back_link=url_for('.view_providers'), back_link_text="Back to providers") }}
-        </form>
+        {% endcall %}

    </div>

--- 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:
      <span class="nowrap">{{invited_user.email_address}}</span>
    </p>
-    <form method="post" autocomplete="off">
+    {% call form_wrapper() %}
      {{ textbox(form.name, width='3-4') }}
      {% if invited_user.auth_type == 'sms_auth' %}
        <div class="extra-tracking">
@@ -27,7 +28,7 @@ Create an account
      {{form.service}}
      {{form.email_address}}
      {{form.auth_type}}
-    </form>
+    {% endcall %}
  </div>
 </div>

--- 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
  <div class="column-two-thirds">
    <h1 class="heading-large">Create an account</h1>
    <p>Your account will be created with this email: {{invited_org_user.email_address}}</p>
-    <form method="post" autocomplete="off">
+    {% call form_wrapper() %}
      {{ textbox(form.name, width='3-4') }}
      <div class="extra-tracking">
        {{ 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}}
-    </form>
+    {% endcall %}
  </div>
 </div>

--- 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
 <div class="grid-row">
  <div class="column-two-thirds">
    <h1 class="heading-large">Create an account</h1>
-    <form method="post" novalidate>
+    {% 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) }}
      <div class="extra-tracking">
@@ -21,7 +22,7 @@ Create an account
      {{ textbox(form.password, hint="At least 8 characters", width='3-4') }}
      {{form.auth_type}}
      {{ page_footer("Continue") }}
-    </form>
+    {% endcall %}
  </div>
 </div>

--- 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 }}
  </h1>

-  <form method="post" class="js-stick-at-top-when-scrolling" data-module="autofocus" autocomplete="off" novalidate>
+  {% call form_wrapper(class="js-stick-at-top-when-scrolling", module="autofocus") %}
    <div class="grid-row">
      <div class="column-two-thirds {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
        {{ textbox(
@@ -36,7 +37,7 @@
      </p>
    {% endif %}
    {{ page_footer('Continue', back_link=back_link) }}
-  </form>
+  {% endcall %}

  {{ template|string }}

--- 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 @@

  <h1 class="heading-large">Email branding</h1>

-  <form method="post">
+  {% call form_wrapper() %}
    <fieldset class="form-group {% if form.options.errors %}form-group-error{% endif %} top-gutter">
      <legend class="bottom-gutter-2-3">
        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)
    ) }}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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 @@
  <div class="grid-row">
    <div class="column-three-quarters">

-    <form autocomplete="off" method="post">
+    {% call form_wrapper() %}
      {{ textbox(form.password) }}
      {{ page_footer(
        'Confirm',
        destructive=destructive,
        back_link=url_for('.service_settings', service_id=current_service.id)
      ) }}
-    </form>
+    {% endcall %}
    </div>
  </div>

--- 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).
      </p>
-      <form method="post" novalidate>
+      {% 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'
        ) }}
-      </form>
+      {% endcall %}
    </div>
  </div>
 {% endblock %}
--- 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 @@


  <h1 class="heading-large">Set data retention</h1>
-    <form method="post">
+    {% 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'
    ) }}
-    </form>
+    {% endcall %}

-{% endblock %}
+{% endblock %}
--- 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 @@


  <h1 class="heading-large">Set data retention</h1>
-    <form method="post">
+    {% 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'
    ) }}
-    </form>
+    {% endcall %}

-{% endblock %}
+{% endblock %}
--- 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 @@
        </li>
      </ul>

-      <form method="post">
+      {% call form_wrapper() %}
        {{ page_footer(
          'Yes, delete ‘{}’'.format(current_service.name),
          destructive=True,
          back_link=url_for('.service_settings', service_id=current_service.id)
        ) }}
-      </form>
+      {% endcall %}

    </div>
  </div>
--- 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 @@
  <h1 class="heading-large">
    Add email reply-to address
  </h1>
-  <form method="post" novalidate>
+  {% 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'
    ) }}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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
    </h1>
  {% endif %}
-  <form method="post">
+  {% call form_wrapper() %}
    {{ textbox(
      form.email_address,
      width='2-3',
@@ -51,6 +52,6 @@
        delete_link_text='Delete'
      ) }}
    {% endif %}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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
  </h1>
  <div class="grid-row">
-    <form method="post" class="column-half" novalidate>
+    {% 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'
      ) }}
-    </form>
+    {% endcall %}
  </div>

 {% endblock %}
--- 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
  </h1>
  <div class="grid-row">
-    <form method="post" class="column-half">
+    {% 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'
      ) }}
-    </form>
+    {% endcall %}
  </div>

 {% endblock %}
--- 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 @@
      <h1 class="heading-large">
        Link service to organisation
      </h1>
-      <form method="post">
+      {% 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'
        ) }}
-      </form>
+      {% endcall %}
    </div>
  </div>
 {% endblock %}
--- 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 %}
  </div>

-  <form method="post">
+  {% 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'
    ) }}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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 @@
  <div class="grid-row">
    <div class="column-full">
      <iframe src="{{ url_for('main.email_template', branding_style=form.branding_style.data) }}" class="email-branding-preview"></iframe>
-      <form method="post" action="{{ action }}">
+      {% call form_wrapper(action=action) %}
        <div class="form-group">
          {{ form.hidden_tag() }}
          <div class="page-footer">
@@ -18,7 +18,7 @@
            <a class="page-footer-back-link" href="{{ url_for('main.service_settings', service_id=service_id) }}">Back to service settings</a>
          </div>
        </div>
-      </form>
+      {% endcall %}
    </div>
  </div>
 {% endblock %}
--- 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 %}

  <h1 class="heading-large">Set email branding</h1>
-  <form method="post" novalidate autocomplete="off">
+  {% call form_wrapper() %}
    <div class="grid-row">
      <div class="column-full preview-pane">
      </div>
@@ -30,6 +31,6 @@
        ) }}
      </div>
    </div>
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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 %}

-  <form method="post">
+  {% call form_wrapper() %}
    <h1 class="heading-large">Free text message allowance</h1>
    {{ 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'
    ) }}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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 %}
-    <form method="post">
+    {% 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'
-	 	) }}
-	</form>
+  	 	) }}
+  	{% endcall %}
 	{% endif %}

-{% endblock %}
+{% endblock %}
--- 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 <a href="{{ url_for(".pricing") }}">pricing</a> for the list
        of rates.
      </p>
-      <form method="post">
+      {% 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'
        ) }}
-      </form>
+      {% endcall %}
    </div>
  </div>

--- 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 @@
  <h1 class="heading-large">Set letter branding</h1>
  <div class="grid-row">
    <div class="column-three-quarters">
-      <form method="post">
+      {% 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'
        ) }}
-      </form>
+      {% endcall %}
    </div>
  </div>

--- 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
  </h1>
  <div class="grid-row">
-    <form method="post" class="column-half">
+    {% call form_wrapper(class="column-half") %}
      {{ textbox(
        form.letter_contact_block,
        label='How should users contact your service?<br>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'
      ) }}
-    </form>
+    {% endcall %}
  </div>

 {% endblock %}
--- 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 <a href="{{ url_for(".pricing", _anchor="letters") }}">pricing</a> for the list
        of rates.
      </p>
-      <form method="post">
+      {% 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'
        ) }}
-      </form>
+      {% endcall %}
    </div>
  </div>

--- 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 %}

  <h1 class="heading-large">Set organisation type</h1>
-    <form method="post">
+    {% 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'
      ) }}
-    </form>
+    {% endcall %}
  </div>

 {% endblock %}
--- 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.
    </p>
  {% endif %}
-  <form method="post">
+  {% 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'
-  ) }}
-  </form>
+    ) }}
+  {% endcall %}

 {% endblock %}
--- 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 %}

  <h1 class="heading-large">Text messages start with service name</h1>
-  <form method="post">
+  {% 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'
    ) }}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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 %}

  <h1 class="heading-large">Add text message sender</h1>
-  <form method="post">
+  {% 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'
-  ) }}
-  </form>
+    ) }}
+  {% endcall %}

-{% endblock %}
+{% endblock %}
--- 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
    </h1>
  {% endif %}
-  <form method="post">
+  {% call form_wrapper() %}
    {% if inbound_number %}
      <p>
        <span class="bottom-gutter-1-3"> {{ sms_sender.sms_sender }} </span>
@@ -66,6 +67,6 @@
        ) }}
      {% endif %}
    {% endif %}
-  </form>
+  {% endcall %}

 {% endblock %}
--- 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 @@

      <h1 class="heading-large">Request to go live</h1>

-      <form method="post">
+      {% call form_wrapper() %}
        <div class="form-group">
          {{ 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 <a href="{{ url_for('.terms') }}">terms of use</a>.
        </p>
        {{ page_footer('Request to go live') }}
-      </form>
+      {% endcall %}

 {% endblock %}
--- 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 @@
      </p>
    {% endif %}

-    <form method="post" novalidate>
+    {% 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?") }}
-    </form>
+    {% endcall %}
  </div>
 </div>

--- 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 @@
    </h1>
    <div class="grid-row">
      <div class="column-two-thirds">
-        <form method="post" autocomplete="off" novalidate>
+        {% call form_wrapper() %}
            {{ textbox(form.feedback, width='1-1', hint='', rows=10) }}
            {% if not current_user.is_authenticated %}
              <h3 class="heading-medium">Do you want a reply?</h3>
@@ -28,7 +29,7 @@
              secondary_link=url_for('.support'),
              secondary_link_text='Back to support',
            ) }}
-        </form>
+        {% endcall %}
      </div>
    </div>

--- 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 @@

    <h1 class="heading-large">Support</h1>

-    <form method="post" class="bottom-gutter-2">
+    {% call form_wrapper(class="bottom-gutter-2") %}
      {{ radios(form.support_type) }}
      {{ page_footer('Continue') }}
-    </form>
+    {% endcall %}
+
    <p>If something’s wrong, you can <a href="https://status.notifications.service.gov.uk/"> check the GOV.UK Notify system status page</a> to see if we’re already aware of it.</p>

    <h2 class="heading-medium">24-hour support</h2>
--- 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.
          </p>
        </div>
-        <form method="post" autocomplete="off" novalidate>
+        {% 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',
            ) }}
-        </form>
+        {% endcall %}
      </div>
    </div>

--- 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 @@
      <h1 class="heading-large">
        Report a problem
      </h1>
-      <form method="post">
+      {% call form_wrapper() %}
        {{ radios(form.severe) }}
        {{ page_footer('Continue') }}
-      </form>
+      {% endcall %}
      <h2 class="heading-small">
        It’s only an emergency if:
      </h2>
--- 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 @@

    <h1 class="heading-large">Add new template</h1>

-    <form method="post">
+    {% call form_wrapper() %}
      {{ radios(form.template_type) }}
      {{ page_footer(
        'Continue'
      ) }}
-    </form>
+    {% endcall %}

 {% endblock %}
--- 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 %}
  </div>

-  <form method="post">
+  {% call form_wrapper() %}
    <input type="hidden" name="name" value="{{ new_template.name }}" />
    <input type="hidden" name="subject" value="{{ new_template._subject or '' }}" />
    <input type="hidden" name="template_content" value="{{ new_template.content }}" />
@@ -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"
    ) }}
-  </form>
+  {% endcall %}

  <p>
    When you send messages using this template you’ll need
--- 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 @@
  <h1 class="heading-large">{{sender_context['title']}}</h1>
  <div class="grid-row">
    <div class="column-three-quarters">
-      <form method="post">
+      {% 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'
        ) }}
-      </form>
+      {% endcall %}
    </div>
  </div>

--- 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 @@
  <h1 class="heading-large">Set letter contact block</h1>
  <div class="grid-row">
    <div class="column-three-quarters">
-      <form method="post">
+      {% call form_wrapper() %}
        {{ radios(
          form.sender,
          option_hints=option_hints,
@@ -25,7 +26,7 @@
        {% if no_senders %}
          <a href="{{ url_for('.service_add_letter_contact', service_id=current_service.id, from_template=template_id) }}">Add new sender</a>
        {% endif %}
-      </form>
+      {% endcall %}
    </div>
  </div>

--- 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

    <p>Check your mobile phone number is correct and then resend the security code.</p>

-      <form autocomplete="off" method="post">
+      {% call form_wrapper() %}
        {{ textbox(form.mobile_number) }}
        {{ page_footer("Resend security code") }}
-      </form>
+      {% endcall %}
  </div>
 </div>

--- 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 @@

    <p>We’ve sent you a text message with a security code.</p>

-    <form autocomplete="off" method="post" class="extra-tracking" novalidate>
+    {% 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?'
      ) }}
-    </form>
+    {% endcall %}
  </div>
 </div>

--- 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 @@
  <div class="grid-row">
    <div class="column-three-quarters">

-    <form method="post">
+    {% call form_wrapper(autocomplete=True) %}
      {{ textbox(form.password) }}
      {{ page_footer(
        'Confirm',
        back_link=back_link
      ) }}
-    </form>
+    {% endcall %}
    </div>
  </div>

--- 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 @@

  <div class="grid-row">
    <div class="column-three-quarters">
-      <form method="post">
+      {% 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"
        ) }}
-      </form>
+      {% endcall %}
    </div>
  </div>

--- 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 @@
      </p>
    {% endif %}
    <div class="column-three-quarters">
-      <form method="post" autocomplete="off" novalidate>
+      {% 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"
        ) }}
-      </form>
+      {% endcall %}
    </div>
  </div>

--- 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 @@
      <p>
        We’ve sent a security code to your new {{ thing }}.
      </p>
-      <form method="post" autocomplete="off" novalidate>
+      {% call form_wrapper() %}
        {{ textbox(
          form_field,
          width='5em',
@@ -26,7 +27,7 @@
          destructive=destructive,
          back_link=url_for('.user_profile')
        ) }}
-      </form>
+      {% endcall %}
    </div>
  </div>