Merge branch 'CON-2406-provider-cookie-banner' of https://github.com/…

…SkillsFundingAgency/das-recruit into CON-2406-provider-cookie-banner

src/Employer/Employer.Web/Views/ApplicationReview/ApplicationReview.cshtml

@@ -3,6 +3,7 @@
 @model Esfa.Recruit.Shared.Web.ViewModels.ApplicationReview.ApplicationReviewViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-application-review";
+    ViewBag.Title = "Review application";
 }
 <div class="govuk-grid-row"> 
     <div class="govuk-grid-column-two-thirds">

src/Employer/Employer.Web/Views/ApplicationReview/ApplicationStatusConfirmation.cshtml

@@ -2,6 +2,7 @@
 
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-application-status-confirmation";
+    ViewBag.Title = Model.ShowStatusSuccessful ? "Are you sure you want to tell this applicant that they have been accepted?" : "Are you sure you want to tell this applicant that they have not been accepted?"; 
 }
 <div class="govuk-grid-row">    
     <div class="govuk-grid-column-two-thirds">

src/Employer/Employer.Web/Views/CloseVacancy/Close.cshtml

@@ -1,6 +1,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.CloseViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-close-vacancy";
+    ViewBag.Title = "Are you sure you want to close this advert on Find an apprenticeship?";
 }
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">

src/Employer/Employer.Web/Views/CreateVacancyOptions/Options.cshtml

@@ -1,6 +1,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.CreateVacancyOptions.CreateVacancyOptionsViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-create-vacancy-options";
+    ViewBag.Title = "Create an advert";
 }
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">

src/Employer/Employer.Web/Views/Dashboard/Dashboard.cshtml

@@ -11,6 +11,7 @@
     ViewBag.ShowReturnToMaLink = Model.FromMaHome;
     ViewBag.Vpv = "/recruitment/employer/page-dashboard";
     ViewBag.ZenDeskLabel = "recruit-recruitment";
+    ViewBag.Title = "Your apprenticeship adverts";
 }
 
 <partial asp-hide="@Model.HasAnyVacancies" name="_NoVacanciesContent" />

src/Employer/Employer.Web/Views/EditVacancyDates/EditVacancyDates.cshtml

@@ -1,6 +1,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.EditVacancyDates.EditVacancyDatesViewModel
 @{
     ViewBag.Vpv = "/recruitment/employer/page-edit-vacancy-dates";
+    ViewBag.Title = "Edit advert dates";
 }
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">

src/Employer/Employer.Web/Views/Error/ApplicationWithdrawn.cshtml

@@ -1,14 +1,15 @@
 @model string
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-application-withdrawn";
+    ViewBag.Title = "This application has been withdrawn by the candidate";
 }
 
 <div class="govuk-grid-row"> 
     <div class="govuk-grid-column-two-thirds">
         <h1 class="govuk-heading-xl govuk-!-margin-bottom-0">This application has been withdrawn by the candidate</h1>
 
         <p class="govuk-body govuk-!-margin-top-3">
-            <a href="@Model" class="govuk-button">Back to vacancy</a>
+            <a href="@Model" class="govuk-button">Back to advert</a>
         </p>
     </div>
 </div>

src/Employer/Employer.Web/Views/Error/Error.cshtml

@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = "Error";
+    ViewBag.Title = "There's been an error";
     ViewBag.ShowNav = false;
     ViewBag.Vpv = "/recruitment/employer/page-error";
 }

src/Employer/Employer.Web/Views/LegalEntityAgreement/LegalEntityAgreementHardStop.cshtml

@@ -1,21 +1,23 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.LegalEntityAgreement.LegalEntityAgreementHardStopViewModel
-@{ 
+@{
     ViewBag.Vpv = "/recruitment/employer/page-legal-entity-agreement-hard-stop";
+    ViewBag.Title = "You cannot submit this advert yet";
 }
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
         <div class="info-summary">
-            <h1 class="govuk-heading-m govuk-!-margin-top-0">You can’t submit this vacancy until:</h1>
-            <ul class="govuk-list govuk-list--bullet">
-                <li>You’ve signed an
-                    <a asp-route="@RouteNames.Dashboard_AccountsAgreements">apprenticeship agreement</a>
-                    with the Education and Skills Funding Agency</li>
-            </ul>
-            <p class="govuk-body">Your vacancy has been saved as a draft. Once the agreement has been signed, you will be able to
-                submit your vacancy for review.</p>
+            <h1 class="govuk-heading-m govuk-!-margin-top-0">You cannot submit this advert yet</h1>
+            <p class="govuk-body">
+                You can submit this advert once your organisation has accepted an
+                <a asp-route="@RouteNames.Dashboard_AccountsAgreements">employer agreement</a>
+                with the Education and Skills Funding Agency.
+            </p>
+            <p class="govuk-body">
+                Your advert has been saved as a draft. Once the agreement is accepted, you’ll be able to submit your advert for review.
+            </p>
         </div>
-            
+
         <a asp-route="@RouteNames.Dashboard_Get" class="govuk-button">Return to dashboard</a>
     </div>
 

src/Employer/Employer.Web/Views/LegalEntityAgreement/LegalEntityAgreementSoftStop.cshtml

@@ -1,32 +1,33 @@
 @using Esfa.Recruit.Shared.Web.Mappers
 @model Esfa.Recruit.Employer.Web.ViewModels.LegalEntityAgreement.LegalEntityAgreementSoftStopViewModel
-@{ 
-    ViewBag.Vpv = "/recruitment/employer/page-legal-entity-agreement-soft-stop";
-}
+@{ ViewBag.Vpv = "/recruitment/employer/page-legal-entity-agreement-soft-stop";
+    ViewBag.Title = "Agreement not accepted"; }
 
 <div class="govuk-grid-row employer-agreement-container">
     <div class="govuk-grid-column-two-thirds">
-        <h1 class="govuk-heading-l govuk-!-margin-bottom-8">Agreement not signed</h1>
+        <h1 class="govuk-heading-l govuk-!-margin-bottom-8">Agreement not accepted</h1>
 
         <div class="notice govuk-!-margin-bottom-8 govuk-warning-text">
             <span class="govuk-warning-text__icon das-warning-text__icon--top" aria-hidden="true">!</span>
-            
+
             <span class="govuk-warning-text__assistive">Warning</span>
             <p>
                 <strong class="govuk-warning-text__text">
-                    @Model.LegalEntityName doesn’t have a signed agreement with the Education and Skills Funding Agency (ESFA).
-                Without a signed agreement you can create a draft vacancy, but won’t be able to submit for posting on Find an apprenticeship.
+                    @Model.LegalEntityName does not have an accepted agreement with the Education and
+                    Skills Funding Agency (ESFA). Without an accepted agreement,
+                    you can create a draft advert, but cannot post it on Find an apprenticeship.
                 </strong>
             </p>
             <p>
                 <strong class="govuk-warning-text__text">
-                    Only account owners can sign ESFA agreements. If you’re not sure who the owner is, you can
-                <a asp-route="@RouteNames.Dashboard_AccountsAgreements" class="govuk-link">check your team details.</a>
+                    Only account owners can accept ESFA agreements. If you’re not sure who the owner is, you can
+                    <a asp-route="@RouteNames.Dashboard_AccountsAgreements" class="govuk-link">check your team details.</a>
                 </strong>
             </p>
         </div>
-
-        <a asp-route="@RouteNames.Dashboard_AccountsAgreements" class="govuk-button">Review agreement</a>        
-        <a asp-route="@RouteNames.Location_Get" class="govuk-link das-button-link">Continue anyway</a>
+        <a asp-route="@RouteNames.Dashboard_AccountsAgreements" class="govuk-button">Review agreement</a>
+        <div class="govuk-body">
+            <a asp-route="@RouteNames.Location_Get" class="govuk-link">Continue anyway</a>
+        </div>
     </div>
 </div>

src/Employer/Employer.Web/Views/Part1/Dates/Dates.cshtml

@@ -4,6 +4,7 @@
     var exampleClosingDate = DateTime.Now.AddMonths(2);
     var exampleStartingDate = exampleClosingDate.AddDays(14);
     ViewBag.Vpv = "/recruitment/employer/page-part1-dates";
+    ViewBag.Title = "Important dates";
     ViewBag.ZenDeskLabel = "recruit-important-dates";
 }
 

src/Employer/Employer.Web/Views/Part1/Duration/Duration.cshtml

@@ -3,6 +3,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.Part1.Duration.DurationViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-duration";
+    ViewBag.Title = "Duration and working hours";
     ViewBag.ZenDeskLabel = "recruit-duration-and-working-hours";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Part1/EmployerName/EmployerName.cshtml

@@ -3,6 +3,7 @@
 @model EmployerNameViewModel;
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-employer-name";
+    ViewBag.Title = "Which employer name do you want on your advert?";
     ViewBag.ZenDeskLabel = "recruit-what-employer-name-do-you-want-to-go-on-the-vacancy";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Part1/Location/Location.cshtml

@@ -4,6 +4,7 @@
 @inject IOptions<PostcodeAnywhereConfiguration> PcaConfig
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-location";
+    ViewBag.Title = "Where will the apprentice work?";
     ViewBag.ZenDeskLabel = "recruit-where-will-the-apprentice-work";
 }
 

src/Employer/Employer.Web/Views/Part1/NumberOfPositions/NumberOfPositions.cshtml

@@ -2,6 +2,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.Part1.NumberOfPositions.NumberOfPositionsViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-number-of-positions";
+    ViewBag.Title = "How many positions are there for this apprenticeship?";
     ViewBag.ZenDeskLabel = "recruit-how-many-positions-are-there-for-this-apprenticeship";
 }
 

src/Employer/Employer.Web/Views/Part1/Part1Complete/Part1Complete.cshtml

@@ -3,6 +3,7 @@
 @inject IOptions<ExternalLinksConfiguration> ExternalLinks
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-complete";
+    ViewBag.Title = "Preview your advert";
     ViewBag.ZenDeskLabel = "recruit-preview-your-vacancy";
 }
 

src/Employer/Employer.Web/Views/Part1/Title/Title.cshtml

@@ -3,6 +3,7 @@
 @inject ManageApprenticeshipsLinkHelper _externalLinksHelper;
 @{
     ViewBag.Vpv = "/recruitment/employer/page-part1-title";
+    ViewBag.Title = "What do you want to call this advert?";
     ViewBag.ZenDeskLabel = "recruit-what-do-you-want-to-call-this-vacancy";
 }
 

src/Employer/Employer.Web/Views/Part1/Training/ConfirmTraining.cshtml

@@ -2,6 +2,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.Part1.Training.ConfirmTrainingViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-confirm-training";
+    ViewBag.Title = "Confirm apprenticeship training";
     ViewBag.ZenDeskLabel = "recruit-confirm-apprenticeship-training";
 }
 

src/Employer/Employer.Web/Views/Part1/Training/Training.cshtml

@@ -4,6 +4,7 @@
 @inject IOptions<ExternalLinksConfiguration> externalLinks;
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-training";
+    ViewBag.Title = "What training will the apprentice take?";
     ViewBag.ZenDeskLabel = "recruit-what-training-will-the-apprentice-take";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Part1/Training/TrainingFirstVacancy.cshtml

@@ -1,6 +1,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.Part1.Training.TrainingFirstVacancyViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-training-first-vacancy";
+    ViewBag.Title = "Have you already found apprenticeship training?";
     ViewBag.ZenDeskLabel = "recruit-have-you-already-found-apprenticehip-training";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Part1/Training/TrainingHelp.cshtml

@@ -1,6 +1,7 @@
 @using Microsoft.Extensions.Options
 @inject IOptions<ExternalLinksConfiguration> externalLinks
 @{ 
+    ViewBag.Title = "Find apprenticeship training";
     ViewBag.Vpv = "/recruitment/employer/page-part1-training-help";
 }
 

src/Employer/Employer.Web/Views/Part1/TrainingProvider/ConfirmTrainingProvider.cshtml

@@ -2,6 +2,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.Part1.TrainingProvider.ConfirmTrainingProviderViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-confirm-training-provider";
+    ViewBag.Title = "Confirm the training provider";
     ViewBag.ZenDeskLabel = "recruit-confirm-the-training-provider";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Part1/TrainingProvider/SelectTrainingProvider.cshtml

@@ -7,6 +7,7 @@
 @model SelectTrainingProviderViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-select-training-provider";
+    ViewBag.Title = "Have you found a training provider?";
     ViewBag.ZenDeskLabel = "recruit-have-you-found-a-training-provider";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Part1/Wage/Wage.cshtml

@@ -5,6 +5,7 @@
 @inject IOptions<ExternalLinksConfiguration> externalLinks
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part1-wage";
+    ViewBag.Title = "How much would you like to pay the apprentice?";
     ViewBag.ZenDeskLabel = "recruit-how-much-would-you-like-to-pay-the-apprentice";
 }
 

src/Employer/Employer.Web/Views/Part2/Considerations/Considerations.cshtml

@@ -1,6 +1,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.ConsiderationsViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part2-considerations";
+    ViewBag.Title = "What else would you like the applicant to consider? (optional)";
     ViewBag.ZenDeskLabel = "recruit-what-else-would-you-like-the-applicant-to-consider";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Part2/EmployerContactDetails/EmployerContactDetails.cshtml

@@ -1,6 +1,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.EmployerContactDetailsViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part2-employer-contact-details";
+    ViewBag.Title = "Add employer contact information (optional)";
     ViewBag.ZenDeskLabel = "recruit-add-contact-information";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Part2/Qualifications/Qualification.cshtml

@@ -4,6 +4,7 @@
 @model QualificationViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part2-qualification";
+    ViewBag.Title = "What qualifications would you like the applicant to have?";
     ViewBag.ZenDeskLabel = "recruit-what-qualifications-would-you-like-the-applicant-to-have";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Part2/Qualifications/Qualifications.cshtml

@@ -1,6 +1,7 @@
 @using Esfa.Recruit.Shared.Web.Mappers
 @model Esfa.Recruit.Employer.Web.ViewModels.Part2.Qualifications.QualificationsViewModel
 @{ 
+    ViewBag.Title = "Qualifications";
     ViewBag.Vpv = "/recruitment/employer/page-part2-qualifications";
 }
 

src/Employer/Employer.Web/Views/Part2/ShortDescription/ShortDescription.cshtml

@@ -1,6 +1,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.Part2.ShortDescription.ShortDescriptionViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part2-short-description";
+    ViewBag.Title = "Short description of the apprenticeship";
     ViewBag.ZenDeskLabel = "recruit-short-description-of-the-apprenticeship";
 }
 

src/Employer/Employer.Web/Views/Part2/Skills/Skills.cshtml

@@ -3,6 +3,7 @@
 @model SkillsViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part2-skills";
+    ViewBag.Title = "What skills and personal qualities would you like the applicant to have?";
     ViewBag.ZenDeskLabel = "recruit-which-skills-and-personal-qualities-would-you-like-the-applicant-to-have";
 }
 
@@ -15,7 +16,7 @@
 
         <h1 class="govuk-heading-xl">
             <span class="govuk-caption-l">@Model.Title</span>
-            Which skills and personal qualities would you like the applicant to have?
+            What skills and personal qualities would you like the applicant to have?
         </h1>
 
         <form asp-route="@RouteNames.Skills_Post" id="skillsForm">

src/Employer/Employer.Web/Views/Part2/VacancyDescription/VacancyDescription.cshtml

@@ -1,6 +1,7 @@
 @model Esfa.Recruit.Employer.Web.ViewModels.Part2.VacancyDescription.VacancyDescriptionViewModel
 @{ 
     ViewBag.Vpv = "/recruitment/employer/page-part2-vacancy-description";
+    ViewBag.Title = "Description of the apprenticeship";
     ViewBag.ZenDeskLabel = "recruit-description-of-the-apprenticeship";
 }
 <div class="govuk-grid-row">

src/Employer/Employer.Web/Views/Shared/_EditVacancyPartial.cshtml

@@ -5,7 +5,7 @@
         <p class="preserve-format">@Model.ShortDescription</p>
     </div>
     <div class="govuk-grid-column-one-third" id="closingDateSection">
-        <h3 class="govuk-heading-s govuk-!-margin-top-0">Closing Date</h3>
+        <h3 class="govuk-heading-s govuk-!-margin-top-0">Closing date</h3>
         <p id="vacancy-closing-date">@Model.DisplayableClosingDate</p>
         <a class="govuk-body govuk-link" asp-route="@RouteNames.VacancyEditDates_Get" esfa-automation="edit-closing-date">Edit</a>
     </div>
@@ -105,8 +105,10 @@
         <p class="govuk-body">@Model.EmployerDescription</p>
         <h3 class="govuk-heading-s">Employer</h3>
         <p class="govuk-body">@Model.EmployerName</p>
-        <img asp-show="@Model.IsDisabilityConfident" src="~/img/disability-confident_545x172.png" class="disability-confident-logo" alt="A logo confirming that the employer is registered as disability confident" />
-        <span class="govuk-visually-hidden">This vacancy meets disability confident requirements</span>
+        <div asp-show="@Model.IsDisabilityConfident">
+            <img src="~/img/disability-confident_545x172.png" class="disability-confident-logo" alt="A logo confirming that the employer is registered as disability confident" />
+            <span class="govuk-visually-hidden">This advert meets disability confident requirements</span>
+        </div>
         <h3 class="govuk-heading-s">Website</h3>
         <div asp-show="@Model.HasEmployerWebsiteUrl">
             <div asp-show="@Model.IsAnonymous" class="govuk-hint">Website will not be shown as the employer is anonymous</div>

src/Employer/Employer.Web/Views/Shared/_Layout.cshtml

@@ -15,9 +15,9 @@
 
     public string GetTitle()
     {
-        const string defaultTitle = "Recruit an Apprentice";
+        const string defaultTitle = "Recruit an Apprentice - Apprenticeship service - GOV.UK";
         if (ViewBag.Title != null)
-            return $"{ViewBag.Title}";
+            return $"{ViewBag.Title} - Apprenticeship service - GOV.UK";
 
         return defaultTitle;
     }

src/Employer/Employer.Web/Views/Shared/_LayoutWithoutNavigation.cshtml

@@ -15,9 +15,9 @@ public bool ParseHideNavFromViewBag()
 
 public string GetTitle()
 {
-    const string defaultTitle = "Recruit an Apprentice";
+    const string defaultTitle = "Recruit an Apprentice - Apprenticeship service - GOV.UK";
     if (ViewBag.Title != null)
-        return $"{defaultTitle} | {ViewBag.Title}";
+        return $"{ViewBag.Title} - Apprenticeship service - GOV.UK";
 
     return defaultTitle;
 }

src/Employer/Employer.Web/Views/Shared/_NonEditableVacancyDisplayPartial.cshtml

@@ -5,7 +5,7 @@
         <p class="govuk-body">@Model.ShortDescription</p>
     </div>
     <div class="govuk-grid-column-one-third">
-        <h3 class="govuk-heading-s govuk-!-margin-top-0">Closing Date</h3>
+        <h3 class="govuk-heading-s govuk-!-margin-top-0">Closing date</h3>
         <p class="govuk-body" id="vacancy-closing-date">@Model.ClosingDate</p>
     </div>
 </div>
@@ -103,8 +103,10 @@
         <p class="govuk-body">@Model.EmployerDescription</p>
         <h3 class="govuk-heading-s">Employer</h3>
         <p class="govuk-body">@Model.EmployerName</p>
-        <img asp-show="@Model.IsDisabilityConfident" src="~/img/disability-confident_545x172.png" class="disability-confident-logo" alt="A logo confirming that the employer is registered as disability confident" />
-        <span class="govuk-visually-hidden">This vacancy meets disability confident requirements</span>
+        <div asp-show="@Model.IsDisabilityConfident">
+            <img src="~/img/disability-confident_545x172.png" class="disability-confident-logo" alt="A logo confirming that the employer is registered as disability confident" />
+            <span class="govuk-visually-hidden">This advert meets disability confident requirements</span>
+        </div>
         <h3 class="govuk-heading-s">Website</h3>
         <div asp-show="@Model.HasEmployerWebsiteUrl">
             <div asp-show="@Model.IsAnonymous" class="govuk-hint">Website will not be shown as the employer is anonymous</div>