From 3e5c769ef5c1730e80d70b6b0c336b820b65345d Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
Date: Mon, 27 Jun 2022 14:01:09 +0100
Subject: [PATCH 1/4] CLDC-1253: Use email link in request to create a new
 organisation on the start page (#647)

---
 app/views/layouts/_footer.html.erb | 2 +-
 app/views/start/index.html.erb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 972090066..49a6e689c 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -22,7 +22,7 @@
           <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Email</h3>
           <ul class="govuk-list govuk-!-font-size-16 govuk-!-margin-bottom-0">
             <li>
-              <%= govuk_mail_to("submitcoredata@levellingup.gov.uk", class: "govuk-footer__link") %>
+              <%= govuk_mail_to("dluhc.digital-services@levellingup.gov.uk", subject: "CORE:", class: "govuk-footer__link") %>
             </li>
             <li class="govuk-!-margin-bottom-0">We aim to respond within 2 working&nbsp;days</li>
           </ul>
diff --git a/app/views/start/index.html.erb b/app/views/start/index.html.erb
index 72a6619e4..7a6d0897f 100644
--- a/app/views/start/index.html.erb
+++ b/app/views/start/index.html.erb
@@ -19,7 +19,7 @@
     <h2 class="govuk-heading-m">Before you start</h2>
     <p class="govuk-body">Use your account details to sign in.</p>
     <p class="govuk-body">If you need to set up a new account, speak to your organisation’s CORE data coordinator. If you don’t know who that is, <%= govuk_link_to("contact the helpdesk", "https://digital.dclg.gov.uk/jira/servicedesk/customer/portal/4/group/21") %>.</p>
-    <p class="govuk-body">You can <%= govuk_link_to("request an account", "https://digital.dclg.gov.uk/jira/servicedesk/customer/portal/4/group/21") %> if your organisation doesn’t have one.</p>
+    <p class="govuk-body">You can <%= govuk_mail_to("dluhc.digital-services@levellingup.gov.uk", "request an account", subject: "CORE: Request a new account") %> if your organisation doesn’t have one.</p>
   </div>
 
   <div class="govuk-grid-column-one-third-from-desktop">

From 377fc6b1bd9faf5116e066a494d73e692df91972 Mon Sep 17 00:00:00 2001
From: Ted <ted.booton@madetech.com>
Date: Mon, 27 Jun 2022 14:27:32 +0100
Subject: [PATCH 2/4] Added "skip for now" button

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

diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index f4f5fe9ae..8f18146d6 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -39,9 +39,11 @@
       <% end %>
 
       <%= f.hidden_field :page, value: @page.id %>
+      <% next_page = @case_log.form.next_page(@page, @case_log, current_user) %>
       <% if !@page.id.include?("value_check") %>
         <%= f.govuk_submit "Save and continue" %>
-      <% end %>
+          <%= govuk_link_to "Skip for now", "/logs/#{@case_log.id}/#{next_page.dasherize}", secondary: true %>
+        <% end %>
     </div>
   </div>
 <% end %>

From 4cc5bec9a381435eb1748a74f2531f6223e2f017 Mon Sep 17 00:00:00 2001
From: Ted <ted.booton@madetech.com>
Date: Mon, 27 Jun 2022 14:52:51 +0100
Subject: [PATCH 3/4] For in progress logs the "Skip for now" button is
 replaced with a "Cancel" button which redirects to the setup page

---
 app/views/form/page.html.erb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index 8f18146d6..e968c5926 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -42,7 +42,12 @@
       <% next_page = @case_log.form.next_page(@page, @case_log, current_user) %>
       <% if !@page.id.include?("value_check") %>
         <%= f.govuk_submit "Save and continue" %>
-          <%= govuk_link_to "Skip for now", "/logs/#{@case_log.id}/#{next_page.dasherize}", secondary: true %>
+          <% if @case_log.status == "in_progress" %>
+            <%= govuk_link_to "Cancel", "/logs/#{@case_log.id}/setup/check-answers", secondary: true %>
+          <% else %>
+            <%= govuk_link_to "Skip for now", "/logs/#{@case_log.id}/#{next_page.dasherize}", secondary: true %>
+
+       <% end %>
         <% end %>
     </div>
   </div>

From ea8ca1de188eb48ad447a1733e238a4149a30a20 Mon Sep 17 00:00:00 2001
From: JG <moarpheus@gmail.com>
Date: Mon, 27 Jun 2022 16:08:49 +0100
Subject: [PATCH 4/4] indent

---
 app/views/form/page.html.erb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index e968c5926..927c13511 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -42,13 +42,12 @@
       <% next_page = @case_log.form.next_page(@page, @case_log, current_user) %>
       <% if !@page.id.include?("value_check") %>
         <%= f.govuk_submit "Save and continue" %>
-          <% if @case_log.status == "in_progress" %>
-            <%= govuk_link_to "Cancel", "/logs/#{@case_log.id}/setup/check-answers", secondary: true %>
-          <% else %>
-            <%= govuk_link_to "Skip for now", "/logs/#{@case_log.id}/#{next_page.dasherize}", secondary: true %>
-
-       <% end %>
+        <% if @case_log.status == "in_progress" %>
+          <%= govuk_link_to "Cancel", "/logs/#{@case_log.id}/setup/check-answers", secondary: true %>
+        <% else %>
+          <%= govuk_link_to "Skip for now", "/logs/#{@case_log.id}/#{next_page.dasherize}", secondary: true %>
         <% end %>
+      <% end %>
     </div>
   </div>
 <% end %>