From ad0b7537def1c60d22d6c5a06eee31d6bea47040 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott
Date: Wed, 12 May 2021 11:50:30 +0100
Subject: [PATCH] Make the government channel visually distinct
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It’s really serious, so this sets it apart from the other live channels.
---
.../stylesheets/components/navigation.scss | 6 +++++
...ervice-confirm-broadcast-account-type.html | 27 ++++++++++---------
app/templates/withnav_template.html | 4 +--
tests/app/main/views/test_broadcast.py | 2 +-
4 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss
index e98bad1dc..1bcf79d19 100644
--- a/app/assets/stylesheets/components/navigation.scss
+++ b/app/assets/stylesheets/components/navigation.scss
@@ -47,6 +47,12 @@
box-shadow: 0 -3px 0 0 #F6D7D2;
}
+ &--government {
+ background: #942514;
+ color: #F6D7D2;
+ box-shadow: 0 -3px 0 0 #942514;
+ }
+
}
&-service-switch,
diff --git a/app/templates/views/service-settings/service-confirm-broadcast-account-type.html b/app/templates/views/service-settings/service-confirm-broadcast-account-type.html
index e36045331..229f55856 100644
--- a/app/templates/views/service-settings/service-confirm-broadcast-account-type.html
+++ b/app/templates/views/service-settings/service-confirm-broadcast-account-type.html
@@ -24,19 +24,20 @@
{% else %}
-
- {% if form.account_type.broadcast_channel == 'severe' %}
- Live
- {% else %}
- {{ form.account_type.broadcast_channel|title }}
- {% endif %}
- {% if form.account_type.provider_restriction != 'all' %}
- ({{ form.account_type.provider_restriction|format_mobile_network }})
- {% endif %}
- {% if form.account_type.broadcast_channel == 'test' and form.account_type.provider_restriction == 'all'%}
- (all networks)
- {% endif %}
-
+ {% if form.account_type.broadcast_channel == 'severe' %}
+ Live
+ {% elif form.account_type.broadcast_channel == 'government' %}
+ Government
+ {% else %}
+ {{ form.account_type.broadcast_channel|title }}
+ {% endif %}
+ {% if form.account_type.provider_restriction != 'all' %}
+ ({{ form.account_type.provider_restriction|format_mobile_network }})
+ {% endif %}
+ {% if form.account_type.broadcast_channel == 'test' and form.account_type.provider_restriction == 'all'%}
+ (all networks)
+ {% endif %}
+
Members of the public
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html
index 9e142d5f7..f13c62b43 100644
--- a/app/templates/withnav_template.html
+++ b/app/templates/withnav_template.html
@@ -31,8 +31,8 @@
{% else %}
({{ current_service.allowed_broadcast_provider }})
{% endif %}
- {% else %}
- {{ current_service.broadcast_channel|title }}
+ {% elif current_service.broadcast_channel == 'government' %}
+ Government
{% endif %}
{% endif %}
diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py
index 63ad7f956..804505afb 100644
--- a/tests/app/main/views/test_broadcast.py
+++ b/tests/app/main/views/test_broadcast.py
@@ -333,7 +333,7 @@ def test_broadcast_tour_page_4_shows_service_name(
False,
'government',
'all',
- '.navigation-service-type.navigation-service-type--live',
+ '.navigation-service-type.navigation-service-type--government',
'service one Government Switch service',
'Government',
),