Merge branch 'master' of github.com:alphagov/notifications-admin into letters-flag

app/templates/views/choose-service.html

@@ -12,12 +12,14 @@
   </h1>
 
   {{ browse_list(services) }}
-  {{ browse_list([
-    {
-      'title': 'Add a new service…',
-      'link': url_for('.add_service')
-    },
-  ]) }}
+  {% if can_add_service %}
+    {{ browse_list([
+      {
+        'title': 'Add a new service…',
+        'link': url_for('.add_service')
+      },
+    ]) }}
+  {% endif %}
 
 
 {% endblock %}

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='Must be from a central government organisation', width='1-1', safe_error_message=True) }}
+      {{ textbox(form.email_address, width='1-1', safe_error_message=True) }}
 
       {% include 'views/manage-users/permissions.html' %}
 

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

@@ -20,7 +20,7 @@
       {% endcall %}
 
       <p>
-        Before you request to go live, make you you’ve:
+        Before you request to go live, make sure you’ve:
       </p>
       <ul class="list list-bullet">
         <li>accepted our data sharing and financial agreement</li>

app/templates/views/user-profile.html

@@ -28,7 +28,13 @@
       {{ item.value }}
     {% endcall %}
     {% call field(align='right') %}
-      <a href="{{ item.url }}">Change</a>
+      {% if item.label == 'Email address' %}
+        {% if can_see_edit %}
+          <a href="{{ item.url }}">Change</a>
+        {% endif %}
+      {% else %}
+          <a href="{{ item.url }}">Change</a>
+      {% endif %}
     {% endcall %}
   {% endcall %}