From ec72bcd00ce814bc03a8ecc835f8f387a1cc45a4 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Wed, 30 Oct 2019 10:17:32 +0000
Subject: [PATCH] Fix issues raised in pull request

Includes:
- replacing of conditional with statement that
  returns the same values
- making lins to GDS page actually go there
---
 app/navigation.py                 | 4 +---
 app/templates/admin_template.html | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/navigation.py b/app/navigation.py
index cf5b5b715..281b8173e 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -330,9 +330,7 @@ class HeaderNavigation(Navigation):
 
     # header HTML now comes from GOVUK Frontend so requires a boolean, not an attribute
     def is_selected(self, navigation_item):
-        if request.endpoint in self.mapping[navigation_item]:
-            return True
-        return False
+        return request.endpoint in self.mapping[navigation_item]
 
 
 class MainNavigation(Navigation):
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index b7d0ada02..90449c552 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -139,9 +139,9 @@
   ] %}
 
   {% if current_service and current_service.research_mode %}
-    {% set meta_suffix = 'Built by the <a href="#" class="govuk-footer__link">Government Digital Service</a><span id="research-mode" class="research-mode">research mode</span>' %}
+    {% set meta_suffix = 'Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service" class="govuk-footer__link">Government Digital Service</a><span id="research-mode" class="research-mode">research mode</span>' %}
   {% else %}
-    {% set meta_suffix = 'Built by the <a href="#" class="govuk-footer__link">Government Digital Service</a>' %}
+    {% set meta_suffix = 'Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service" class="govuk-footer__link">Government Digital Service</a>' %}
   {% endif %}
 
   {{ notify_footer({