Merge pull request #901 from SkillsFundingAgency/RecruitTickets

Recruit tickets
SkillsFundingAgency · Jul 14, 2020 · e17219f · e17219f
2 parents 7806017 + 415d55c
commit e17219f
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 32 deletions.
diff --git a/src/Employer/Employer.Web/Views/Part1/Training/TrainingHelp.cshtml b/src/Employer/Employer.Web/Views/Part1/Training/TrainingHelp.cshtml
@@ -21,6 +21,9 @@
         </p>
 
         <a class="govuk-button" href="@externalLinks.Value.FindApprenticeshipTrainingUrl">Find apprenticeship training</a>
-        <a asp-route="@RouteNames.Vacancies_Get" class="govuk-link das-button-link">Return to dashboard</a>
+
+        <div class="govuk-body">
+            <a asp-route="@RouteNames.Vacancies_Get" class="govuk-link">Return to dashboard</a>
+        </div>
     </div>
 </div>
diff --git a/src/Employer/Employer.Web/Views/Part2/Considerations/Considerations.cshtml b/src/Employer/Employer.Web/Views/Part2/Considerations/Considerations.cshtml
@@ -18,15 +18,17 @@
         <form asp-route="@RouteNames.Considerations_Post">
             <div esfa-validation-marker-for="ThingsToConsider" class="govuk-form-group">
                 <label asp-for="ThingsToConsider" class="govuk-visually-hidden">Things to consider (optional)</label>
-                <span class="govuk-hint">For example, if the vacancy will involve working outdoors, or lifting heavy objects</span>
+                <span class="govuk-hint">For example, the apprenticeship will involve working outdoors or lifting heavy objects.</span>
                 <span esfa-validation-message-for="ThingsToConsider" class="govuk-error-message"></span>
                 <textarea asp-for="ThingsToConsider" class="govuk-textarea character-count" rows="5" data-val-length-max="350"></textarea>
                 <span class="govuk-body maxchar-count">350</span>
                 <span class="govuk-body maxchar-text"> characters remaining</span>
             </div>
             <div class="govuk-form-group">
                 <input type="submit" value="Save and continue" esfa-automation="btn-continue" class="govuk-button save-button" />
-                <a asp-route="@RouteNames.Vacancy_Preview_Get" esfa-automation="link-cancel" class="govuk-link das-button-link">Cancel</a>
+                <p class="govuk-body">
+                    <a asp-route="@RouteNames.Vacancy_Preview_Get" esfa-automation="link-cancel" class="govuk-link">Cancel</a>
+                </p>
             </div>
         </form>
     </div>

diff --git a/src/Employer/Employer.Web/Views/Part2/EmployerContactDetails/EmployerContactDetails.cshtml b/src/Employer/Employer.Web/Views/Part2/EmployerContactDetails/EmployerContactDetails.cshtml
@@ -31,7 +31,10 @@
             </div>
             <div class="govuk-form-group">
                 <input type="submit" value="Save and continue" esfa-automation="btn-continue" class="govuk-button save-button" />
-                <a asp-route="@RouteNames.Vacancy_Preview_Get" esfa-automation="link-cancel" class="govuk-link das-button-link">Cancel</a>
+
+                <div class="govuk-body">
+                    <a asp-route="@RouteNames.Vacancy_Preview_Get" esfa-automation="link-cancel" class="govuk-link">Cancel</a>
+                </div>
             </div>
         </form>
     </div>

diff --git a/src/Employer/Employer.Web/Views/Part2/Qualifications/Qualifications.cshtml b/src/Employer/Employer.Web/Views/Part2/Qualifications/Qualifications.cshtml
@@ -24,37 +24,38 @@
                 {
                     var qualification = Model.Qualifications[i];
 
-                <tr class="govuk-table__row" role="row">
-                    <td class="govuk-table__cell" role="gridcell">
-                        <span class="govuk-visually-hidden" aria-hidden="true">Qualification</span>
-                        @qualification.QualificationType in @qualification.Subject
-                    </td>
-                    <td class="govuk-table__cell" role="gridcell">
-                        <span class="govuk-visually-hidden" aria-hidden="true">Grade</span>
-                        @qualification.Grade
-                    </td>
-                    <td class="govuk-table__cell" role="gridcell">
-                        <span class="govuk-visually-hidden" aria-hidden="true">Essential or Desirable</span>
-                        @qualification.Weighting.GetDisplayName()
-                    </td>
-                    <td class="govuk-table__cell" role="gridcell">
-                        <form asp-route="@RouteNames.Qualification_Delete_Post" class="govuk-!-display-inline">
-                            <input type="hidden" name="index" value="@i" />
-                            <button type="submit" class="button-fake-link govuk-link">Remove</button>
-                        </form>
-                        <a asp-route="@RouteNames.Qualification_Edit_Get" asp-route-index="@i" class="govuk-link govuk-!-margin-left-1">Edit</a>
-                    </td>
-                </tr>
+                    <tr class="govuk-table__row" role="row">
+                        <td class="govuk-table__cell" role="gridcell">
+                            <span class="govuk-visually-hidden" aria-hidden="true">Qualification</span>
+                            @qualification.QualificationType in @qualification.Subject
+                        </td>
+                        <td class="govuk-table__cell" role="gridcell">
+                            <span class="govuk-visually-hidden" aria-hidden="true">Grade</span>
+                            @qualification.Grade
+                        </td>
+                        <td class="govuk-table__cell" role="gridcell">
+                            <span class="govuk-visually-hidden" aria-hidden="true">Essential or Desirable</span>
+                            @qualification.Weighting.GetDisplayName()
+                        </td>
+                        <td class="govuk-table__cell" role="gridcell">
+                            <form asp-route="@RouteNames.Qualification_Delete_Post" class="govuk-!-display-inline">
+                                <input type="hidden" name="index" value="@i" />
+                                <button type="submit" class="button-fake-link govuk-link">Remove</button>
+                            </form>
+                            <a asp-route="@RouteNames.Qualification_Edit_Get" asp-route-index="@i" class="govuk-link govuk-!-margin-left-1">Edit</a>
+                        </td>
+                    </tr>
                 }
             </tbody>
         </table>
 
-        <p class="govuk-body">
-            <a asp-route="@RouteNames.Qualification_Add_Get" class="govuk-link">Add another qualification</a>
-        </p>
-
         <div class="govuk-form-group">
-            <a asp-route="@RouteNames.Vacancy_Preview_Get" class="govuk-button">Preview</a>
+            <a asp-route="@RouteNames.Qualification_Add_Get" class="govuk-button">Add another qualification</a>
+
+            <div class="govuk-body">
+                <a asp-route="@RouteNames.Vacancy_Preview_Get" class="govuk-link">Preview advert</a>
+            </div>
         </div>
+
     </div>
 </div>
diff --git a/src/Shared/Recruit.Vacancies.Client/Application/Validation/Fluent/ContactDetailValidator.cs b/src/Shared/Recruit.Vacancies.Client/Application/Validation/Fluent/ContactDetailValidator.cs
@@ -16,7 +16,7 @@ internal ContactDetailValidator(long ruleId, IProfanityListProvider profanityLis
                     .WithMessage("Contact name contains some invalid characters")
                     .WithErrorCode("91")
                 .ProfanityCheck(profanityListProvider)
-                .WithMessage("Contact name must not contain a banned word or phrase.")
+                .WithMessage("Contact name must not contain a banned word or phrase")
                 .WithErrorCode("615")
                 .WithRuleId(ruleId);
 
@@ -32,7 +32,7 @@ internal ContactDetailValidator(long ruleId, IProfanityListProvider profanityLis
                     .WithErrorCode("94")
                     .When(v => !string.IsNullOrEmpty(v.Email))
                 .ProfanityCheck(profanityListProvider)
-                .WithMessage("Email address must not contain a banned word or phrase.")
+                .WithMessage("Email address must not contain a banned word or phrase")
                 .WithErrorCode("616")
                 .WithRuleId(ruleId);