From 73469c10673072f954c92a95a6b52b68ec1a686e Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 7 Oct 2016 15:01:49 +0100
Subject: [PATCH] Make whitelist available to live services

Why would a live servie need the whitelist? Because the team key will
also let you send to members of your whitelist (so this commit relabels
it to say so).
---
 app/main/views/api_keys.py         |  2 +-
 app/templates/views/api/index.html | 27 +++++++++------------------
 app/templates/views/api/keys.html  |  2 +-
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py
index a4e3a2f17..f4333fca1 100644
--- a/app/main/views/api_keys.py
+++ b/app/main/views/api_keys.py
@@ -72,7 +72,7 @@ def create_api_key(service_id):
             ', once this service is not in trial mode' if current_service['restricted'] else ''
         )),
         (KEY_TYPE_TEST, 'Simulate sending messages to anyone'),
-        (KEY_TYPE_TEAM, 'Only send messages to members of your team')
+        (KEY_TYPE_TEAM, 'Only send messages to your team or whitelist')
     ]
     if form.validate_on_submit():
         secret = api_key_api_client.create_api_key(
diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html
index fb114b032..a446e9dbb 100644
--- a/app/templates/views/api/index.html
+++ b/app/templates/views/api/index.html
@@ -23,24 +23,15 @@
   {% endif %}
 
   <nav class="grid-row bottom-gutter-1-2">
-    {% if current_service.restricted %}
-      <div class="column-one-third">
-        <a class="pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
-      </div>
-      <div class="column-one-third">
-        <a class="pill-separate-item" href="{{ url_for('.whitelist', service_id=current_service.id) }}">Whitelist</a>
-      </div>
-      <div class="column-one-third">
-        <a class="pill-separate-item" href="{{ url_for('.api_documentation', service_id=current_service.id) }}">Documentation</a>
-      </div>
-    {% else %}
-      <div class="column-half">
-        <a class="pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
-      </div>
-      <div class="column-half">
-        <a class="pill-separate-item" href="{{ url_for('.api_documentation', service_id=current_service.id) }}">Documentation</a>
-      </div>
-    {% endif %}
+    <div class="column-one-third">
+      <a class="pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
+    </div>
+    <div class="column-one-third">
+      <a class="pill-separate-item" href="{{ url_for('.whitelist', service_id=current_service.id) }}">Whitelist</a>
+    </div>
+    <div class="column-one-third">
+      <a class="pill-separate-item" href="{{ url_for('.api_documentation', service_id=current_service.id) }}">Documentation</a>
+    </div>
   </nav>
 
   <div class="grid-row">
diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html
index 2cafa029f..a18419156 100644
--- a/app/templates/views/api/keys.html
+++ b/app/templates/views/api/keys.html
@@ -38,7 +38,7 @@
           {% if item.key_type == 'normal' %}
             <span class="visually-hidden">Normal</span>
           {% elif item.key_type == 'team' %}
-            Only sends to team members
+            Only sends to team members or whitelist
           {% elif item.key_type == 'test' %}
             Simulates sending messages
           {% endif %}