Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-free-sms-history

app/templates/views/email-not-received.html

@@ -0,0 +1,24 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block per_page_title %}
+  Resend email link
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+  <div class="column-two-thirds">
+    <h1 class="heading-large">Resend email link</h1>
+
+    <p> Email messages sometimes take a few minutes to arrive. If you do not recieve the email, you can resend it.</p>
+    <p> If you no longer have access to the email address you registered for this service, speak to your service manager to reset the email.</p>
+
+    <p>
+  		<a class="button" href="{{url_for('main.resend_email_link')}}" role="button">Resend email link</a>
+  	</p>
+
+  </div>
+</div>
+
+{% endblock %}

app/templates/views/service-settings/set-sms-sender.html

@@ -1,32 +0,0 @@
-{% extends "withnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
-{% from "components/page-footer.html" import page_footer %}
-
-{% block service_page_title %}
-  Text message sender
-{% endblock %}
-
-{% block maincolumn_content %}
-
-  <h1 class="heading-large">Text message sender</h1>
-  <p>
-    This appears instead of a phone number when a user receives a
-    text message from your service.
-  <p>
-    If you set this to ‘GOVUK’ each message will begin with
-    ‘{{ current_service.name }}:’.
-  </p>
-  <form method="post">
-    {{ textbox(
-      form.sms_sender,
-      width='1-4',
-      hint='Up to 11 characters, letters, numbers and spaces only'
-    ) }}
-    {{ page_footer(
-      'Save',
-      back_link=url_for('.service_settings', service_id=current_service.id),
-      back_link_text='Back to settings'
-  ) }}
-  </form>
-
-{% endblock %}

app/templates/views/two-factor-email.html

@@ -0,0 +1,21 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block per_page_title %}
+  Email verification
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+  <div class="column-two-thirds">
+    <h1 class="heading-large">{{ title }}</h1>
+    <p> We’ve sent you an email with your login link</p>
+    {{ page_footer(
+      secondary_link=url_for('main.email_not_received'),
+      secondary_link_text='Not received an email?'
+    ) }}
+  </div>
+</div>
+
+{% endblock %}