Merge

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 %>

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>

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">