From 7dc5d76b98ba1fcdb469c66385ee04f10fb8a4e5 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 5 Feb 2016 10:33:14 +0000
Subject: [PATCH] Use banners appropriately
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We’ve fiddled around with the banners quite a lot in the last few days. This
commit reviews some of the older examples and makes sure that they’re:

a) not broken
b) using the most appropriate banner for the context
---
 app/main/views/api_keys.py          | 2 +-
 app/templates/flash_messages.html   | 2 +-
 app/templates/views/api-keys.html   | 7 ++++---
 app/templates/views/styleguide.html | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py
index 1a0492351..36959a86d 100644
--- a/app/main/views/api_keys.py
+++ b/app/main/views/api_keys.py
@@ -51,5 +51,5 @@ def revoke_api_key(service_id, key_id):
         )
     elif request.method == 'POST':
         api_key_api_client.revoke_api_key(service_id=service_id, key_id=key_id)
-        flash('‘{}’ was revoked'.format(key_name), 'default')
+        flash('‘{}’ was revoked'.format(key_name), 'default_with_tick')
         return redirect(url_for('.api_keys', service_id=service_id))
diff --git a/app/templates/flash_messages.html b/app/templates/flash_messages.html
index 85be2d13d..ec2b1a5d0 100644
--- a/app/templates/flash_messages.html
+++ b/app/templates/flash_messages.html
@@ -4,7 +4,7 @@
     {% for category, message in messages %}
       {{ banner(
         message,
-        'default' if category == 'default' or 'default_with_tick' else 'dangerous',
+        'default' if ((category == 'default') or (category == 'default_with_tick')) else 'dangerous',
         delete_button="Yes, delete this template" if 'delete' == category else None,
         with_tick=True if category == 'default_with_tick' else False
       )}}
diff --git a/app/templates/views/api-keys.html b/app/templates/views/api-keys.html
index a08dcef86..3884d35db 100644
--- a/app/templates/views/api-keys.html
+++ b/app/templates/views/api-keys.html
@@ -23,9 +23,10 @@
   </p>
 
   {{ banner(
-    'You can only send notifications to yourself',
-    subhead='Trial mode',
-    type='info'
+    'You can only send messages to yourself until you <a href="{}">request to go live</a>'.format(
+      url_for('.service_request_to_go_live', service_id=service_id)
+    )|safe,
+    type='important'
   ) }}
 
   <h2 class="api-key-name">
diff --git a/app/templates/views/styleguide.html b/app/templates/views/styleguide.html
index 6455a0ff5..da99a5d9a 100644
--- a/app/templates/views/styleguide.html
+++ b/app/templates/views/styleguide.html
@@ -51,6 +51,8 @@
     type='tip'
   )}}
 
+  {{ banner('You could go to jail', 'important')}}
+
   <h2 class="heading-large">Big number</h2>
 
   <p>Used to show some important statistics.</p>