From 385221cf5b8e625cd768a6f1c8ac9cfa16b63f12 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 7 Sep 2016 13:58:47 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Only=20show=20=E2=80=98Request=20to=20go=20?= =?UTF-8?q?live=E2=80=99=20link=20to=20admin=20users?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only users with the manage service permission can access this page, so we should only show the link to users that have this permission. --- app/templates/views/trial-mode.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index a7de3fb7c..79f649253 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -35,7 +35,7 @@

When you’re ready we can - {% if current_service %} + {% if current_service and current_user.has_permissions(['manage_settings'], admin_override=True) %} remove these restrictions. {% else %} remove these restrictions. From 93a1f194e94a29cd4df8c7b7ea65a2735f5c80d5 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 7 Sep 2016 12:21:43 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Remove=20=E2=80=98active=E2=80=99=20title?= =?UTF-8?q?=20on=20team=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This section of the page is covered by the ‘Team members’ `

`. Only the invited users is a special case that needs its own title. --- app/assets/stylesheets/views/users.scss | 1 + app/templates/views/manage-users.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/views/users.scss b/app/assets/stylesheets/views/users.scss index 93a4631c3..0d774388a 100644 --- a/app/assets/stylesheets/views/users.scss +++ b/app/assets/stylesheets/views/users.scss @@ -1,6 +1,7 @@ .user-list { @include core-16; + margin-bottom: $gutter * 1.5; &-item { diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index 34dc100ab..00e955044 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -17,7 +17,7 @@ Manage users – GOV.UK Notify {% block maincolumn_content %} -
+

Team members @@ -30,7 +30,7 @@ Manage users – GOV.UK Notify {% endif %}

-

+

From bdf5bd51b60b5bdadb672db32d5b18574e440022 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 7 Sep 2016 12:56:30 +0100 Subject: [PATCH 3/4] Remove 2/3rds and 3/4 columns These columns make the line length too short, and the text less readable. --- app/templates/views/api-keys/revoke.html | 24 +++++++------------ app/templates/views/api-keys/show.html | 19 ++++++--------- .../service-settings/request-to-go-live.html | 5 ---- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/app/templates/views/api-keys/revoke.html b/app/templates/views/api-keys/revoke.html index 4fe3880b9..847436035 100644 --- a/app/templates/views/api-keys/revoke.html +++ b/app/templates/views/api-keys/revoke.html @@ -8,22 +8,16 @@ {% block maincolumn_content %} -
-
+

+ Revoke API key +

-

- Revoke API key -

- -

- ‘{{ key_name }}’ will no longer let you connect to GOV.UK Notify. -

-

- You can’t undo this. -

- -
-
+

+ ‘{{ key_name }}’ will no longer let you connect to GOV.UK Notify. +

+

+ You can’t undo this. +

{{ page_footer( diff --git a/app/templates/views/api-keys/show.html b/app/templates/views/api-keys/show.html index 75cd189ae..3191f8b31 100644 --- a/app/templates/views/api-keys/show.html +++ b/app/templates/views/api-keys/show.html @@ -8,20 +8,15 @@ {% block maincolumn_content %} -
-
-

- New API key -

+

+ New API key +

-

- Copy your key to somewhere safe. You won’t be able to see it again - once you leave this page. -

- -
-
+

+ Copy your key to somewhere safe. You won’t be able to see it again + once you leave this page. +

{{ api_key(secret, key_name) }} diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html index f25a9baa5..ae5124491 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -8,9 +8,6 @@ {% block maincolumn_content %} -
-
-

Request to go live

@@ -60,7 +57,5 @@ {{ page_footer('Request to go live') }}

-
-
{% endblock %} From ac6b7dd0a025ef5b1986626e8f37c85c1031388a Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 7 Sep 2016 13:58:02 +0100 Subject: [PATCH 4/4] Tweak spacing on API keys page Splits the clients section out a bit more clearly. --- 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 22d3cc12d..7e7ad0b30 100644 --- a/app/templates/views/api-keys.html +++ b/app/templates/views/api-keys.html @@ -8,7 +8,7 @@ {% block maincolumn_content %} -
+

API integration @@ -54,11 +54,11 @@ {% endif %} {% endcall %} -
+
{{ api_key(current_service.id, "Service ID", thing="service ID") }}
-

API clients

+

API clients

    {% for name, url in [ ('Java', 'https://github.com/alphagov/notifications-java-client'),