From 0cd08a94ff7b18eabe61d1efdcd0feccdbb87d6e Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 13 Oct 2020 11:42:32 +0100
Subject: [PATCH] =?UTF-8?q?Rename=20dashboard=20to=20=E2=80=98current=20al?=
 =?UTF-8?q?erts=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The dashboard for normal services is quite general, because it tells
you a bit about channels, templates and spend.

What is now the dashboard for broadcast services is much more specific,
therefore less like a dashboard. We can reflect this by giving it a more
specific name. This should reduce the amount of navigation surfing
people need to do in order to find the thing they’re looking for.
---
 app/main/views/broadcast.py               | 2 +-
 app/templates/main_nav.html               | 2 +-
 app/templates/views/broadcast/tour/5.html | 2 +-
 app/templates/views/broadcast/tour/6.html | 2 +-
 tests/app/main/views/test_broadcast.py    | 4 ++--
 tests/app/test_navigation.py              | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/main/views/broadcast.py b/app/main/views/broadcast.py
index 6325061d6..27844ef3e 100644
--- a/app/main/views/broadcast.py
+++ b/app/main/views/broadcast.py
@@ -30,7 +30,7 @@ def broadcast_tour(service_id, step_index):
     )
 
 
-@main.route('/services/<uuid:service_id>/broadcast-dashboard')
+@main.route('/services/<uuid:service_id>/current-alerts')
 @user_has_permissions()
 @service_has_permission('broadcast')
 def broadcast_dashboard(service_id):
diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html
index ce2cfaa9d..f800c193b 100644
--- a/app/templates/main_nav.html
+++ b/app/templates/main_nav.html
@@ -5,7 +5,7 @@
   <ul>
   {% if current_user.has_permissions() %}
     {% if current_service.has_permission('broadcast') %}
-      <li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('dashboard') }}" href="{{ url_for('.broadcast_dashboard', service_id=current_service.id) }}">Dashboard</a></li>
+      <li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('dashboard') }}" href="{{ url_for('.broadcast_dashboard', service_id=current_service.id) }}">Current alerts</a></li>
       <li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('previous_broadcasts') }}" href="{{ url_for('.broadcast_dashboard_previous', service_id=current_service.id) }}">Previous alerts</a></li>
     {% elif current_user.has_permissions('view_activity') %}
       <li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('dashboard') }}" href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">Dashboard</a></li>
diff --git a/app/templates/views/broadcast/tour/5.html b/app/templates/views/broadcast/tour/5.html
index 34ba147eb..e1fa138de 100644
--- a/app/templates/views/broadcast/tour/5.html
+++ b/app/templates/views/broadcast/tour/5.html
@@ -33,7 +33,7 @@
         </p>
         <p class="govuk-body heading-medium">
           <a class="govuk-link govuk-link--no-visited-state" href='{{ url_for(".service_dashboard", service_id=current_service.id) }}'>
-            Continue to dashboard
+            Continue
           </a>
         </p>
       </div>
diff --git a/app/templates/views/broadcast/tour/6.html b/app/templates/views/broadcast/tour/6.html
index b4f6599dd..3cb4b14bd 100644
--- a/app/templates/views/broadcast/tour/6.html
+++ b/app/templates/views/broadcast/tour/6.html
@@ -28,7 +28,7 @@
         </p>
         <p class="govuk-body heading-medium">
           <a class="govuk-link govuk-link--no-visited-state" href='{{ url_for(".service_dashboard", service_id=current_service.id) }}'>
-            Continue to dashboard
+            Continue
           </a>
         </p>
       </div>
diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py
index d8fd9cbbd..141c9f85f 100644
--- a/tests/app/main/views/test_broadcast.py
+++ b/tests/app/main/views/test_broadcast.py
@@ -143,8 +143,8 @@ def test_broadcast_pages_403_for_user_without_permission(
     (2, 'Continue', partial(url_for, '.broadcast_tour', step_index=3)),
     (3, 'Continue', partial(url_for, '.broadcast_tour', step_index=4)),
     (4, 'Continue', partial(url_for, '.broadcast_tour', step_index=5)),
-    (5, 'Continue to dashboard', partial(url_for, '.service_dashboard')),
-    (6, 'Continue to dashboard', partial(url_for, '.service_dashboard')),
+    (5, 'Continue', partial(url_for, '.service_dashboard')),
+    (6, 'Continue', partial(url_for, '.service_dashboard')),
 ))
 def test_broadcast_tour_pages_have_continue_link(
     client_request,
diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py
index 3f471fb9e..5d921b1f2 100644
--- a/tests/app/test_navigation.py
+++ b/tests/app/test_navigation.py
@@ -188,7 +188,7 @@ def test_navigation_for_services_with_broadcast_permission(
     assert [
         a['href'] for a in page.select('.navigation a')
     ] == [
-        '/services/{}/broadcast-dashboard'.format(SERVICE_ONE_ID),
+        '/services/{}/current-alerts'.format(SERVICE_ONE_ID),
         '/services/{}/previous-alerts'.format(SERVICE_ONE_ID),
         '/services/{}/templates'.format(SERVICE_ONE_ID),
         '/services/{}/users'.format(SERVICE_ONE_ID),