Merge branch 'master' into platform-admin

Conflicts:
	app/main/views/send.py

app/templates/admin_template.html

@@ -83,4 +83,12 @@
 
 {% block body_end %}
   <script type="text/javascript" src="{{ asset_url('javascripts/all.js') }}" /></script>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', 'UA-75215134-1', 'auto');
+    ga('send', 'pageview');
+  </script>
 {% endblock %}

app/templates/components/textbox.html

@@ -7,7 +7,8 @@
   help_link_text=None,
   width='2-3',
   suffix=None,
-  disabled=False
+  disabled=False,
+  safe_error_message=False
 ) %}
   <div class="form-group{% if field.errors %} error{% endif %}" {% if autofocus %}data-module="autofocus"{% endif %}>
     <label class="form-label" for="{{ field.name }}">
@@ -19,7 +20,7 @@
       {% endif %}
       {% if field.errors %}
         <span class="error-message">
-          {{ field.errors[0] }}
+          {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
         </span>
       {% endif %}
     </label>

app/templates/main_nav.html

@@ -7,7 +7,7 @@
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Send text messages</a></li>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Send emails</a></li>
   </ul>
-  {% elif current_user.has_permissions(['manage_templates']) %}
+  {% elif current_user.has_permissions(['manage_templates','manage_api_keys'], or_=True) %}
   <ul>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Text message templates</a></li>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Email templates</a></li>

app/templates/views/forgot-password.html

@@ -15,7 +15,7 @@ Create a new password – GOV.UK Notify
     <p>If you have forgotten your password, we can send you an email to create a new password.</p>
 
     <form autocomplete="off" method="post">
-      {{ textbox(form.email_address) }}
+      {{ textbox(form.email_address, safe_error_message=True) }}
       {{ page_footer("Send email") }}
     </form>
 

app/templates/views/help.html

@@ -73,6 +73,50 @@
       can check that everything is fully working without accidentally sending
       hundreds of text messages or emails.
     </p>
+
+    <h2 class="heading-large" id="pricing">Pricing</h2>
+
+    <h3 class="heading-medium">Emails</h3>
+
+    <p>
+      Sending email through GOV.UK&nbsp;Notify is completely free.
+    </p>
+
+    <h3 class="heading-medium">Text messages</h3>
+
+    <ul class="list list-bullet">
+      <li>Free allowance: 250,000 SMS per service, per financial year</li>
+      <li>Standard rate: 1.8 pence per SMS</li>
+      <li>Fail-over rate: 2.5 pence per SMS</li>
+    </ul>
+
+    <p>
+      You only pay the fail-over rate if we can’t deliver your text message
+      through our primary SMS provider.
+    </p>
+    
+    <p>
+      We simply charge you the costs we pay to our delivery partners.
+      We don’t mark these costs up in any way.
+    </p>
+
+    <h4 class="heading-small">SMS and text message length</h4>
+    <ul class="list list-bullet">
+      <li>Up to 160 characters = 1 SMS</li>
+      <li>Up to 306 characters = 2 SMS</li>
+      <li>Up to 459 characters = 3 SMS</li>
+    </ul>
+
+    <h3 class="heading-medium">No monthly charge or setup fee</h3>
+    <p>
+      There are no other charges for using Notify. There’s no monthly charge
+      or setup fee.
+    </p>
+
+    <p>
+      The Government Digital Service is funding the development and running
+      of Notify. We’re also covering the cost of the free emails and text messages.
+    </p>
   </div>
 </div>
 

app/templates/views/invite-user.html

@@ -16,7 +16,7 @@ Manage users – GOV.UK Notify
   <div class="grid-row">
     <form method="post" class="column-three-quarters">
 
-      {{ textbox(form.email_address, hint='Email address must end in .gov.uk', width='1-1') }}
+      {{ textbox(form.email_address, hint='You must use an email address from a central government organisation', width='1-1', safe_error_message=True) }}
 
       <fieldset class='yes-no-wrapper'>
         <legend class='heading-small'>

app/templates/views/register.html

@@ -16,7 +16,7 @@ Create an account – GOV.UK Notify
 
     <form method="post" autocomplete="nope">
       {{ textbox(form.name, width='3-4') }}
-      {{ textbox(form.email_address, hint="Your email address must end in .gov.uk", width='3-4') }}
+      {{ textbox(form.email_address, hint="You must use an email address from a central government organisation", width='3-4', safe_error_message=True) }}
       {{ textbox(form.mobile_number, width='3-4') }}
       {{ textbox(form.password, hint="Your password must have at least 10 characters", width='3-4') }}
       {{ page_footer("Continue") }}

app/templates/views/user-profile/change.html

@@ -18,7 +18,7 @@ GOV.UK Notify | Service settings
     {% endif %}
     <div class="column-three-quarters">
       <form method="post">
-        {{ textbox(form_field) }}
+        {{ textbox(form_field, safe_error_message=True) }}
         {{ page_footer(
           'Save',
           back_link=url_for('.user_profile'),