ER-936 CON-1007 Expand qualificiations width (#828) +semver: minor

SkillsFundingAgency · Nov 5, 2019 · b8fe001 · b8fe001
1 parent 1a6517c
commit b8fe001
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 48 deletions.
diff --git a/src/Employer/Employer.Web/Views/Shared/_EditVacancyPartial.cshtml b/src/Employer/Employer.Web/Views/Shared/_EditVacancyPartial.cshtml
@@ -77,14 +77,18 @@
     <div class="govuk-grid-column-one-half">
         <h3 class="govuk-heading-s">Desired skills and personal qualities</h3>
         <p class="govuk-body">@string.Join(", ", Model.Skills)</p>
-        <h3 class="govuk-heading-s">Qualifications</h3>
-        <p class="govuk-body">@Html.Raw(string.Join("<br />", Model.Qualifications))</p>
     </div>
     <div class="govuk-grid-column-one-half">
         <h3 class="govuk-heading-s">Things to consider</h3>
         <p class="govuk-body">@Model.ThingsToConsider</p>
     </div>
 </div>
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-full">
+        <h3 class="govuk-heading-s">Qualifications</h3>
+        <p class="govuk-body">@Html.Raw(string.Join("<br />", Model.Qualifications))</p>
+    </div>
+</div>
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
         <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">

diff --git a/src/Employer/Employer.Web/Views/Shared/_NonEditableVacancyDisplayPartial.cshtml b/src/Employer/Employer.Web/Views/Shared/_NonEditableVacancyDisplayPartial.cshtml
@@ -75,14 +75,18 @@
     <div class="govuk-grid-column-one-half">
         <h3 class="govuk-heading-s">Desired skills and personal qualities</h3>
         <p class="govuk-body">@string.Join(", ", Model.Skills)</p>
-        <h3 class="govuk-heading-s">Qualifications</h3>
-        <p class="govuk-body">@Html.Raw(string.Join("<br />", Model.Qualifications))</p>
     </div>
     <div class="govuk-grid-column-one-half">
         <h3 class="govuk-heading-s">Things to consider</h3>
         <p class="govuk-body">@Model.ThingsToConsider</p>
     </div>
 </div>
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-full">
+        <h3 class="govuk-heading-s">Qualifications</h3>
+        <p class="govuk-body">@Html.Raw(string.Join("<br />", Model.Qualifications))</p>
+    </div>
+</div>
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
         <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">

diff --git a/src/Employer/Employer.Web/Views/VacancyPreview/VacancyPreview.cshtml b/src/Employer/Employer.Web/Views/VacancyPreview/VacancyPreview.cshtml
@@ -263,6 +263,21 @@
             <p asp-show="@Model.HasSkills" class="govuk-body">@string.Join(", ", Model.Skills)</p>
             @EditLink(RouteNames.Skills_Get, Model.SkillsSectionState, "desired skills and personal qualities","link-skills")
         </div>
+    </div>
+    <div class="govuk-grid-column-one-half">
+        <div class="@GetSectionClass(Model.ThingsToConsiderSectionState)">
+            <h3 class="govuk-heading-s govuk-!-margin-top-4" id="@Anchors.ThingsToConsider">
+                <img asp-show="@Model.ThingsToConsiderRequiresEdit" src="/img/red-cross.png" />
+                Things to consider (optional)
+            </h3>
+            <span esfa-validation-message-for="ThingsToConsider" class="govuk-error-message"></span>
+            <p asp-show="@Model.HasThingsToConsider" class="govuk-body">@Model.ThingsToConsider</p>
+            @EditLink(RouteNames.Considerations_Get, Model.ThingsToConsiderSectionState, "things to consider","link-things-to-consider")
+        </div>
+    </div>
+</div>
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-full">
         <div class="@GetSectionClass(Model.QualificationsSectionState)">
             <h3 class="govuk-heading-s govuk-!-margin-top-4" id="@Anchors.Qualifications">
                 <img asp-show="@Model.QualificationsRequiresEdit" src="/img/red-cross.png" />
@@ -275,18 +290,7 @@
                     @qualification<br />
                 }
             </p>
-            @EditLink(RouteNames.Qualifications_Get, Model.QualificationsSectionState, "qualifications","link-qualifications")
-        </div>
-    </div>
-    <div class="govuk-grid-column-one-half">
-        <div class="@GetSectionClass(Model.ThingsToConsiderSectionState)">
-            <h3 class="govuk-heading-s govuk-!-margin-top-4" id="@Anchors.ThingsToConsider">
-                <img asp-show="@Model.ThingsToConsiderRequiresEdit" src="/img/red-cross.png" />
-                Things to consider (optional)
-            </h3>
-            <span esfa-validation-message-for="ThingsToConsider" class="govuk-error-message"></span>
-            <p asp-show="@Model.HasThingsToConsider" class="govuk-body">@Model.ThingsToConsider</p>
-            @EditLink(RouteNames.Considerations_Get, Model.ThingsToConsiderSectionState, "things to consider","link-things-to-consider")
+            @EditLink(RouteNames.Qualifications_Get, Model.QualificationsSectionState, "qualifications", "link-qualifications")
         </div>
     </div>
 </div>

diff --git a/src/Provider/Provider.Web/Views/Shared/_EditVacancyPartial.cshtml b/src/Provider/Provider.Web/Views/Shared/_EditVacancyPartial.cshtml
@@ -77,14 +77,18 @@
     <div class="govuk-grid-column-one-half">
         <h3 class="govuk-heading-s">Desired skills and personal qualities</h3>
         <p class="govuk-body">@string.Join(", ", Model.Skills)</p>
-        <h3 class="govuk-heading-s">Qualifications</h3>
-        <p class="govuk-body">@Html.Raw(string.Join("<br />", Model.Qualifications))</p>
     </div>
     <div class="govuk-grid-column-one-half">
         <h3 class="govuk-heading-s">Things to consider</h3>
         <p class="govuk-body">@Model.ThingsToConsider</p>
     </div>
 </div>
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-full">
+        <h3 class="govuk-heading-s">Qualifications</h3>
+        <p class="govuk-body">@Html.Raw(string.Join("<br />", Model.Qualifications))</p>
+    </div>
+</div>
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
         <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">

diff --git a/src/Provider/Provider.Web/Views/Shared/_NonEditableVacancyDisplayPartial.cshtml b/src/Provider/Provider.Web/Views/Shared/_NonEditableVacancyDisplayPartial.cshtml
@@ -75,14 +75,18 @@
     <div class="govuk-grid-column-one-half">
         <h3 class="govuk-heading-s">Desired skills and personal qualities</h3>
         <p class="govuk-body">@string.Join(", ", Model.Skills)</p>
-        <h3 class="govuk-heading-s">Qualifications</h3>
-        <p class="govuk-body">@Html.Raw(string.Join("<br />", Model.Qualifications))</p>
     </div>
     <div class="govuk-grid-column-one-half">
         <h3 class="govuk-heading-s">Things to consider</h3>
         <p class="govuk-body">@Model.ThingsToConsider</p>
     </div>
 </div>
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-full">
+        <h3 class="govuk-heading-s">Qualifications</h3>
+        <p class="govuk-body">@Html.Raw(string.Join("<br />", Model.Qualifications))</p>
+    </div>
+</div>
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
         <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">

diff --git a/src/Provider/Provider.Web/Views/VacancyPreview/VacancyPreview.cshtml b/src/Provider/Provider.Web/Views/VacancyPreview/VacancyPreview.cshtml
@@ -261,6 +261,21 @@
             <p asp-show="@Model.HasSkills" class="govuk-body">@string.Join(", ", Model.Skills)</p>
             @EditLink(RouteNames.Skills_Get, Model.SkillsSectionState, "desired skills and personal qualities", "link-skills")
         </div>
+    </div>
+    <div class="govuk-grid-column-one-half">
+        <div class="@GetSectionClass(Model.ThingsToConsiderSectionState)">
+            <h3 class="govuk-heading-s govuk-!-margin-top-4" id="@Anchors.ThingsToConsider">
+                <img asp-show="@Model.ThingsToConsiderRequiresEdit" src="/img/red-cross.png" />
+                Things to consider (optional)
+            </h3>
+            <span esfa-validation-message-for="ThingsToConsider" class="govuk-error-message"></span>
+            <p asp-show="@Model.HasThingsToConsider" class="govuk-body">@Model.ThingsToConsider</p>
+            @EditLink(RouteNames.Considerations_Get, Model.ThingsToConsiderSectionState, "things to consider", "link-things-to-consider")
+        </div>
+    </div>
+</div>
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-full">
         <div class="@GetSectionClass(Model.QualificationsSectionState)">
             <h3 class="govuk-heading-s govuk-!-margin-top-4" id="@Anchors.Qualifications">
                 <img asp-show="@Model.QualificationsRequiresEdit" src="/img/red-cross.png" />
@@ -276,17 +291,6 @@
             @EditLink(RouteNames.Qualifications_Get, Model.QualificationsSectionState, "qualifications", "link-qualifications")
         </div>
     </div>
-    <div class="govuk-grid-column-one-half">
-        <div class="@GetSectionClass(Model.ThingsToConsiderSectionState)">
-            <h3 class="govuk-heading-s govuk-!-margin-top-4" id="@Anchors.ThingsToConsider">
-                <img asp-show="@Model.ThingsToConsiderRequiresEdit" src="/img/red-cross.png" />
-                Things to consider (optional)
-            </h3>
-            <span esfa-validation-message-for="ThingsToConsider" class="govuk-error-message"></span>
-            <p asp-show="@Model.HasThingsToConsider" class="govuk-body">@Model.ThingsToConsider</p>
-            @EditLink(RouteNames.Considerations_Get, Model.ThingsToConsiderSectionState, "things to consider", "link-things-to-consider")
-        </div>
-    </div>
 </div>
 <div class="govuk-grid-row" id="@Anchors.AboutEmployerSection">
     <div class="govuk-grid-column-full">

diff --git a/src/QA/QA.Web/Views/Review/ReadonlyReview.cshtml b/src/QA/QA.Web/Views/Review/ReadonlyReview.cshtml
@@ -136,6 +136,16 @@
                 <h3 class="govuk-heading-s">Desired skills and personal qualities</h3>
                 <p class="govuk-body">@string.Join(", ", Model.Skills)</p>
             </div>
+        </div>
+        <div class="govuk-grid-column-one-half">
+            <div id="@Anchors.ThingsToConsider">
+                <h3 class="govuk-heading-s">Things to consider (optional)</h3>
+                <p class="govuk-body">@Model.ThingsToConsider</p>
+            </div>
+        </div>
+    </div>
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-full">
             <div id="@Anchors.Qualifications">
                 <h3 class="govuk-heading-s">Qualifications</h3>
                 <p class="govuk-body">
@@ -146,12 +156,6 @@
                 </p>
             </div>
         </div>
-        <div class="govuk-grid-column-one-half">
-            <div id="@Anchors.ThingsToConsider">
-                <h3 class="govuk-heading-s">Things to consider (optional)</h3>
-                <p class="govuk-body">@Model.ThingsToConsider</p>
-            </div>
-        </div>
     </div>
     <div class="govuk-grid-row" id="@Anchors.RequirementsAndProspectsSection">
         <div class="govuk-grid-column-full">

diff --git a/src/QA/QA.Web/Views/Review/Review.cshtml b/src/QA/QA.Web/Views/Review/Review.cshtml
@@ -225,6 +225,21 @@
                                           asp-value="@FieldIdentifiers.Skills"
                                           asp-items="@Model.FieldIdentifiers"></esfa-review-checkbox>
                 </div>
+            </div>
+            <div class="govuk-grid-column-one-half">
+                <div class="@Model.ThingsToConsiderClass" id="@FieldIdentifiers.ThingsToConsider">
+                    <h3 class="govuk-heading-s">Things to consider (optional)</h3>
+
+                    <p class="govuk-body">@Model.ThingsToConsider</p>
+
+                    <esfa-review-checkbox asp-for="SelectedFieldIdentifiers"
+                                          asp-value="@FieldIdentifiers.ThingsToConsider"
+                                          asp-items="@Model.FieldIdentifiers"></esfa-review-checkbox>
+                </div>
+            </div>
+        </div>
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-full">
                 <div class="@Model.QualificationsClass" id="@FieldIdentifiers.Qualifications">
                     <h3 class="govuk-heading-s">Qualifications</h3>
                     <p class="govuk-body">
@@ -238,17 +253,6 @@
                                           asp-items="@Model.FieldIdentifiers"></esfa-review-checkbox>
                 </div>
             </div>
-            <div class="govuk-grid-column-one-half">
-                <div class="@Model.ThingsToConsiderClass" id="@FieldIdentifiers.ThingsToConsider">
-                    <h3 class="govuk-heading-s">Things to consider (optional)</h3>
-
-                    <p class="govuk-body">@Model.ThingsToConsider</p>
-
-                    <esfa-review-checkbox asp-for="SelectedFieldIdentifiers"
-                                          asp-value="@FieldIdentifiers.ThingsToConsider"
-                                          asp-items="@Model.FieldIdentifiers"></esfa-review-checkbox>
-                </div>
-            </div>
         </div>
         <div class="govuk-grid-row" id="@Anchors.RequirementsAndProspectsSection">
             <div class="govuk-grid-column-full">