Merge branch 'master' into download_link-activity-page

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

@@ -24,10 +24,10 @@
           <a href="{{ url_for('main.service_settings', service_id=current_service.id) }}">settings</a> page</li>
         <li>
           added the templates you want to start with, making sure they follow our
-          <a href="https://designpatterns.hackpad.com/Notifications-5vuitmNqIjZ" rel="external">design patterns</a>,
-          <a href="https://www.gov.uk/topic/government-digital-guidance/content-publishing" rel="external">style guide</a>
+          <a href="https://www.gov.uk/service-manual/design/using-adapting-and-creating-patterns" rel="external">design patterns</a>,
+          <a href="https://www.gov.uk/guidance/style-guide" rel="external">style guide</a>
           and
-          <a href="https://docs.google.com/document/d/15-OjaEqDBy31uDU7nLZCpYIQOnzSCJR63-cp3cQI9G8" rel="external">information security guidelines</a>
+          <a href="https://www.gov.uk/service-manual/technology/securing-your-information" rel="external">information security guidelines</a>
           </li>
       </ul>
 

app/templates/views/signedout.html

@@ -120,12 +120,12 @@
       <div class="grid-row bottom-gutter">
         <div class="column-half">
           <h3 class="visually-hidden">Services</h3>
-          <div class="product-page-big-number">128</div>
+          <div class="product-page-big-number">131</div>
           services
         </div>
         <div class="column-half">
           <h3 class="visually-hidden">Organisations</h3>
-          <div class="product-page-big-number">53</div>
+          <div class="product-page-big-number">55</div>
           organisations
         </div>
       </div>

app/templates/views/templates/_template.html

@@ -35,11 +35,7 @@
 <div class="column-whole template-container">
   {% if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) and template.template_type == 'letter' %}
     <a href="{{ url_for(".edit_service_template", service_id=current_service.id, template_id=template.id) }}" class="edit-template-link-letter-body">Edit</a>
-    {% if default_letter_contact_block_id %}
-      <a href="{{ url_for(".service_edit_letter_contact", service_id=current_service.id, letter_contact_id=default_letter_contact_block_id, from_template=template.id) }}" class="edit-template-link-letter-contact">Edit</a>
-    {% else %}
-      <a href="{{ url_for(".service_add_letter_contact", service_id=current_service.id, from_template=template.id) }}" class="edit-template-link-letter-contact">Edit</a>
-    {% endif %}
+    <a href="{{ url_for(".set_template_sender", service_id=current_service.id, template_id=template.id) }}" class="edit-template-link-letter-contact">Edit</a>
   {% endif %}
   {{ template|string }}
 </div>

app/templates/views/templates/set-template-sender.html

@@ -0,0 +1,32 @@
+{% extends "withnav_template.html" %}
+{% from "components/radios.html" import radios, branding_radios %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block service_page_title %}
+  Set letter contact block
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  <h1 class="heading-large">Set letter contact block</h1>
+  <div class="grid-row">
+    <div class="column-three-quarters">
+      <form method="post">
+        {{ radios(
+          form.sender,
+          option_hints=option_hints,
+          hide_legend=True
+        ) }}
+        {{ page_footer(
+          'Continue',
+          back_link=url_for('.view_template', service_id=current_service.id, template_id=template_id),
+          back_link_text='Back to template'
+        ) }}
+        {% if no_senders %}
+          <a href="{{ url_for('.service_add_letter_contact', service_id=current_service.id, from_template=template_id) }}">Add new sender</a>
+        {% endif %}
+      </form>
+    </div>
+  </div>
+
+{% endblock %}

app/templates/views/terms-of-use.html

@@ -39,7 +39,7 @@ Terms of use
       <li>get the right levels of consent (to send messages and to use data)</li>
       <li>not send unsolicited messages, only ones related to a transaction or something the user has subscribed to be updated about (<a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">check the Service Manual</a> if you’re not sure)</li>
       <li>
-        send messages that meet the GOV.UK <a href="https://designpatterns.hackpad.com/Notifications-5vuitmNqIjZ">design patterns</a>, <a href="https://www.gov.uk/topic/government-digital-guidance/content-publishing">style guide</a> and <a href="https://www.notifications.service.gov.uk/information-security">information security guidelines</a></li>
+        send messages that meet the GOV.UK <a href="https://www.gov.uk/service-manual/design/using-adapting-and-creating-patterns">design patterns</a>, <a href="https://www.gov.uk/guidance/style-guide">style guide</a> and <a href="https://www.gov.uk/service-manual/technology/securing-your-information">information security guidelines</a></li>
       <li>not send messages containing any personally or commercially sensitive information</li>
       <li>check that the data you add to Notify is accurate and complies with Data Protection Act principles</li>
     </ul>

app/templates/views/using-notify.html

@@ -16,10 +16,10 @@
     <h1 class="heading-large">Using Notify</h1>
 
     <h2 class="heading-medium">Writing and sending text messages, emails and letters</h2>
-    <p>Check the Service Manual for guidance on how to:</p>
+    <p><a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">Check the Service Manual</a> for guidance on how to:</p>
     <ul class="list list-bullet">
-      <li><a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">plan and write text messages and emails</a></li>
-      <li><a href=""><a href="https://www.gov.uk/service-manual/technology/how-to-email-your-users"></a>send emails in a way that protects users from spam and phishing</a></li>
+      <li>plan and write text messages and emails</li>
+      <li>send emails in a way that protects users from spam and phishing</li>
     </ul>
 
     <h2 id="trial-mode" class="heading-medium">Trial mode</h2>