darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-26 01:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into more_wording_changes

Browse Source 
Conflicts:
	app/templates/views/verify-mobile.html
This commit is contained in:
Martyn Inglis
2016-08-22 12:54:10 +01:00
parent 380a6526c4 351b91fe2e
commit 5666719a92
11 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/register-from-invite.html
View File

@@ -14,7 +14,7 @@ Create an account – GOV.UK Notify
<p>Your account will be created with this email: {{email_address}}</p>
<form method="post" autocomplete="nope">
{{ textbox(form.name, width='3-4') }}
{{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a verification code by text message') }}
{{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a security code by text message') }}
{{ textbox(form.password, hint="Your password must have at least 10 characters", width='3-4') }}
{{ page_footer("Continue") }}
{{form.service}}

2
app/templates/views/register.html
View File

@@ -14,7 +14,7 @@ Create an account – GOV.UK Notify
<form method="post" autocomplete="nope">
{{ textbox(form.name, width='3-4') }}
{{ textbox(form.email_address, hint="Must be from a central government organisation", width='3-4', safe_error_message=True) }}
{{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a verification code by text message') }}
{{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a security code by text message') }}
{{ textbox(form.password, hint="At least 10 characters", width='3-4') }}
{{ page_footer("Continue") }}
</form>

2
app/templates/views/registration-continue.html
View File

@@ -6,7 +6,7 @@
{% block maincolumn_content %}
<h1 class="heading-large">​Now check your email​</h1>
<h1 class="heading-large">Check your email​</h1>
<p>We’ve sent an email to {{ session['user_details']['email'] }}.</p>
<p>Click the link in the email to continue your registration.</p>

4
app/templates/views/service-settings/request-to-go-live.html
View File

@@ -30,7 +30,7 @@
{{ textbox(
form.usage,
label='Estimate how many emails and/or text messages you’ll send each month',
label='Estimate how many emails and text messages you’ll send each month',
hint='If your estimate is likely to change, tell us how ',
width='1-1',
rows=5
@@ -57,7 +57,7 @@
</li>
</ul>
{{ page_footer('Request to go live') }}
{{ page_footer('Request to go live') }}
</form>
</div>

2
app/templates/views/two-factor.html
View File

@@ -13,7 +13,7 @@
<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>
<p>We’ve sent you a text message with a security code.</p>
<form autocomplete="off" method="post">
{{ textbox(

4
app/templates/views/verification-not-received.html
View File

@@ -8,7 +8,7 @@
<div class="grid-row">
<div class="column-two-thirds">
<h1 class="heading-large">Resend verification code</h1>
<h1 class="heading-large">Resend security code</h1>
<p>Text messages sometimes take a few minutes to arrive. If you do not receive the text message, you can resend it.</p>
@@ -16,7 +16,7 @@
<p>
<a class="button" href="{{url_for('main.check_and_resend_verification_code')}}" role="button">Resend verification code</a>
<a class="button" href="{{url_for('main.check_and_resend_verification_code')}}" role="button">Resend security code</a>
</p>
</div>
</div>

2
app/templates/views/verify-mobile.html
View File

@@ -10,7 +10,7 @@ Confirm your mobile number – GOV.UK Notify
<div class="column-two-thirds">
<h1 class="heading-large">Confirm your mobile number</h1>
<p>We've sent you a security code by text message.</p>
<p>We’ve sent you a security code by text message.</p>
<p>
<label class="form-label" for="email">Enter security code<br>