Merge pull request #600 from cabinetoffice/EHD-1388-remove-or-update-…

…layout-pages EHD-1388: Remove or update layout pages
cabinetoffice · Nov 20, 2024 · be2ee6e · be2ee6e
2 parents a5aa8aa + e245c1d
commit be2ee6e
Show file tree

Hide file tree

Showing 188 changed files with 2 additions and 682 deletions.
diff --git a/GenderPayGap.WebUI/Classes/Bundle/Bundle.cs b/GenderPayGap.WebUI/Classes/Bundle/Bundle.cs
diff --git a/GenderPayGap.WebUI/Classes/Extensions/HtmlHelpers.cs b/GenderPayGap.WebUI/Classes/Extensions/HtmlHelpers.cs
diff --git a/GenderPayGap.WebUI/GenderPayGap.WebUI.csproj b/GenderPayGap.WebUI/GenderPayGap.WebUI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -142,7 +142,6 @@
     <_ContentIncludedByDefault Remove="site\appsettings.PROD.json" />
     <_ContentIncludedByDefault Remove="site\appsettings.TEST.json" />
     <_ContentIncludedByDefault Remove="site\build-number.json" />
-    <_ContentIncludedByDefault Remove="site\bundleconfig.json" />
     <_ContentIncludedByDefault Remove="site\GenderPayGap.WebUI.deps.json" />
     <_ContentIncludedByDefault Remove="site\GenderPayGap.WebUI.runtimeconfig.json" />
     <_ContentIncludedByDefault Remove="site\package-lock.json" />

diff --git a/GenderPayGap.WebUI/Views/AccountCreation/AlreadyCreatedAnAccountQuestion.cshtml b/GenderPayGap.WebUI/Views/AccountCreation/AlreadyCreatedAnAccountQuestion.cshtml
@@ -8,7 +8,6 @@
 @model GenderPayGap.WebUI.Models.AccountCreation.AlreadyCreatedAnAccountViewModel
 @{
     ViewBag.Title = "Have you already created your user account - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 <div class="govuk-grid-row">

diff --git a/GenderPayGap.WebUI/Views/AccountCreation/ConfirmEmailAddress.cshtml b/GenderPayGap.WebUI/Views/AccountCreation/ConfirmEmailAddress.cshtml
@@ -3,7 +3,6 @@
 @model GenderPayGap.WebUI.Models.AccountCreation.ConfirmEmailAddressViewModel
 @{
     ViewBag.Title = "Confirm your email address - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 <div class="govuk-grid-row">

diff --git a/GenderPayGap.WebUI/Views/AccountCreation/ConfirmationPage.cshtml b/GenderPayGap.WebUI/Views/AccountCreation/ConfirmationPage.cshtml
@@ -2,7 +2,6 @@
 @model GenderPayGap.WebUI.Models.AccountCreation.ConfirmEmailAddressViewModel
 @{
     ViewBag.Title = "You've confirmed your email address - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 <div class="govuk-grid-row">

diff --git a/GenderPayGap.WebUI/Views/AccountCreation/CreateUserAccount.cshtml b/GenderPayGap.WebUI/Views/AccountCreation/CreateUserAccount.cshtml
@@ -6,7 +6,6 @@
 @model GenderPayGap.WebUI.Models.AccountCreation.CreateUserAccountViewModel
 @{
     ViewBag.Title = "Create my account - Gender pay gap reporting service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @if (Model.IsPartOfGovUkReportingJourney)

diff --git a/GenderPayGap.WebUI/Views/AccountCreation/UserNotFoundErrorPage.cshtml b/GenderPayGap.WebUI/Views/AccountCreation/UserNotFoundErrorPage.cshtml
@@ -1,7 +1,6 @@
 @using GenderPayGap.Core.Helpers
 @{
     ViewBag.Title = "User not found - Gender pay gap reporting service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 <div class="govuk-grid-row">

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationChooseSector/ChooseSector.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationChooseSector/ChooseSector.cshtml
@@ -5,7 +5,6 @@
 @model GenderPayGap.WebUI.Models.AddOrganisation.AddOrganisationChooseSectorViewModel
 @{
     ViewBag.Title = "What type of employer do you want to add? - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationConfirmation/Confirmation.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationConfirmation/Confirmation.cshtml
@@ -18,8 +18,6 @@
     {
         ViewBag.Title = "We've got your details, we'll review them and email you to confirm - Gender pay gap service";
     }
-
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 <div class="govuk-grid-row">

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationEnterPin/EnterPin.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationEnterPin/EnterPin.cshtml
@@ -5,7 +5,6 @@
 
 @{
     ViewBag.Title = "Enter the PIN for this organisation - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationEnterPin/ServiceActivated.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationEnterPin/ServiceActivated.cshtml
@@ -4,7 +4,6 @@
 @{
     string encryptedOrganisationId = Encryption.EncryptQuerystring(Model.Organisation.OrganisationId.ToString());
 
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
     ViewBag.Title = "Service activated - Gender pay gap reporting service";
 }
 

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationFound/AlreadyRegistering.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationFound/AlreadyRegistering.cshtml
@@ -11,8 +11,6 @@
     ViewBag.Title = userOrg.PINConfirmedDate.HasValue
         ? "You are already registered - Gender pay gap service"
         : "You are already registering - Gender pay gap service";
-
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationFound/Found.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationFound/Found.cshtml
@@ -3,7 +3,6 @@
 @model GenderPayGap.WebUI.Models.AddOrganisation.AddOrganisationFoundViewModel
 @{
     ViewBag.Title = "Confirm your employer's details - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationManualAddress/ManualAddress.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationManualAddress/ManualAddress.cshtml
@@ -3,7 +3,6 @@
 @model GenderPayGap.WebUI.Models.AddOrganisation.AddOrganisationManualViewModel
 @{
     ViewBag.Title = "Registered address of employer - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationManualChooseSector/ManualChooseSector.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationManualChooseSector/ManualChooseSector.cshtml
@@ -5,7 +5,6 @@
 @model GenderPayGap.WebUI.Models.AddOrganisation.AddOrganisationManualViewModel
 @{
     ViewBag.Title = "What type of employer do you want to add? - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationManualConfirm/ManualConfirm.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationManualConfirm/ManualConfirm.cshtml
@@ -6,7 +6,6 @@
 @model GenderPayGap.WebUI.Models.AddOrganisation.AddOrganisationManualViewModel
 @{
     ViewBag.Title = "Confirm your employer's details - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @{

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationManualName/ManualName.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationManualName/ManualName.cshtml
@@ -3,7 +3,6 @@
 @model GenderPayGap.WebUI.Models.AddOrganisation.AddOrganisationManualViewModel
 @{
     ViewBag.Title = "Employer name - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationManualSicCodes/ManualSicCodes.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationManualSicCodes/ManualSicCodes.cshtml
@@ -4,7 +4,6 @@
 @model GenderPayGap.WebUI.Models.AddOrganisation.AddOrganisationManualViewModel
 @{
     ViewBag.Title = "Add a sector code to your employer - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AddOrganisationSearch/Search.cshtml b/GenderPayGap.WebUI/Views/AddOrganisationSearch/Search.cshtml
@@ -4,7 +4,6 @@
 @model GenderPayGap.WebUI.Models.AddOrganisation.AddOrganisationSearchViewModel
 @{
     ViewBag.Title = "Find employer - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/Admin/Search.cshtml b/GenderPayGap.WebUI/Views/Admin/Search.cshtml
@@ -6,7 +6,6 @@
 
 @{
     ViewBag.Title = "Search - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/Admin/SendPinConfirmation.cshtml b/GenderPayGap.WebUI/Views/Admin/SendPinConfirmation.cshtml
@@ -2,7 +2,6 @@
 
 @{
     ViewBag.Title = "Send PIN Confirmation - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 <div class="govuk-grid-row">

diff --git a/GenderPayGap.WebUI/Views/Admin/SendPinWarning.cshtml b/GenderPayGap.WebUI/Views/Admin/SendPinWarning.cshtml
@@ -5,7 +5,6 @@
 
 @{
     ViewBag.Title = "Send PIN Warning - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/Admin/UnconfirmedPins.cshtml b/GenderPayGap.WebUI/Views/Admin/UnconfirmedPins.cshtml
@@ -6,7 +6,6 @@
 
 @{
     ViewBag.Title = "Unconfirmed PINs in the Post - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/Admin/ViewAuditLogs.cshtml b/GenderPayGap.WebUI/Views/Admin/ViewAuditLogs.cshtml
@@ -11,7 +11,6 @@
             : Model.Organisation.OrganisationName;
 
     ViewBag.Title = $"Audit logs - {userOrOrganisationName} - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/Admin/ViewOrganisation.cshtml b/GenderPayGap.WebUI/Views/Admin/ViewOrganisation.cshtml
@@ -9,7 +9,6 @@
 
 @{
     ViewBag.Title = $"Organisation Details - {Model.Organisation.OrganisationName} - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/Admin/ViewUser.cshtml b/GenderPayGap.WebUI/Views/Admin/ViewUser.cshtml
@@ -9,7 +9,6 @@
 
 @{
     ViewBag.Title = "User Details - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AdminDataDashboard/DataDashboard.cshtml b/GenderPayGap.WebUI/Views/AdminDataDashboard/DataDashboard.cshtml
@@ -5,7 +5,6 @@
 @model GenderPayGap.WebUI.Models.Admin.AdminDashboardData
 @{
     ViewBag.Title = $"Data Dashboard - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
     const string wholeNumberFormat = "#,0";
     const string percentNumberFormat = "0.0";
 }

diff --git a/GenderPayGap.WebUI/Views/AdminDataDashboard/NotReported.cshtml b/GenderPayGap.WebUI/Views/AdminDataDashboard/NotReported.cshtml
@@ -7,7 +7,6 @@
 @model NotReportedViewModel
 @{
     ViewBag.Title = $"Data Dashboard - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AdminDataMigration/DataMigrationFromFile.cshtml b/GenderPayGap.WebUI/Views/AdminDataMigration/DataMigrationFromFile.cshtml
@@ -4,7 +4,6 @@
 @model GenderPayGap.WebUI.Models.Admin.AdminFileUploadViewModel
 @{
     ViewBag.Title = "Data Migration - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AdminDataMigration/DataMigrationFromRemoteServer.cshtml b/GenderPayGap.WebUI/Views/AdminDataMigration/DataMigrationFromRemoteServer.cshtml
@@ -4,7 +4,6 @@
 @model GenderPayGap.WebUI.Models.Admin.AdminDataMigrationViewModel
 @{
     ViewBag.Title = "Data Migration - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/...bUI/Views/AdminDatabaseIntegrityChecks/ActiveOrganisationsWithTheSameCompanyNumber.cshtml b/...bUI/Views/AdminDatabaseIntegrityChecks/ActiveOrganisationsWithTheSameCompanyNumber.cshtml
@@ -3,7 +3,6 @@
     var title = "Active organisations with the same company number";
 
     ViewBag.Title = $"{title} - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/...PayGap.WebUI/Views/AdminDatabaseIntegrityChecks/ActiveOrganisationsWithTheSameName.cshtml b/...PayGap.WebUI/Views/AdminDatabaseIntegrityChecks/ActiveOrganisationsWithTheSameName.cshtml
@@ -4,7 +4,6 @@
     var title = "Active organisations with the same name";
 
     ViewBag.Title = $"{title} - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/GenderPayGap.WebUI/Views/AdminDatabaseIntegrityChecks/DatabaseIntegrityChecks.cshtml b/GenderPayGap.WebUI/Views/AdminDatabaseIntegrityChecks/DatabaseIntegrityChecks.cshtml
@@ -3,7 +3,6 @@
 @using GenderPayGap.Core.Helpers
 @{
     ViewBag.Title = "Database integrity checks - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/...p.WebUI/Views/AdminDatabaseIntegrityChecks/NewOrActiveUsersWithTheSameEmailAddress.cshtml b/...p.WebUI/Views/AdminDatabaseIntegrityChecks/NewOrActiveUsersWithTheSameEmailAddress.cshtml
@@ -4,7 +4,6 @@
     var title = "New or Active users with the same email address";
 
     ViewBag.Title = $"{title} - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 
     List<string> duplicateEmailAddresses = Model
         .OrderBy(user => user.EmailAddress)

diff --git a/...ayGap.WebUI/Views/AdminDatabaseIntegrityChecks/OrganisationsToConsiderForDeScoping.cshtml b/...ayGap.WebUI/Views/AdminDatabaseIntegrityChecks/OrganisationsToConsiderForDeScoping.cshtml
@@ -7,7 +7,6 @@
     var title = "Organisations to consider for de-scoping";
 
     ViewBag.Title = $"{title} - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {

diff --git a/...ebUI/Views/AdminDatabaseIntegrityChecks/OrganisationsWhereLatestAddressIsNotActive.cshtml b/...ebUI/Views/AdminDatabaseIntegrityChecks/OrganisationsWhereLatestAddressIsNotActive.cshtml
@@ -5,7 +5,6 @@
     var title = "Organisations where the latest address is not active";
 
     ViewBag.Title = $"{title} - Administration - Gender pay gap service";
-    Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
 }
 
 @section BeforeMain {
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,8 +18,6 @@ @@
         {
             ViewBag.Title = "We've got your details, we'll review them and email you to confirm - Gender pay gap service";
         }
-        Layout = "~/Views/GovUkFrontend/GovUkFrontendLayout.cshtml";
     }
     <div class="govuk-grid-row">
@@ Expand Down @@