Merge pull request #3307 from alphagov/send-by-email-setting

Users now able to set the send by email setting by themselves

app/templates/views/guidance/send-files-by-email.html

@@ -8,8 +8,8 @@
 
   <h1 class="heading-large">Send files by email</h1>
 
-  <p><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">Contact us</a> if you want to send files by email.</p>
+  <p>To send a file by email, follow the instructions in our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">API documentation</a>.</p>
 
-  <p>Then follow the instructions to send a file by email in our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">API documentation</a>.</p>
+  <p>This is an API-only feature.</p>
 
 {% endblock %}

app/templates/views/service-settings.html

@@ -45,19 +45,6 @@
             )
           }}
         {% endcall %}
-
-        {% call settings_row(if_has_permission='upload_document') %}
-          {{ text_field('Contact details') }}
-          {{ text_field(current_service.contact_link, truncate=true) }}
-          {{ edit_field(
-              'Change',
-              url_for('.service_set_contact_link',
-              service_id=current_service.id),
-              permissions=['manage_service']
-            )
-          }}
-        {% endcall %}
-
       {% endcall %}
 
       {% call mapping_table(
@@ -110,6 +97,16 @@
           )}}
         {% endcall %}
 
+        {% call settings_row(if_has_permission='email') %}
+          {{ text_field('Send files by email') }}
+          {{ text_field(current_service.contact_link if current_service.contact_link else "Not set up", truncate=true) }}
+          {{ edit_field(
+            'Manage',
+            url_for('.send_files_by_email_contact_details', service_id=current_service.id),
+            permissions=['manage_service'],
+          )}}
+        {% endcall %}
+
       {% endcall %}
 
       {% call mapping_table(

app/templates/views/service-settings/send-files-by-email.html

@@ -7,20 +7,25 @@
 {% from "components/form.html" import form_wrapper %}
 
 {% block service_page_title %}
-  {{ 'Change' if 'upload_document' in current_service.permissions else 'Add' }} contact details for ‘Download your document’ page
+  Send files by email
 {% endblock %}
 
 {% block maincolumn_content %}
   <div class="grid-row">
     <div class="column-five-sixths">
       {{ page_header(
-        '{} contact details for ‘Download your document’ page'.format('Change' if 'upload_document' in current_service.permissions else 'Add'),
+        'Send files by email',
         back_link=url_for('main.service_settings', service_id=current_service.id)
       ) }}
       <p>
-        When you send users a document to download, you need to include the contact details for your service
-        on the download page. This is so users can contact you if there’s a problem (for example,
-        if the link to download the document has expired).
+        This is an API-only feature.
+        </p>
+        <p>
+        To send a file by email, follow the instructions in our <a href={{ url_for('main.documentation') }}>API documentation</a>.
+      </p>
+      <h2 class="heading-medium">{% if contact_details %}Change contact details for{% else %}Add contact details to{% endif %} the file download page</h2>
+      <p>
+        You need to include contact details for your service so your users can get in touch if there’s a problem. For example, if the link to download the file you sent them has expired.
       </p>
       {% call form_wrapper() %}