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

Merge branch 'master' into use_new_template_stats_endpoint

Browse Source 
Conflicts:
	app/notify_client/template_statistics_api_client.py
This commit is contained in:
Martyn Inglis
2016-08-22 16:47:42 +01:00
parent 63fa77fde7 8a04770c8e
commit 9fbd410474
9 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -12,7 +12,7 @@ Check your mobile number – GOV.UK Notify
<div class="column-two-thirds">
<h1 class="heading-large">Check your mobile number</h1>
<p>Check your mobile phone number is correct and then resend the confirmation code.</p>
<p>Check your mobile phone number is correct and then resend the security code.</p>
<p>
<label class="form-label" for="mobile">Mobile phone number</label>
@@ -21,7 +21,7 @@ Check your mobile number – GOV.UK Notify
<p>
<a class="button" href="verify-mobile" role="button">Resend confirmation code</a>
<a class="button" href="verify-mobile" role="button">Resend security code</a>
</p>
</div>
</div>

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

@@ -12,11 +12,11 @@ Check your mobile number – GOV.UK Notify
<div class="column-two-thirds">
<h1 class="heading-large">Check your mobile number</h1>
<p>Check your mobile phone number is correct and then resend the confirmation code.</p>
<p>Check your mobile phone number is correct and then resend the security code.</p>
<form autocomplete="off" method="post">
{{ textbox(form.mobile_number) }}
{{ page_footer("Resend confirmation code") }}
{{ page_footer("Resend security code") }}
</form>
</div>
</div>

2
app/templates/views/user-profile/confirm.html
View File

@@ -13,7 +13,7 @@ GOV.UK Notify | Service settings
<div class="grid-row">
<div class="column-three-quarters">
<p>
We’ve sent a code to your new {{ thing }}.
We’ve sent a security code to your new {{ thing }}.
</p>
<form method="post">
{{ textbox(form_field) }}

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>