SKIRMISH MODE

app/assets/stylesheets/components/sms-message.scss

@@ -19,7 +19,7 @@
 .sms-message-recipient {
   @include copy-19;
   color: $secondary-text-colour;
-  margin: -$gutter-half 0 $gutter 0;
+  margin: -20px 0 $gutter 0;
 }
 
 .sms-message-name {

app/templates/components/sms-message.html

@@ -6,7 +6,6 @@
   {% endif %}
   {% if name %}
     <h3 class="sms-message-name">
-      ID: {{ id }}
       {% if edit_link %}
         <a href="{{ edit_link }}">{{ name }}</a>
       {% else %}
@@ -25,6 +24,11 @@
       {{ recipient }}
     </p>
   {% endif %}
+  {% if id %}
+    <p class="sms-message-recipient">
+      Template ID: {{ id }}
+    </p>
+  {% endif %}
   {% if input_name %}
     </label>
   {% endif %}

app/templates/main_nav.html

@@ -9,11 +9,11 @@
     <li><a href="{{ url_for('.manage_service_templates', service_id=service_id) }}">Templates</a></li>
   </ul>
   <ul>
-    <li><a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys</a></li>
     <li><a href="{{ url_for('.documentation', service_id=service_id) }}">Developer documentation</a></li>
+    <li><a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys</a></li>
   </ul>
   <ul>
-    <li><a href="{{ url_for('.manage_users', service_id=service_id) }}">Manage users</a></li>
+    <!--<li><a href="{{ url_for('.manage_users', service_id=service_id) }}">Manage users</a></li>-->
     <li><a href="{{ url_for('.service_settings', service_id=service_id) }}">Service settings</a></li>
   </ul>
 </nav>

app/templates/views/edit-template.html

@@ -18,13 +18,14 @@ GOV.UK Notify | Edit template
 				</legend>
 				<label class="block-label" for="template_type">
 					<input type="radio" name="template_type" id="template_type" checked="checked" value="sms" />
-					SMS
+					Text message
 				</label>
 			</fieldset>
 			{{ textbox(form.template_content, highlight_tags=True) }}
 			{{ page_footer(
 				'Save',
 				delete_link=url_for('.delete_service_template', service_id=service_id, template_id=template_id) if template_id or None,
+				delete_link_text='delete this template',
 				back_link=url_for('.manage_service_templates', service_id=service_id),
 				back_link_text='Back to templates'
 			) }}

app/templates/views/service-settings.html

@@ -12,8 +12,7 @@
     {{ browse_list([
       {
         'title': 'Change your service name',
-        'link': url_for('.service_name_change', service_id=service_id),
+        'link': url_for('.service_name_change', service_id=service_id)
-        'hint': 'Your service name ({}) is included in every sent notification'.format(service.name)
       },
       {
         'title': 'Request to go live and turn off sending restrictions',
@@ -22,15 +21,15 @@
       } if not service.live else {
       },
       {
-        'title': 'Turn off all outgoing notifications',
+        'title': 'Temporarily suspend API keys',
         'link': url_for('.service_status_change', service_id=service_id),
         'destructive': True
       } if service.active else {
-        'title': 'Restart sending notifications',
+        'title': 'Reactivate API keys',
         'link': url_for('.service_status_change', service_id=service_id)
       },
       {
-        'title': 'Delete this service from Notify',
+        'title': 'Delete this service from GOV.UK Notify',
         'link': url_for('.service_delete', service_id=service_id),
         'destructive': True
       },

app/templates/views/service-settings/delete.html

@@ -7,11 +7,13 @@
 
 {% block maincolumn_content %}
 
-  <h1 class="heading-xlarge">Delete this service from Notify</h1>
+
 
   <div class="grid-row">
     <div class="column-three-quarters">
 
+      <h1 class="heading-xlarge">Delete this service from GOV.UK Notify</h1>
+
       <p>
         This can’t be undone. You will lose:
       </p>
@@ -24,7 +26,7 @@
           any templates you’ve created
         </li>
         <li>
-          the history of
+          the history of notifications you’ve sent
         </li>
         <li>
           API keys

app/templates/views/service-settings/status.html

@@ -7,7 +7,7 @@ GOV.UK Notify | Service settings
 
 {% block maincolumn_content %}
 
-  <h1 class="heading-xlarge">Turn off all outgoing notifications</h1>
+  <h1 class="heading-xlarge">Temporarily suspend API keys</h1>
 
   <div class="grid-row">
     <div class="column-three-quarters">

app/templates/views/signedout.html

@@ -10,15 +10,22 @@ GOV.UK Notify | Get started
 	<div class="column-two-thirds">
 		<h1 class="heading-xlarge">GOV.UK Notify</h1>
 
-		<p>Use GOV.UK Notify to send notifications by text message, email and letter.</p>
+		<p>
-		<p>We're making it easy to keep your users informed.</p>
+			Use GOV.UK Notify to send notifications by text message, email and letter.
-		<p>If you work for a UK government department or agency you can set up a test account now.</p>
+		</p>
+		<p>
+			We're making it easy to keep your users informed.
+		</p>
+		<p>
+			If you work for a UK government department or agency you can set up a test account now.
+		</p>
+		<p>
+			<a class="button" href="{{ url_for('.register' )}}" role="button">Set up an account</a>
+		</p>
+		<p>
+			If you've used GOV.UK Notify before, <a href="{{ url_for('.sign_in' )}}">sign in to your account</a>.
+		</p>
 
-		<a class="button" href="register" role="button">Set up an account</a>
-
-		<!-- <h2 class="heading-large">Used GOV.UK Notify before?</h2> -->
-
-		<p>If you've used GOV.UK Notify before, <a href="sign-in">sign in to your account</a>.</p>
 	</div>
 </div>
 

tests/app/main/views/test_service_settings.py

@@ -13,7 +13,6 @@ def test_should_show_overview(app_, db_, db_session, mock_api_user, mock_get_ser
         resp_data = response.get_data(as_text=True)
         assert 'Service settings' in resp_data
         service = mock_get_service.side_effect(service_id)['data']
-        assert service['name'] in resp_data
         assert mock_get_service.called
 
 
@@ -217,7 +216,7 @@ def test_should_show_delete_page(app_, db_, db_session, mock_api_user, mock_get_
                 'main.service_delete', service_id=service_id))
 
         assert response.status_code == 200
-        assert 'Delete this service from Notify' in response.get_data(as_text=True)
+        assert 'Delete this service from GOV.UK Notify' in response.get_data(as_text=True)
         assert mock_get_service.called