Merge pull request #1379 from alphagov/consistent-banners

Make banners more consistent

app/main/views/api_keys.py

@@ -110,8 +110,9 @@ def revoke_api_key(service_id, key_id):
     key_name = api_key_api_client.get_api_keys(service_id=service_id, key_id=key_id)['apiKeys'][0]['name']
     if request.method == 'GET':
         return render_template(
-            'views/api/keys/revoke.html',
-            key_name=key_name
+            'views/api/keys.html',
+            revoke_key=key_name,
+            keys=api_key_api_client.get_api_keys(service_id=service_id)['apiKeys'],
         )
     elif request.method == 'POST':
         api_key_api_client.revoke_api_key(service_id=service_id, key_id=key_id)

app/main/views/templates.py

@@ -428,22 +428,24 @@ def delete_service_template(service_id, template_id):
         last_used_notification = template_statistics_client.get_template_statistics_for_template(
             service_id, template['id']
         )
-        message = '{} was last used {} ago'.format(
-            last_used_notification['template']['name'],
+        message = 'It was last used {} ago.'.format(
             get_human_readable_delta(
                 parse(last_used_notification['created_at']).replace(tzinfo=None),
-                datetime.utcnow())
+                datetime.utcnow()
+            )
         )
     except HTTPError as e:
         if e.status_code == 404:
-            message = '{} has never been used'.format(template['name'])
+            message = None
         else:
             raise e
 
-    flash('{}. Are you sure you want to delete it?'.format(message), 'delete')
-
     return render_template(
         'views/templates/template.html',
+        template_delete_confirmation_message=(
+            'Are you sure you want to delete {}?'.format(template['name']),
+            message,
+        ),
         template=get_template(
             template,
             current_service,