From 709882065fec18b52a8982eb4b629684db48c44d Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 23 Aug 2016 14:16:07 +0100
Subject: [PATCH] Add some explaining to the email reply to page

---
 app/main/forms.py                             |  2 +-
 app/templates/views/service-settings.html     |  4 ++--
 .../service-settings/set-reply-to-email.html  | 21 +++++++++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index 820d47c9c..e09f9cc23 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -327,7 +327,7 @@ class ProviderForm(Form):
 
 
 class ServiceReplyToEmailFrom(Form):
-    email_address = email_address()
+    email_address = email_address(label='Email reply to address')
 
 
 class ServiceSmsSender(Form):
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 55f0b9abc..b9ad9bff1 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -56,13 +56,13 @@
 
     </div>
 
-    {% if false and current_user.has_permissions([], admin_override=True) %}
+    {% if current_user.has_permissions([], admin_override=True) %}
 
       <h2 class="heading-medium">Platform admin settings</h2>
 
       {{ browse_list([
         {
-          'title': 'Set email branding',
+          'title': 'Email branding',
           'link': url_for('.service_set_branding_and_org', service_id=current_service.id)
         },
         {
diff --git a/app/templates/views/service-settings/set-reply-to-email.html b/app/templates/views/service-settings/set-reply-to-email.html
index fcd77c303..a7a40774b 100644
--- a/app/templates/views/service-settings/set-reply-to-email.html
+++ b/app/templates/views/service-settings/set-reply-to-email.html
@@ -3,14 +3,31 @@
 {% from "components/page-footer.html" import page_footer %}
 
 {% block page_title %}
-  Request to go live – GOV.UK Notify
+  Email reply to address – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}
 
   <div class="grid-row">
     <div class="column-three-quarters">
-      <h1 class="heading-large">Set email reply to address</h1>
+      <h1 class="heading-large">
+        Email reply to address
+      </h1>
+      <p>
+        Your emails will be sent from
+        {{ current_service.email_from }}@notifications.service.gov.uk.
+        This is so they have the best chance of being delivered.
+        This email address can’t receive replies.
+      </p>
+      <p>
+        Set up a separate email address to receive replies from
+        your users, then enter it here.
+      </p>
+      {% if current_service.restricted %}
+        <p>
+          Your service can’t go live until you’ve done this.
+        </p>
+      {% endif %}
       <form method="post">
         {{ textbox(
           form.email_address,