app/templates/views/two-factor.html

{% extends "withoutnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/checkbox.html" import checkbox %}
{% from "components/page-footer.html" import page_footer %}

{% block page_title %}
  Text verification – GOV.UK Notify
{% endblock %}

{% block maincolumn_content %}

<div class="grid-row">
  <div class="column-two-thirds">
    <h1 class="heading-large">Check your phone</h1>

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

    <form autocomplete="off" method="post">
      {{ textbox(
        form.sms_code,
        width='5em',
        autofocus=True
      ) }}
      {{ page_footer(
        "Continue",
        secondary_link=url_for('main.check_and_resend_text_code'),
        secondary_link_text='Not received a text message?'
      ) }}
    </form>
  </div>
</div>

{% endblock %}
-												Make spacing and position of banners consistent

Banners should always be the first thing on the page.

Because headers already have padding we don’t want to put padding on the
container.

So banners should also have top padding to distance then from the red bar.

They should also sit in the 3/4 column if the page has side navigation. This
commit adds a new template (`withoutnav_template.html`) which extends
`admin_template.html`. All views then extend one or the other, never the
`admin_template.html` directly. This means that `admin_template.html` doesn’t
have to make decisions about where the flash messages are displayed.

											
										
										
											2016-02-01 12:15:38 +00:00
+								{% extends "withoutnav_template.html" %}
-												Add a WTForms-compatible textbox macro

This macro:
- accepts a WTForm form field as a parameter
- renders a form field which follows the GOV.UK Elements patterns, both visually
  and in markup terms

It then changes any page which uses either:
- the old, non-WTForms macro or
- the old, WTFforms `render_field` macro

…to use this new macro and removes both of the old ones.

It also adds the option to display hint text above the textbox.

											
										
										
											2016-01-11 13:15:10 +00:00
+								{% from "components/textbox.html" import textbox %}
-												Remember me functionality added and tested.

Merge extra.

Fixed comment.

											
										
										
											2016-02-23 15:45:19 +00:00
+								{% from "components/checkbox.html" import checkbox %}
-												Rename `submit_form` component to `page_footer`

Submit form was
- a confusing name in itself
- not descriptive, because it also has an optional ‘back’ link

This commit also puts this component in as many pages as possible, stripping
out any hard-coded buttons and links.

It replaces any usage of buttons for ‘back’, because these are links, not
buttons (ie they don’t change any data).

											
										
										
											2016-01-07 20:11:22 +00:00
+								{% from "components/page-footer.html" import page_footer %}
-												Create base forms for registration and sign in

Created routes and forms for registration, sign in, and registration
from an invite.
Also tidied up assets folder, removed copy of fronted toolkit.

											
										
										
											2015-11-25 16:21:28 +00:00
 								{% block page_title %}
-												Make page titles consistent

This commit modifies the HTML `<title>` tags for all the pages. It makes two
main changes:
- make the title tag match the `<h1>` of the page, for better or worse
- put the service name after the page title, seperated by an en dash, as per
  GOV.UK

											
										
										
											2016-02-08 09:23:51 +00:00
+								  Text verification – GOV.UK Notify
-												Create base forms for registration and sign in

Created routes and forms for registration, sign in, and registration
from an invite.
Also tidied up assets folder, removed copy of fronted toolkit.

											
										
										
											2015-11-25 16:21:28 +00:00
+								{% endblock %}
-												Make spacing and position of banners consistent

Banners should always be the first thing on the page.

Because headers already have padding we don’t want to put padding on the
container.

So banners should also have top padding to distance then from the red bar.

They should also sit in the 3/4 column if the page has side navigation. This
commit adds a new template (`withoutnav_template.html`) which extends
`admin_template.html`. All views then extend one or the other, never the
`admin_template.html` directly. This means that `admin_template.html` doesn’t
have to make decisions about where the flash messages are displayed.

											
										
										
											2016-02-01 12:15:38 +00:00
+								{% block maincolumn_content %}
-												Create base forms for registration and sign in

Created routes and forms for registration, sign in, and registration
from an invite.
Also tidied up assets folder, removed copy of fronted toolkit.

											
										
										
											2015-11-25 16:21:28 +00:00
 								<div class="grid-row">
-												Replace tabs with two spaces for consistency

											
										
										
											2016-02-01 16:57:29 +00:00
+								  <div class="column-two-thirds">
-												Reword 2FA page to match email confirmation

											
										
										
											2016-04-23 16:11:41 +01:00
+								    <h1 class="heading-large">Check your phone</h1>
-												Create base forms for registration and sign in

Created routes and forms for registration, sign in, and registration
from an invite.
Also tidied up assets folder, removed copy of fronted toolkit.

											
										
										
											2015-11-25 16:21:28 +00:00
-												Reword 2FA page to match email confirmation

											
										
										
											2016-04-23 16:11:41 +01:00
+								    <p>We’ve sent you a text message with a verification code.</p>
-												Create base forms for registration and sign in

Created routes and forms for registration, sign in, and registration
from an invite.
Also tidied up assets folder, removed copy of fronted toolkit.

											
										
										
											2015-11-25 16:21:28 +00:00
-												Replace tabs with two spaces for consistency

											
										
										
											2016-02-01 16:57:29 +00:00
+								    <form autocomplete="off" method="post">
-												Make two factor textbox consistent with verify textboxes

- make the field the same width (5em to match length of code)
- move ‘haven’t received…’ link underneath the textbox instead of underneath
  the button

											
										
										
											2016-02-02 16:03:30 +00:00
+								      {{ textbox(
 								        form.sms_code,
 								        width='5em',
-												Reword 2FA page to match email confirmation

											
										
										
											2016-04-23 16:11:41 +01:00
+								        autofocus=True
-												Make two factor textbox consistent with verify textboxes

- make the field the same width (5em to match length of code)
- move ‘haven’t received…’ link underneath the textbox instead of underneath
  the button

											
										
										
											2016-02-02 16:03:30 +00:00
+								      ) }}
-												Replace tabs with two spaces for consistency

											
										
										
											2016-02-01 16:57:29 +00:00
+								      {{ page_footer(
-												Reword 2FA page to match email confirmation

											
										
										
											2016-04-23 16:11:41 +01:00
+								        "Continue",
-												Requesting a resend of verify code for a user that has not completed
registration will allow user to check and modify mobile number.

Registered (active) users will only be able to request resend to their
existing registered number.

											
										
										
											2016-06-13 16:06:13 +01:00
+								        secondary_link=url_for('main.check_and_resend_text_code'),
-												Reword 2FA page to match email confirmation

											
										
										
											2016-04-23 16:11:41 +01:00
+								        secondary_link_text='Not received a text message?'
-												Replace tabs with two spaces for consistency

											
										
										
											2016-02-01 16:57:29 +00:00
+								      ) }}
 								    </form>
 								  </div>
-												Create base forms for registration and sign in

Created routes and forms for registration, sign in, and registration
from an invite.
Also tidied up assets folder, removed copy of fronted toolkit.

											
										
										
											2015-11-25 16:21:28 +00:00
+								</div>
-												Updated html title [ci skip]
											
										
										
											2015-12-01 09:55:37 +00:00
+								{% endblock %}