From 905f8f5c1fde82dc22d22412c544630a74fda016 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Mon, 22 Jul 2024 12:37:01 +0100
Subject: [PATCH 1/4] new footer with links, just needs privacy notice adding

---
 .../Pages/Shared/_Layout.cshtml               | 47 ++++++++++++-------
 .../appsettings.Development.json              |  3 +-
 .../appsettings.Production.json               |  7 +--
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
index 1d70cc2a9..4bf6d9372 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
@@ -183,39 +183,45 @@
             @RenderBody()
         </main>
     </div>
-    <footer class="govuk-footer " role="contentinfo">
-        <div class="dfe-width-container">
+
+    <footer class="govuk-footer" role="contentinfo">
+        <div class="govuk-width-container">
             <div class="govuk-footer__navigation">
-                <div class="govuk-footer__section govuk-grid-column-one-half" data-cy="get-support-section">
-                    <h2 class="govuk-footer__heading govuk-heading-m">Get support</h2>
-                    <ul class="govuk-footer__list govuk-footer__list--columns-1">
+                <div class="govuk-footer__section govuk-grid-column-two-thirds">
+                    <h2 class="govuk-footer__heading govuk-heading-m">Get help</h2>
+                    <ul class="govuk-footer__list govuk-footer__list--column-1">
                         <li class="govuk-footer__list-item">
-                            Email
-                            <a class="govuk-footer__link" data-cy="get-support-email" href="mailto:@Configuration["SupportEmail"]?subject=Prepare%20conversions%20and%20transfers:%20support%20query">
-                                @Configuration["SupportEmail"]
+                            <a class="govuk-footer__link" href="mailto:@Configuration["SupportEmail"]?subject=Prepare%20conversions%20and%20transfers:%20support%20query">
+                                Email Service Support for help with using this system
                             </a>
+                            <p>We aim to respond within 5 working days, or one working day for more urgent queries.</p>
+                        </li>
+                        <li class="govuk-footer__list-item">
+                            <a class="govuk-footer__link" rel="noreferrer noopener" target="_blank" href="https://educationgovuk.sharepoint.com/sites/lvewp00299/SitePages/Prepare-Conversions-and-Transfers.aspx">
+                                How to use this system (opens in a new tab)
+                            </a>
+                        </li>
                     </ul>
                 </div>
-                <div class="govuk-footer__section govuk-grid-column-one-half">
+                <div class="govuk-footer__section govuk-grid-column-one-third">
                     <h2 class="govuk-footer__heading govuk-heading-m">Give feedback</h2>
-                    <ul class="govuk-footer__list govuk-footer__list--columns-1">
+                    <ul class="govuk-footer__list">
                         <li class="govuk-footer__list-item">
-                            <a class="govuk-footer__link" rel="noopener" href="@Configuration["FeedbackLink"]" target="_blank" id="footer-feedback-link">
-                                Give feedback on Prepare conversions and transfers (opens in a new tab)
-                            </a>
+                            <a class="govuk-footer__link" href="@Configuration["FeedbackLink"]" rel="noreferrer noopener" target="_blank">Give feedback (opens in a new tab)</a>
+                        </li>
+                        <li class="govuk-footer__list-item">
+                            <a class="govuk-footer__link" href="@Configuration["SuggestChangeLink"]" rel="noreferrer noopener" target="_blank">Suggest a change (opens in a new tab)</a>
                         </li>
                     </ul>
                 </div>
             </div>
-        </div>
-        <div class="dfe-width-container">
+            <hr class="govuk-footer__section-break">
             <div class="govuk-footer__meta">
-                <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
+                <div class="govuk-footer__meta-item govuk-footer__meta-item--grow dfe-footer__meta-item--grow">
                     <h2 class="govuk-visually-hidden">Support links</h2>
                     <ul class="govuk-footer__inline-list">
                         <li class="govuk-footer__inline-list-item">
-                            <a class="govuk-footer__link" asp-page="@Links.Public.Accessibility.Page"
-                               data-test="accessibility-statement">
+                            <a class="govuk-footer__link" asp-page="@Links.Public.Accessibility.Page">
                                 Accessibility statement
                             </a>
                         </li>
@@ -225,6 +231,11 @@
                                 Cookies
                             </a>
                         </li>
+                        <li class="govuk-footer__inline-list-item">
+                            <a class="govuk-footer__link" href="#">
+                                Privacy notice
+                            </a>
+                        </li>
                     </ul>
                     <svg aria-hidden="true" focusable="false" class="govuk-footer__licence-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 483.2 195.7" height="17" width="41">
                         <path fill="currentColor" d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Development.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Development.json
index d9fda5b2f..e4170c0bc 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Development.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Development.json
@@ -7,5 +7,6 @@
       }
    },
    "FeedbackLink": "feedbacklink",
-   "SupportEmail": "supportemail"
+   "SupportEmail": "supportemail",
+   "SuggestChangeLink": "suggestchangelink"
 }
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Production.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Production.json
index 2a4c588f9..41199583f 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Production.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Production.json
@@ -1,5 +1,6 @@
 {
-  "AzureAd": {
-	"ClientId": "b08e9544-17c4-4129-a848-89854ee2bb40"
-  }
+   "AzureAd": {
+      "ClientId": "b08e9544-17c4-4129-a848-89854ee2bb40"
+   },
+   "SuggestChangeLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=yXfS-grGoU2187O4s0qC-fkHK2JGo_BIpVChpLMaBFpUNUFDSzhQN0FHVklTV0JWTzFZTjNKWTNJUi4u"
 }
\ No newline at end of file

From af7bd1522d087aad807f025f3a06b2f520d6229a Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Mon, 22 Jul 2024 14:05:50 +0100
Subject: [PATCH 2/4] Privacy link not needed

---
 .../Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
index 4bf6d9372..6c49aa4d8 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
@@ -231,11 +231,6 @@
                                 Cookies
                             </a>
                         </li>
-                        <li class="govuk-footer__inline-list-item">
-                            <a class="govuk-footer__link" href="#">
-                                Privacy notice
-                            </a>
-                        </li>
                     </ul>
                     <svg aria-hidden="true" focusable="false" class="govuk-footer__licence-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 483.2 195.7" height="17" width="41">
                         <path fill="currentColor" d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />

From 3df29c944c255a298b54bd44afcbd7617a928900 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Mon, 22 Jul 2024 14:18:37 +0100
Subject: [PATCH 3/4] fix for unit and cypress tests

---
 .../Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
index 6c49aa4d8..b0e71b4b5 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
@@ -187,11 +187,11 @@
     <footer class="govuk-footer" role="contentinfo">
         <div class="govuk-width-container">
             <div class="govuk-footer__navigation">
-                <div class="govuk-footer__section govuk-grid-column-two-thirds">
+                <div class="govuk-footer__section govuk-grid-column-two-thirds" data-cy="get-support-section">
                     <h2 class="govuk-footer__heading govuk-heading-m">Get help</h2>
                     <ul class="govuk-footer__list govuk-footer__list--column-1">
                         <li class="govuk-footer__list-item">
-                            <a class="govuk-footer__link" href="mailto:@Configuration["SupportEmail"]?subject=Prepare%20conversions%20and%20transfers:%20support%20query">
+                            <a data-cy="get-support-email"  class="govuk-footer__link" href="mailto:@Configuration["SupportEmail"]?subject=Prepare%20conversions%20and%20transfers:%20support%20query">
                                 Email Service Support for help with using this system
                             </a>
                             <p>We aim to respond within 5 working days, or one working day for more urgent queries.</p>
@@ -207,7 +207,7 @@
                     <h2 class="govuk-footer__heading govuk-heading-m">Give feedback</h2>
                     <ul class="govuk-footer__list">
                         <li class="govuk-footer__list-item">
-                            <a class="govuk-footer__link" href="@Configuration["FeedbackLink"]" rel="noreferrer noopener" target="_blank">Give feedback (opens in a new tab)</a>
+                            <a class="govuk-footer__link" id="footer-feedback-link" href="@Configuration["FeedbackLink"]" rel="noreferrer noopener" target="_blank">Give feedback (opens in a new tab)</a>
                         </li>
                         <li class="govuk-footer__list-item">
                             <a class="govuk-footer__link" href="@Configuration["SuggestChangeLink"]" rel="noreferrer noopener" target="_blank">Suggest a change (opens in a new tab)</a>
@@ -221,7 +221,7 @@
                     <h2 class="govuk-visually-hidden">Support links</h2>
                     <ul class="govuk-footer__inline-list">
                         <li class="govuk-footer__inline-list-item">
-                            <a class="govuk-footer__link" asp-page="@Links.Public.Accessibility.Page">
+                            <a data-test="accessibility-statement"  class="govuk-footer__link" asp-page="@Links.Public.Accessibility.Page">
                                 Accessibility statement
                             </a>
                         </li>

From 0aeb4b67b1eb929b5e0c604f2d6c90a55fca80de Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Mon, 22 Jul 2024 14:38:55 +0100
Subject: [PATCH 4/4] removed form link from production appsettings

---
 .../Dfe.PrepareConversions/appsettings.Production.json         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Production.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Production.json
index 41199583f..21f14d0ef 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Production.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.Production.json
@@ -1,6 +1,5 @@
 {
    "AzureAd": {
       "ClientId": "b08e9544-17c4-4129-a848-89854ee2bb40"
-   },
-   "SuggestChangeLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=yXfS-grGoU2187O4s0qC-fkHK2JGo_BIpVChpLMaBFpUNUFDSzhQN0FHVklTV0JWTzFZTjNKWTNJUi4u"
+   }
 }
\ No newline at end of file