Merge pull request #908 from SkillsFundingAgency/CON-2093-change-to-a…

…dvert CON-2093-make content changes.
SkillsFundingAgency · Jul 31, 2020 · e647412 · e647412
2 parents ac40d3d + 6bad7fc
commit e647412
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/src/Employer/Employer.Web/ViewModels/ValidationMessages.cs b/src/Employer/Employer.Web/ViewModels/ValidationMessages.cs
@@ -8,7 +8,7 @@ public static class LocationPreferenceMessages
         }
         public static class EmployerSelectionValidationMessages
         {
-            public const string EmployerSelectionRequired = "You must select an organisation.";
+            public const string EmployerSelectionRequired = "Select the organisation this advert is for";
         }
 
         public static class TrainingFirstVacancyValidationMessages

diff --git a/src/Employer/Employer.Web/Views/Part1/Employer/Employer.cshtml b/src/Employer/Employer.Web/Views/Part1/Employer/Employer.cshtml
@@ -1,21 +1,19 @@
-@using Microsoft.Extensions.Options;
-@using Esfa.Recruit.Shared.Web.Configuration;
 @using Esfa.Recruit.Employer.Web.ViewModels.Part1.Employer;
-@using Esfa.Recruit.Shared.Web.Mappers
 @model EmployerViewModel;
-@{ 
+@{
     ViewBag.Vpv = "/recruitment/employer/page-part1-employer";
     ViewBag.ZenDeskLabel = "recruit-which-organisation-is-this-vacancy-for";
+    ViewBag.Title = "Which organisation is this advert for?";
 }
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
         <a asp-show="@Model.PageInfo.IsWizard" asp-route="@RouteNames.NumberOfPositions_Get" asp-route-wizard="@Model.PageInfo.IsWizard" esfa-automation="link-back" class="govuk-back-link govuk-!-margin-top-0 govuk-!-margin-bottom-6">Back</a>
 
-        <partial name="@PartialNames.ValidationSummary" model='new ValidationSummaryViewModel { ModelState = ViewData.ModelState, OrderedFieldNames = Model.OrderedFieldNames }'/>
+        <partial name="@PartialNames.ValidationSummary" model='new ValidationSummaryViewModel { ModelState = ViewData.ModelState, OrderedFieldNames = Model.OrderedFieldNames }' />
 
-        <partial name="@PartialNames.ReviewSummary" for="Review"/>
+        <partial name="@PartialNames.ReviewSummary" for="Review" />
 
-        <h1 class="govuk-heading-xl govuk-!-margin-bottom-6">Which organisation is this vacancy for?</h1>
+        <h1 class="govuk-heading-xl govuk-!-margin-bottom-6">Which organisation is this advert for?</h1>
 
         <form asp-show="@Model.CanShowSearchPanel" method="GET" asp-route="@RouteNames.Employer_Get" asp-route-wizard="@Model.PageInfo.IsWizard">
             <div class="form-group search-field search-field-darker">
@@ -41,29 +39,26 @@
         <form asp-route="@RouteNames.Employer_Post" asp-route-wizard="@Model.PageInfo.IsWizard">
             <div esfa-validation-marker-for="SelectedOrganisationId" class="govuk-form-group">
                 <fieldset class="govuk-fieldset">
-                    <legend class="govuk-fieldset__legend">
-                        <span asp-hide="@Model.HasNoSearchResults" class="govuk-label govuk-!-font-weight-bold">Which organisation is the vacancy for?</span>
-                    </legend>
                     <span esfa-validation-message-for="SelectedOrganisationId" class="govuk-error-message"></span>
                     <input type="hidden" asp-for="SearchTerm" />
                     <input type="hidden" asp-for="Page" />
                     <span asp-show="@Model.HasNoSearchResults" class="govuk-body">@Model.NoSearchResultsCaption</span>
                     <div class="govuk-radios">
-                    @foreach (var organisation in Model.Organisations)
-                    {
-                        <div class="govuk-radios__item">
-                            <input asp-for="SelectedOrganisationId" type="radio" value="@organisation.Id" class="govuk-radios__input" id="[email protected]" esfa-automation="selected-organisation-id">
-                            <label for="[email protected]" class="govuk-label govuk-radios__label">@organisation.Name</label>
-                        </div>
-                    }
+                        @foreach (var organisation in Model.Organisations)
+                        {
+                            <div class="govuk-radios__item">
+                                <input asp-for="SelectedOrganisationId" type="radio" value="@organisation.Id" class="govuk-radios__input" id="[email protected]" esfa-automation="selected-organisation-id">
+                                <label for="[email protected]" class="govuk-label govuk-radios__label">@organisation.Name</label>
+                            </div>
+                        }
                         <input asp-show="@Model.CanOutputHiddenSelectedOrganisationIdField" type="hidden" asp-for="SelectedOrganisationId" />
                     </div>
                 </fieldset>
             </div>
 
             <partial name="@PartialNames.Pager" model="@Model.Pager" />
 
-            <button type="submit" class="govuk-button save-button" esfa-automation="continue-button">Continue</button>
+            <button type="submit" class="govuk-button save-button" esfa-automation="continue-button">Save and continue</button>
             <div class="govuk-body">
                 <a asp-route="@RouteNames.Employer_Cancel" asp-route-wizard="@Model.PageInfo.IsWizard" class="govuk-link">Cancel</a>
             </div>