CON-2285-content changes (#928)

* CON-2285-content changes * CON-2285-remove list * CON-2285-changed disability content * CON-2285-cleanup * CON-2285-Adds disability confident span * CON-2285 Capitalisation * CON-2285 Capitalisation * CON-2285-fix Co-authored-by: reachash <[email protected]> Co-authored-by: Ben Stone <[email protected]>
SkillsFundingAgency · Oct 5, 2020 · 157b913 · 157b913
1 parent 9448b42
commit 157b913
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 43 deletions.
diff --git a/src/Employer/Employer.Web/Views/Error/ApplicationWithdrawn.cshtml b/src/Employer/Employer.Web/Views/Error/ApplicationWithdrawn.cshtml
@@ -9,7 +9,7 @@
         <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>
diff --git a/src/Employer/Employer.Web/Views/LegalEntityAgreement/LegalEntityAgreementHardStop.cshtml b/src/Employer/Employer.Web/Views/LegalEntityAgreement/LegalEntityAgreementHardStop.cshtml
@@ -1,22 +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>
 

diff --git a/src/Employer/Employer.Web/Views/LegalEntityAgreement/LegalEntityAgreementSoftStop.cshtml b/src/Employer/Employer.Web/Views/LegalEntityAgreement/LegalEntityAgreementSoftStop.cshtml
@@ -1,33 +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.Title = "Agreement not accepted";
-}
+@{ 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>
diff --git a/src/Employer/Employer.Web/Views/Shared/_EditVacancyPartial.cshtml b/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>

diff --git a/src/Employer/Employer.Web/Views/Shared/_NonEditableVacancyDisplayPartial.cshtml b/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>

diff --git a/src/Employer/Employer.Web/Views/Shared/_ReviewSummaryPartial.cshtml b/src/Employer/Employer.Web/Views/Shared/_ReviewSummaryPartial.cshtml
@@ -5,7 +5,7 @@
         <img src="/img/red-cross.png" class="red-cross-logo" alt="red cross">Edits needed
     </h2>
     <div class="govuk-error-summary__body">
-        <p class="govuk-body">Call us on @RecruitViewConstants.HelpdeskPhoneNumber and select the employer option if you need to discuss any of our vacancy review comments.</p>
+        <p class="govuk-body">Call us on @RecruitViewConstants.HelpdeskPhoneNumber and select the employer option if you need to discuss any of our advert review comments.</p>
         <p class="govuk-body">@Model.ReviewerComments</p>    
         <ul class="govuk-list govuk-error-summary__list">
             @foreach (var fieldIndicator in Model.FieldIndicators)

diff --git a/src/Employer/Employer.Web/Views/Shared/_VacancySummaryDisplayPartial.cshtml b/src/Employer/Employer.Web/Views/Shared/_VacancySummaryDisplayPartial.cshtml
@@ -23,12 +23,12 @@
     <div asp-show="Model.IsDisabilityConfident" class="govuk-grid-row" >
         <div class="govuk-grid-column-two-thirds govuk-!-margin-bottom-6">
             <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 vacancy meets disability confident requirements</span>
+            <span class="govuk-visually-hidden">This advert meets disability confident requirements</span>
         </div>
     </div>
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds">
-            <a asp-route="@RouteNames.DisplayFullVacancy_Get" title="View full vacancy" target="_blank" class="govuk-link">View full vacancy</a>
+            <a asp-route="@RouteNames.DisplayFullVacancy_Get" title="View full advert" target="_blank" class="govuk-link">View full advert</a>
         </div>
     </div>
 </div>
diff --git a/src/Employer/Employer.Web/Views/VacancyManage/EditVacancy.cshtml b/src/Employer/Employer.Web/Views/VacancyManage/EditVacancy.cshtml
@@ -33,6 +33,6 @@
             <button type="submit" class="govuk-button save-button">Publish</button>
         </form>
         <a asp-show="@Model.HasChanges" asp-route="@RouteNames.CancelVacancyChanges_Get" class="govuk-link das-button-link">Cancel</a>
-        <a asp-show="@Model.IsUnchanged" asp-route="@RouteNames.VacancyManage_Get" class="govuk-button">Return to manage vacancy</a>
+        <a asp-show="@Model.IsUnchanged" asp-route="@RouteNames.VacancyManage_Get" class="govuk-button">Return to manage advert</a>
     </div>
 </div>    
diff --git a/src/Employer/Employer.Web/Views/VacancyPreview/VacancyPreview.cshtml b/src/Employer/Employer.Web/Views/VacancyPreview/VacancyPreview.cshtml
@@ -337,6 +337,8 @@
                 Disability Confident (optional)
             </h3>
             <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" esfa-automation="disability-confident-logo" />
+            <span asp-show="@Model.IsDisabilityConfident" class="govuk-visually-hidden">This advert meets disability confident requirements</span>
+
             <partial name="@PartialNames.DisabilityConfident" for="IsDisabilityConfident" />
             <p asp-show="@Model.IsNotDisabilityConfident" class="govuk-hint">This advert is not Disability Confident<br />This will not appear on the advert when it goes live</p>
             @EditLink(RouteNames.Dates_Get, Model.TrainingSectionState, "disability confident", "link-standard", new { wizard = false })

diff --git a/src/Shared/Recruit.Shared.Web/ViewModels/ErrorMessages.cs b/src/Shared/Recruit.Shared.Web/ViewModels/ErrorMessages.cs
@@ -2,12 +2,12 @@
 {
     public class ErrorMessages
     {
-        public const string VacancyCannotBeViewed = "The vacancy '{0}' can't be viewed.";
-        public const string VacancyNotAvailableForEditing = "The vacancy '{0}' has been edited by one of your colleagues. Your changes have not been saved.";
-        public const string VacancyNotAvailableForClosing = "The vacancy '{0}' cannot be closed as it is not currently published.";
-        public const string VacancyNotAvailableForCloning = "The vacancy '{0}' cannot be cloned.";
-        public const string VacancyNotSubmittedSuccessfully = "The vacancy '{0}' has not been submitted successfully.";
-        public const string VacancyDatesCannotBeEdited = "The dates of vacancy '{0}' can't be edited.";
-        public const string CannotCloneVacancyWithSameDates = "The vacancy '{0}' has a closing date or start date that is in the past.";
+        public const string VacancyCannotBeViewed = "The advert '{0}' can't be viewed.";
+        public const string VacancyNotAvailableForEditing = "The advert '{0}' has been edited by one of your colleagues. Your changes have not been saved.";
+        public const string VacancyNotAvailableForClosing = "The advert '{0}' cannot be closed as it is not currently published.";
+        public const string VacancyNotAvailableForCloning = "The advert '{0}' cannot be cloned.";
+        public const string VacancyNotSubmittedSuccessfully = "The advert '{0}' has not been submitted successfully.";
+        public const string VacancyDatesCannotBeEdited = "The dates of advert '{0}' can't be edited.";
+        public const string CannotCloneVacancyWithSameDates = "The advert '{0}' has a closing date or start date that is in the past.";
     }
 }
diff --git a/src/Shared/Recruit.Shared.Web/Views/Shared/_DisabilityConfidentPartial.cshtml b/src/Shared/Recruit.Shared.Web/Views/Shared/_DisabilityConfidentPartial.cshtml
@@ -2,10 +2,10 @@
 
 <details asp-show="@Model" class="govuk-details" role="group">
     <summary class="govuk-details__summary" role="button" aria-controls="disability-confident-explanation" aria-expanded="false">
-        <span class="govuk-details__summary-text">About disability confident</span>
+        <span class="govuk-details__summary-text">About Disability Confident</span>
     </summary>
     <div class="govuk-details__text">
-        <p class="govuk-body">Disabled candidates are generally guaranteed an interview if you meet the minimum requirements for this vacancy. Contact the employer for full details.</p>
+        <p class="govuk-body">Disabled candidates who meet the minimum requirements for this apprenticeship are generally guaranteed an interview. Contact the employer for full details.</p>
 
         <p class="govuk-body">Employers may need to limit the number of interviews offered to both disabled and non-disabled people if they receive high numbers of applications.</p>