Merge branch 'master' into provide_logout_link

This commit is contained in:
Nicholas Staples
2016-01-06 17:06:04 +00:00
23 changed files with 413 additions and 408 deletions

View File

@@ -1,3 +1,4 @@
{%- from "components/form-field.html" import render_field %}
{% extends "govuk_template.html" %}
{% block head %}

View File

@@ -11,17 +11,14 @@ GOV.UK Notify
<h1 class="heading-xlarge">Check your email address</h1>
<p>Check your email address is correct and then resend the confirmation code.</p>
<p>
</p>
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
<label class="form-label">Email address</label>
{{ form.email_address(class="form-control-2-3", autocomplete="off") }} <br>
{{ render_field(form.email_address, class='form-control-2-3') }}
<span class="font-xsmall">Your email address must end in .gov.uk</span>
<p>
<button class="button" href="verify" role="button">Resend confirmation code</button>
<button class="button" role="button">Resend confirmation code</button>
</p>
</form>
</div>

View File

@@ -10,28 +10,17 @@ GOV.UK Notify | Create an account
<div class="column-two-thirds">
<h1 class="heading-xlarge">Create an account</h1>
<p>If you've used GOV.UK Notify before, <a href="">sign in to your account</a>.</p>
<p>If you've used GOV.UK Notify before, <a href="{{ url_for('.sign_in') }}">sign in to your account</a>.</p>
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
<p>
<label class="form-label">Full name </label>
{{ form.name(class="form-control-2-3", autocomplete="off") }} <br>
</p>
<p>
<label class="form-label">Email address </label>
{{ form.email_address(class="form-control-2-3", autocomplete="off") }} <br>
{{ render_field(form.name, class='form-control-2-3') }}
{{ render_field(form.email_address, class='form-control-2-3') }}
<span class="font-xsmall">Your email address must end in .gov.uk</span>
</p>
<p>
<label class="form-label">Mobile phone number</label>
{{ form.mobile_number(class="form-control-1-4", autocomplete="off") }} <br>
</p>
<p>
<label class="form-label">Create a password </label>
{{ form.password(class="form-control-1-4", autocomplete="off") }} <br>
{{ render_field(form.mobile_number, class='form-control-2-3') }}
{{ render_field(form.password, class='form-control-2-3') }}
<span class="font-xsmall">Your password must have at least 10 characters</span></label>
</p>
<p>
<button class="button" role="button">Continue</button>
</p>

View File

@@ -14,20 +14,13 @@ Sign in
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
<p>
<label class="form-label">Email address</label>
{{ form.email_address(class="form-control-2-3", autocomplete="off") }} <br>
</p>
<p>
<label class="form-label">Password</label>
{{ form.password(class="form-control-1-4", autocomplete="off") }} <br>
</p>
{{ render_field(form.email_address, class='form-control-2-3') }}
{{ render_field(form.password, class='form-control-2-3') }}
<p>
<span class="font-xsmall"><a href="">Forgotten password?</a></span>
</p>
<p>
<button class="button" href="two-factor" role="button">Continue</button>
<button class="button" role="button">Continue</button>
</p>
</form>
</div>

View File

@@ -14,12 +14,9 @@ GOV.UK Notify
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
{{ render_field(form.mobile_number, class='form-control-2-3') }}
<p>
<label class="form-label">Mobile phone number</label>
{{ form.mobile_number(class="form-control-1-4", autocomplete="off") }} <br>
</p>
<p>
<button class="button" href="verify" role="button">Resend confirmation code</button>
<button class="button" role="button">Resend confirmation code</button>
</p>
</form>
</div>

View File

@@ -15,13 +15,10 @@ GOV.UK Notify | Text verification
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
{{ render_field(form.sms_code, class='form-control-1-4') }}
<span class="font-xsmall"><a href="{{ url_for('.verification_code_not_received') }}">I haven't received a text</a></span>
<p>
<label class="form-label">Enter verification code</label><br>
{{ form.sms_code(class="form-control-1-4", autocomplete="off") }} <br>
<span class="font-xsmall"><a href="verification-not-received">I haven't received a text</a></span>
</p>
<p>
<button class="button" href="dashboard" role="button">Continue</button>
<button class="button" role="button">Continue</button>
</p>
</form>
</div>

View File

@@ -15,7 +15,7 @@ GOV.UK Notify | Confirm mobile number
<p>
<label class="form-label" for="email">Enter confirmation code<br>
<input class="form-control-1-4" id="email" type="text"><br>
<span class="font-xsmall"><a href="text-not-received-2">I haven't received a text</a></span>
<span class="font-xsmall"><a href="{{ url_for('.text-not-received-2') }}">I haven't received a text</a></span>
</p>
<p>

View File

@@ -14,19 +14,12 @@ GOV.UK Notify | Confirm email address and mobile number
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
{{ render_field(form.email_code, class='form-control-1-4') }}
<span class="font-xsmall"><a href="{{ url_for('.check_and_resend_email_code')}}">I haven't received an email</a></span>
{{ render_field(form.sms_code, class='form-control-1-4') }}
<span class="font-xsmall"><a href="{{ url_for('.check_and_resend_text_code') }}">I haven't received a text</a></span>
<p>
<label class="form-label">Email confirmation code</label>
{{ form.email_code(class="form-control-1-4", autocomplete="off") }}<br>
<span class="font-xsmall"><a href="email-not-received">I haven't received an email</a></span>
</p>
<p>
<label class="form-label">Text message confirmation code</label>
{{ form.sms_code(class="form-control-1-4", autocomplete="off") }} <br>
<span class="font-xsmall"><a href="text-not-received">I haven't received a text</a></span>
</p>
<p>
<button class="button" href="add-service" role="button">Continue</button>
<button class="button" role="button">Continue</button>
</p>
</form>
</div>