From de8cf23626da86dc005ed3e96245c01734294f62 Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Mon, 21 Mar 2016 17:01:31 +0000
Subject: [PATCH] Renamed Notification history to View activity Moved View
 activity under service name No line under h2 Removed Job history from side
 nav

---
 app/assets/stylesheets/components/navigation.scss |  6 +++++-
 app/templates/main_nav.html                       | 10 ++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss
index 978b52b63..d0093bd11 100644
--- a/app/assets/stylesheets/components/navigation.scss
+++ b/app/assets/stylesheets/components/navigation.scss
@@ -5,14 +5,18 @@
   ul,
   h2 {
     @include core-19;
-    border-bottom: 1px solid $border-colour;
     margin: 10px 20px 15px 0;
     list-style-type: none;
+  }
+
+  ul {
+    border-bottom: 1px solid $border-colour;
     padding: 0 0 10px 0;
   }
 
   h2 {
     font-weight: bold;
+    margin-bottom: 10px;
   }
 
   li {
diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html
index f7aa3aed9..83a660a81 100644
--- a/app/templates/main_nav.html
+++ b/app/templates/main_nav.html
@@ -2,6 +2,9 @@
   <h2 class="navigation-service-name">
     <a href="{{ url_for('.service_dashboard', service_id=service_id) }}">{{ session.get('service_name', 'Service') }}</a>
   </h2>
+  <ul>
+    <li><a href="{{ url_for('.view_notifications', service_id=service_id) }}">View activity</a></li>
+  </ul>
   {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
   <ul>
     <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Send text messages</a></li>
@@ -21,14 +24,9 @@
   {% endif %}
   {% if current_user.has_permissions(['manage_api_keys', 'access_developer_docs']) %}
   <ul>
-    <li><a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys</a></li>
+    <li><a href="{{ url_for('.api_keys', service_id=service_id) }}">Manage API keys</a></li>
   </ul>
   {% endif %}
-
-  <ul>
-    <li><a href="{{ url_for('.view_notifications', service_id=service_id) }}">Notification history</a></li>
-    <li><a href="{{ url_for('.view_jobs', service_id=service_id) }}">Job history</a><li>
-  </ul>
   {% if current_user.has_permissions(admin_override=True) %}
     <ul>
       <li><a href="{{ url_for('.show_all_services') }}"> List all services </a></li>