From a1db3308fcdfaa9e2a3e46a5640e258477e959b8 Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
Date: Mon, 25 Apr 2022 18:02:03 +0100
Subject: [PATCH 1/3] Use tag component

---
 app/views/case_logs/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb
index 438002338..e3ba0e4b9 100644
--- a/app/views/case_logs/edit.html.erb
+++ b/app/views/case_logs/edit.html.erb
@@ -25,7 +25,7 @@
     <% elsif @case_log.status == "not_started" %>
       <p class="govuk-body">This log has not been started.</p>
     <% elsif @case_log.status == "completed" %>
-      <strong class="govuk-tag">Completed</strong>
+      <%= govuk_tag(text: "Completed") %>
       <p class="govuk-body">
         You can <a class="govuk-link" href="<%="/logs/#{@case_log.id}/review" %>">review and make changes to this log</a> up to 3 months after the end of the current collection year, which closes on 31 March <%= @case_log.collection_start_year.present? ? @case_log.collection_start_year + 1 : "" %>.
       </p>

From 2ea44bc204af54868b4c26e15c3bc7f485db7ec7 Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
Date: Mon, 25 Apr 2022 18:02:37 +0100
Subject: [PATCH 2/3] Place log status tag within paragraph

---
 app/views/case_logs/edit.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb
index e3ba0e4b9..fbbe62c62 100644
--- a/app/views/case_logs/edit.html.erb
+++ b/app/views/case_logs/edit.html.erb
@@ -25,7 +25,9 @@
     <% elsif @case_log.status == "not_started" %>
       <p class="govuk-body">This log has not been started.</p>
     <% elsif @case_log.status == "completed" %>
-      <%= govuk_tag(text: "Completed") %>
+      <p class="govuk-body">
+        <%= govuk_tag(text: "Completed") %>
+      </p>
       <p class="govuk-body">
         You can <a class="govuk-link" href="<%="/logs/#{@case_log.id}/review" %>">review and make changes to this log</a> up to 3 months after the end of the current collection year, which closes on 31 March <%= @case_log.collection_start_year.present? ? @case_log.collection_start_year + 1 : "" %>.
       </p>

From c18bf8d7f53ec189605bb4e2979ef36663fe16ca Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
Date: Mon, 25 Apr 2022 18:18:07 +0100
Subject: [PATCH 3/3] Use govuk_link_to helper

---
 app/views/case_logs/_log_list.html.erb | 2 +-
 app/views/case_logs/edit.html.erb      | 2 +-
 app/views/errors/not_found.html.erb    | 2 +-
 app/views/layouts/application.html.erb | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/case_logs/_log_list.html.erb b/app/views/case_logs/_log_list.html.erb
index 3cde563c5..9aa52de14 100644
--- a/app/views/case_logs/_log_list.html.erb
+++ b/app/views/case_logs/_log_list.html.erb
@@ -3,7 +3,7 @@
     <span class="govuk-!-margin-right-4">
       <strong><%= pagy.count %></strong> total <%= title.downcase %>
     </span>
-    <a class="govuk-link" download href="/logs.csv" type="text/csv">Download (CSV)</a>
+    <%= govuk_link_to "Download (CSV)", "/logs.csv", type: "text/csv" %>
   </figcaption>
   <section class="app-table-group" tabindex="0" aria-labelledby="<%= title.dasherize %>">
     <table class="govuk-table">
diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb
index fbbe62c62..f48d3987d 100644
--- a/app/views/case_logs/edit.html.erb
+++ b/app/views/case_logs/edit.html.erb
@@ -29,7 +29,7 @@
         <%= govuk_tag(text: "Completed") %>
       </p>
       <p class="govuk-body">
-        You can <a class="govuk-link" href="<%="/logs/#{@case_log.id}/review" %>">review and make changes to this log</a> up to 3 months after the end of the current collection year, which closes on 31 March <%= @case_log.collection_start_year.present? ? @case_log.collection_start_year + 1 : "" %>.
+        You can <%= govuk_link_to "review and make changes to this log", "/logs/#{@case_log.id}/review" %> up to 3 months after the end of the current collection year, which closes on 31 March <%= @case_log.collection_start_year.present? ? @case_log.collection_start_year + 1 : "" %>.
       </p>
     <% end %>
     <%= render "tasklist" %>
diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb
index e1d0bf824..903a0ffaa 100644
--- a/app/views/errors/not_found.html.erb
+++ b/app/views/errors/not_found.html.erb
@@ -5,6 +5,6 @@
     <h1 class="govuk-heading-l"><%= content_for(:title) %></h1>
     <p class="govuk-body">If you typed the web address, check it is correct.</p>
     <p class="govuk-body">If you pasted the web address, check you copied the entire address.</p>
-    <p class="govuk-body"><a class="govuk-link" href="https://digital.dclg.gov.uk/jira/servicedesk/customer/portal/4/group/21">Get help</a> if the web address is correct and not working.</p>
+    <p class="govuk-body"><%= govuk_link_to "Get help", "https://digital.dclg.gov.uk/jira/servicedesk/customer/portal/4/group/21" %> if the web address is correct and not working.</p>
   </div>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6b101117c..ec5305c79 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -56,10 +56,12 @@
       end
     end %>
 
+    <% feedback_link = govuk_link_to "giving us your feedback (opens in a new tab)", t("feedback_form"), rel: "noreferrer noopener", target: "_blank" %>
+
     <%= govuk_phase_banner(
       classes: "govuk-width-container",
       tag: { text: "Beta" },
-      text: "This is a new service – help us improve it by <a class=\"govuk-link\" href=\"#{t('feedback_form')}\" rel=\"noreferrer noopener\" target=\"_blank\">giving us your feedback (opens in a new tab)</a>".html_safe,
+      text: "This is a new service – help us improve it by #{feedback_link}".html_safe,
     ) %>
 
     <% if !current_user.nil? %>