diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/e2e/footerLinks.cy.ts b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/e2e/footerLinks.cy.ts index c18e281db..9d6617c4a 100644 --- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/e2e/footerLinks.cy.ts +++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/e2e/footerLinks.cy.ts @@ -10,13 +10,12 @@ describe("Navigate through footer links", () => { Logger.log("Get help footer links"); cy.get('h2').should('contain', 'Get help'); - cy.contains('a', 'Email Service Support for help with using this system').should('be.visible') - cy.contains('a', 'How to use this system (opens in a new tab)').should('be.visible') + cy.contains('a', 'Get help with a Regions Group system').should('be.visible') Logger.log("Get feedback footer links"); cy.get('h2').should('contain', 'Give feedback'); - cy.contains('a', 'Give feedback (opens in a new tab)').should('be.visible') - cy.contains('a', 'Suggest a change (opens in a new tab)').should('be.visible') + cy.contains('a', 'Give feedback about a Regions Group system (opens in a new tab)').should('be.visible') + cy.contains('a', 'Suggest a change to a Regions Group system (opens in a new tab)').should('be.visible') Logger.log("Get accessibility and cookies link"); cy.contains('a', 'Accessibility statement').should('be.visible').click() diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/Footer/_Footer.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/Footer/_Footer.cshtml new file mode 100644 index 000000000..ef3309808 --- /dev/null +++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/Footer/_Footer.cshtml @@ -0,0 +1,71 @@ +@inject Microsoft.Extensions.Configuration.IConfiguration _configuration + +@{ + var supportLink = $"mailto:{_configuration["SupportEmail"]}?subject=Manage%20free%20school%20projects:%20support%20query"; +} + + \ No newline at end of file diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/Footer/_Footer20241017.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/Footer/_Footer20241017.cshtml new file mode 100644 index 000000000..87172c0ea --- /dev/null +++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/Footer/_Footer20241017.cshtml @@ -0,0 +1,59 @@ +@inject Microsoft.Extensions.Configuration.IConfiguration _configuration + + \ No newline at end of file diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_Layout.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_Layout.cshtml index d7e11708b..7c2de232d 100644 --- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_Layout.cshtml +++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_Layout.cshtml @@ -1,5 +1,6 @@ @inject Microsoft.Extensions.Configuration.IConfiguration _configuration @inject Dfe.ManageFreeSchoolProjects.Services.IAnalyticsConsentService _analytisConsentService +@inject Microsoft.FeatureManagement.IFeatureManager _featureManager @{ var showAnalytics = _configuration["GoogleAnalytics:Enable"] == "Yes" && _analytisConsentService.HasConsent(); @@ -11,7 +12,7 @@ var widePage = ViewData["WidePage"] != null ? "mfsp-wider-page" : string.Empty; - var supportLink = $"mailto:{_configuration["SupportEmail"]}?subject=Manage%20free%20school%20projects:%20support%20query"; + } @@ -101,71 +102,19 @@ - + if (useLatestFooter) + { + + } + + else + { + + } + } + diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/appsettings.Development.json b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/appsettings.Development.json index 28a3b5252..0e3606948 100644 --- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/appsettings.Development.json +++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/appsettings.Development.json @@ -14,6 +14,7 @@ "HowToUseLink": "howtouselink", "RequestAccessLink": "requestaccesslink", "FeatureManagement": { - "AllowCentralRoute": true + "AllowCentralRoute": true, + "UseLatestFooter": true } } \ No newline at end of file