From c1f771a73ddecd6160c6a31f5ff4c9d62014a350 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Thu, 2 Feb 2017 12:44:12 +0000 Subject: [PATCH 1/3] Updated the labels for API key creation options --- app/main/views/api_keys.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py index fd3352a54..ee832bfb3 100644 --- a/app/main/views/api_keys.py +++ b/app/main/views/api_keys.py @@ -69,9 +69,9 @@ def create_api_key(service_id): ] form = CreateKeyForm(key_names) form.key_type.choices = [ - (KEY_TYPE_NORMAL, 'Send messages to anyone'), - (KEY_TYPE_TEAM, 'Send messages to anyone on my whitelist'), - (KEY_TYPE_TEST, 'Pretend to send messages to anyone'), + (KEY_TYPE_NORMAL, 'Live – sends to anyone'), + (KEY_TYPE_TEAM, 'Team and whitelist – limits who you can send to'), + (KEY_TYPE_TEST, 'Test – pretends to send messages'), ] if current_service['restricted']: disabled_options = [KEY_TYPE_NORMAL] From 4040429f413bf37a7401e898432e16a876779bab Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Thu, 2 Feb 2017 12:52:11 +0000 Subject: [PATCH 2/3] Updated API key type hint text on list of keys page --- app/templates/views/api/keys.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html index 5168c5ceb..12ed641a4 100644 --- a/app/templates/views/api/keys.html +++ b/app/templates/views/api/keys.html @@ -35,11 +35,11 @@ {{ item.name }} {% if item.key_type == 'normal' %} - Normal + Live – sends to anyone {% elif item.key_type == 'team' %} - Sends to anyone on your whitelist + Team and whitelist – limits who you can send to {% elif item.key_type == 'test' %} - Pretends to send messages + Test – pretends to send messages {% endif %} From 97a49759852b9d4536cb5c95bb773485294f37d6 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Thu, 2 Feb 2017 13:01:15 +0000 Subject: [PATCH 3/3] Stopped hiding the label that showed if a key was a live key Happy to be overruled by @quis on this one.... --- app/templates/views/api/keys.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html index 12ed641a4..fef00a7b5 100644 --- a/app/templates/views/api/keys.html +++ b/app/templates/views/api/keys.html @@ -35,7 +35,7 @@ {{ item.name }} {% if item.key_type == 'normal' %} - Live – sends to anyone + Live – sends to anyone {% elif item.key_type == 'team' %} Team and whitelist – limits who you can send to {% elif item.key_type == 'test' %}