Merge pull request #172 from SkillsFundingAgency/MF-337_BackLinkBug

MF-337 MF-328
SkillsFundingAgency · Oct 28, 2019 · b9803c8 · b9803c8
2 parents 9a439de + 1088b02
commit b9803c8
Show file tree

Hide file tree

Showing 19 changed files with 66 additions and 51 deletions.
diff --git a/src/SFA.DAS.Reservations.Web/Views/EmployerReservations/CourseGuidance.cshtml b/src/SFA.DAS.Reservations.Web/Views/EmployerReservations/CourseGuidance.cshtml
@@ -1,6 +1,6 @@
 @model CourseGuidanceViewModel
 @{
-    ViewData["Title"] = "Reservations - Select Course Guidance";
+    ViewData["Title"] = "You must select a course to reserve apprenticeship funding";
 }
 
 

diff --git a/...SFA.DAS.Reservations.Web/Views/EmployerReservations/FundingRestrictionNotification.cshtml b/...SFA.DAS.Reservations.Web/Views/EmployerReservations/FundingRestrictionNotification.cshtml
@@ -1,44 +1,53 @@
-@using SFA.DAS.Reservations.Web.Infrastructure
+@using SFA.DAS.Reservations.Web.Infrastructure
 @model FundingRestrictionNotificationViewModel
 
-<main class="govuk-main-wrapper " id="main-content" role="main">
-    @if (!string.IsNullOrEmpty(Model.BackLink))
-    {
-        if (Model.BackLink.StartsWith("http"))
-        {
-            <a href="@Model.BackLink" class="govuk-back-link">Back</a>
-        }
-        else
-        {
-            <a asp-route="@Model.BackLink" class="govuk-back-link">Back</a>
-        }
+@{
+    ViewData["Title"] = "Upcoming change to government-funded training";
+}
 
+@if (!string.IsNullOrEmpty(Model.BackLink))
+{
+    if (Model.BackLink.StartsWith("http"))
+    {
+        <a href="@Model.BackLink" class="govuk-back-link">Back</a>
+    }
+    else
+    {
+        <a asp-route="@Model.BackLink" class="govuk-back-link">Back</a>
     }
 
+}
+
+<main class="govuk-main-wrapper " id="main-content" role="main">
+
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds">
             <div class="das-panel das-panel--featured">
                 <h1 class="das-panel__heading">
                     Upcoming change to government-funded training
                 </h1>
-                <p>Government funding for apprenticeship training will be paused on @Model.RestrictionStartDate.ToString("d MMMM yyyy"). 
-                    You must reserve funding for your training before this date.</p>
+                <p>
+                    Government funding for apprenticeship training will be paused on @Model.RestrictionStartDate.ToString("d MMMM yyyy").
+                    You must reserve funding for your training before this date.
+                </p>
                 <p>This change will not affect funding reserved before @Model.RestrictionStartDate.ToString("d MMMM yyyy")</p>
-                
+
                 <form asp-route="@RouteNames.EmployerSaveRuleNotificationChoice">
                     <input type="hidden" name="RuleId" value="@Model.RuleId" />
                     <input type="hidden" name="TypeOfRule" value="@Model.TypeOfRule" />
                     <button type="submit" class="govuk-button das-button--inverted das-panel__button">
                         Continue
                     </button>
-                
+
                     <p>
-                    <div class="govuk-checkboxes">
-                        <div class="govuk-checkboxes__item">
-                            <input type="checkbox" class="govuk-checkboxes__input" id="markAsReadCheckbox" name="markRuleAsRead" value="true"/>
-                            <label class="govuk-checkboxes__label" for="markAsReadCheckbox">Do not show this message again</label>
+                        <div>
+                            <div class="govuk-checkboxes">
+                                <div class="govuk-checkboxes__item">
+                                    <input type="checkbox" class="govuk-checkboxes__input" id="markAsReadCheckbox" name="markRuleAsRead" value="true" />
+                                    <label class="govuk-checkboxes__label" for="markAsReadCheckbox">Do not show this message again</label>
+                                </div>
+                            </div>
                         </div>
-                    </div>
                     </p>
                 </form>
             </div>

diff --git a/src/SFA.DAS.Reservations.Web/Views/EmployerReservations/Index.cshtml b/src/SFA.DAS.Reservations.Web/Views/EmployerReservations/Index.cshtml
@@ -3,7 +3,7 @@
 @model SFA.DAS.Reservations.Web.Models.EmployerStartViewModel
 
 @{
-    ViewData["Title"] = "Reservations";
+    ViewData["Title"] = "Reserve funding to train and assess an apprentice";
  }
 
 <a asp-route="@RouteNames.EmployerManage" class="govuk-back-link">Back</a>

diff --git a/src/SFA.DAS.Reservations.Web/Views/EmployerReservations/SelectCourse.cshtml b/src/SFA.DAS.Reservations.Web/Views/EmployerReservations/SelectCourse.cshtml
@@ -4,7 +4,7 @@
 @using SFA.DAS.Reservations.Web.Infrastructure
 @model EmployerSelectCourseViewModel
 @{
-    ViewData["Title"] = "Reservations - Select Course";
+    ViewData["Title"] = "Select apprenticeship training course";
 }
 
 @if (string.IsNullOrEmpty(Model.CohortReference) && !Model.IsEmptyCohortFromSelect)

diff --git a/src/SFA.DAS.Reservations.Web/Views/EmployerReservations/SelectLegalEntity.cshtml b/src/SFA.DAS.Reservations.Web/Views/EmployerReservations/SelectLegalEntity.cshtml
@@ -1,7 +1,7 @@
 @using SFA.DAS.Reservations.Web.Infrastructure
 @model SelectLegalEntityViewModel
 @{
-    ViewData["Title"] = "Reservations - Select Organisation";
+    ViewData["Title"] = "Choose which organisation you’ll be reserving funding for";
 
     var accountLegalEntityPublicHashedId = Model.LegalEntities.FirstOrDefault()?.AccountLegalEntityPublicHashedId;
 

diff --git a/src/SFA.DAS.Reservations.Web/Views/ManageReservations/EmployerManage.cshtml b/src/SFA.DAS.Reservations.Web/Views/ManageReservations/EmployerManage.cshtml
@@ -3,7 +3,7 @@
 @model ManageViewModel
 
 @{
-    ViewData["Title"] = "Reservations";
+    ViewData["Title"] = "Manage existing funding reservations or create new reservations";
 }
 
 @if (!Model.Reservations.Any())

diff --git a/src/SFA.DAS.Reservations.Web/Views/ManageReservations/ProviderManage.cshtml b/src/SFA.DAS.Reservations.Web/Views/ManageReservations/ProviderManage.cshtml
@@ -2,7 +2,7 @@
 @using SFA.DAS.Reservations.Web.Infrastructure
 @model ManageViewModel
 @{
-    ViewData["Title"] = "Reservations";
+    ViewData["Title"] = "Manage existing funding reservations or create new reservations";
 }
 
 @if (!Model.Reservations.Any())

diff --git a/src/SFA.DAS.Reservations.Web/Views/ProviderReservations/ChooseEmployer.cshtml b/src/SFA.DAS.Reservations.Web/Views/ProviderReservations/ChooseEmployer.cshtml
@@ -3,7 +3,7 @@
 
 
 @{
-    ViewBag.Title = "Choose Employer";
+    ViewBag.Title = "Choose which employer you’ll be reserving funding for";
     var routeData = new Dictionary<string, string>
     {
         {"UkPrn",ViewContext.RouteData.Values["ukPrn"].ToString()}

diff --git a/src/SFA.DAS.Reservations.Web/Views/ProviderReservations/ConfirmEmployer.cshtml b/src/SFA.DAS.Reservations.Web/Views/ProviderReservations/ConfirmEmployer.cshtml
@@ -1,7 +1,7 @@
 @using SFA.DAS.Reservations.Web.Infrastructure
 @model ConfirmEmployerViewModel
 @{
-    ViewBag.Title = "Confirm Employer";
+    ViewBag.Title = "Confirm the employer you’ll be reserving funding for";
 }
 
 <a asp-route="@RouteNames.ProviderChooseEmployer" class="govuk-back-link">Back</a>

diff --git a/...SFA.DAS.Reservations.Web/Views/ProviderReservations/FundingRestrictionNotification.cshtml b/...SFA.DAS.Reservations.Web/Views/ProviderReservations/FundingRestrictionNotification.cshtml
@@ -1,18 +1,23 @@
-@using SFA.DAS.Reservations.Web.Infrastructure
+@using SFA.DAS.Reservations.Web.Infrastructure
 @model FundingRestrictionNotificationViewModel
 
-<main class="govuk-main-wrapper " id="main-content" role="main">
-    @if (!string.IsNullOrEmpty(Model.BackLink))
+@{
+    ViewData["Title"] = "Upcoming change to government-funded training";
+}
+
+@if (!string.IsNullOrEmpty(Model.BackLink))
+{
+    if (Model.BackLink.StartsWith("http"))
+    {
+        <a href="@Model.BackLink" class="govuk-back-link">Back</a>
+    }
+    else
     {
-        if (Model.BackLink.StartsWith("http"))
-        {
-            <a href="@Model.BackLink" class="govuk-back-link">Back</a>
-        }
-        else
-        {
-            <a asp-route="@Model.BackLink" class="govuk-back-link">Back</a>
-        }
+        <a asp-route="@Model.BackLink" class="govuk-back-link">Back</a>
     }
+}
+
+<main class="govuk-main-wrapper " id="main-content" role="main">
 
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds">
@@ -34,11 +39,11 @@
                     <button type="submit" class="govuk-button das-button--inverted das-panel__button">
                         Continue
                     </button>
-                
+
                     <p>
                         <div class="govuk-checkboxes">
                             <div class="govuk-checkboxes__item">
-                                <input type="checkbox" class="govuk-checkboxes__input" id="markAsReadCheckbox" name="markRuleAsRead" value="true"/>
+                                <input type="checkbox" class="govuk-checkboxes__input" id="markAsReadCheckbox" name="markRuleAsRead" value="true" />
                                 <label class="govuk-checkboxes__label" for="markAsReadCheckbox">Do not show this message again</label>
                             </div>
                         </div>

diff --git a/src/SFA.DAS.Reservations.Web/Views/ProviderReservations/Index.cshtml b/src/SFA.DAS.Reservations.Web/Views/ProviderReservations/Index.cshtml
@@ -1,7 +1,7 @@
 @using SFA.DAS.Reservations.Web.Infrastructure
 @model ProviderStartViewModel
 @{
-    ViewData["Title"] = "Reservations";
+    ViewData["Title"] = "Reserve funding for non-levy employers";
 }
 
 @if (Model.IsFromManage)

diff --git a/src/SFA.DAS.Reservations.Web/Views/Reservations/ApprenticeshipTraining.cshtml b/src/SFA.DAS.Reservations.Web/Views/Reservations/ApprenticeshipTraining.cshtml
@@ -2,7 +2,7 @@
 @using SFA.DAS.Reservations.Web.Extensions
 @model ApprenticeshipTrainingViewModel
 @{
-    ViewData["Title"] = "Reservations - Apprenticeship training";
+    ViewData["Title"] = "Select apprenticeship training course start date";
 
     var firstStartDate = Model.PossibleStartDates.FirstOrDefault()?.Id;
 

diff --git a/src/SFA.DAS.Reservations.Web/Views/Reservations/EmployerCompleted.cshtml b/src/SFA.DAS.Reservations.Web/Views/Reservations/EmployerCompleted.cshtml
@@ -4,7 +4,7 @@
 @using SFA.DAS.Reservations.Web.Infrastructure
 @model CompletedViewModel
 @{
-    ViewData["Title"] = "Reservations";
+    ViewData["Title"] = "Funding reserved";
 }
 <main class="govuk-main-wrapper " id="main-content" role="main">
     <div class="govuk-grid-row">

diff --git a/src/SFA.DAS.Reservations.Web/Views/Reservations/EmployerReview.cshtml b/src/SFA.DAS.Reservations.Web/Views/Reservations/EmployerReview.cshtml
@@ -2,7 +2,7 @@
 @using SFA.DAS.Reservations.Web.Infrastructure
 @model ReviewViewModel
 @{
-    ViewData["Title"] = "Reservations";
+    ViewData["Title"] = "Check your reservation information";
     var changeRouteData = (new Dictionary<string, string> {{"fromReview", "true"}});
 }
 

diff --git a/src/SFA.DAS.Reservations.Web/Views/Reservations/ProviderCompleted.cshtml b/src/SFA.DAS.Reservations.Web/Views/Reservations/ProviderCompleted.cshtml
@@ -4,7 +4,7 @@
 @using SFA.DAS.Reservations.Web.Infrastructure
 @model CompletedViewModel
 @{
-    ViewData["Title"] = "Reservations";
+    ViewData["Title"] = "Funding reserved";
 }
 <main class="govuk-main-wrapper " id="main-content" role="main">
     <div class="govuk-grid-row">

diff --git a/src/SFA.DAS.Reservations.Web/Views/Reservations/ProviderReview.cshtml b/src/SFA.DAS.Reservations.Web/Views/Reservations/ProviderReview.cshtml
@@ -1,7 +1,7 @@
 @using SFA.DAS.Reservations.Web.Extensions
 @model ReviewViewModel
 @{
-    ViewData["Title"] = "Reservations";
+    ViewData["Title"] = "Check your reservation information";
     var changeRouteData = (new Dictionary<string, string> {{"fromReview", "true"}});
 }
 

diff --git a/src/SFA.DAS.Reservations.Web/Views/Shared/EmployerFundingPaused.cshtml b/src/SFA.DAS.Reservations.Web/Views/Shared/EmployerFundingPaused.cshtml
@@ -1,6 +1,6 @@
 
 @{
-    ViewData["Title"] = "EmployerFundingPaused";
+    ViewData["Title"] = "Government funding is currently paused";
 }
 
 

diff --git a/src/SFA.DAS.Reservations.Web/Views/Shared/ProviderFundingPaused.cshtml b/src/SFA.DAS.Reservations.Web/Views/Shared/ProviderFundingPaused.cshtml
@@ -1,6 +1,6 @@
 
 @{
-    ViewData["Title"] = "ProviderFundingPaused";
+    ViewData["Title"] = "Government funding is currently paused";
 }
 
     <a asp-external-controller="Account" tabindex="2" class="govuk-back-link">Back</a>

diff --git a/src/SFA.DAS.Reservations.Web/Views/Shared/_Layout.cshtml b/src/SFA.DAS.Reservations.Web/Views/Shared/_Layout.cshtml
@@ -1,4 +1,5 @@
 @using Microsoft.Azure.Documents.SystemFunctions
+@using StructureMap.Diagnostics.TreeView
 @{
     var tagManagerCode = "GTM-TD56SF5";
 }
@@ -10,7 +11,7 @@
 <html lang="en" class="govuk-template">
 <head>
     <meta charset="utf-8" />
-    <title>GOV.UK - The best place to find government services and information</title>
+    <title>@(ViewData["Title"] ?? "GOV.UK - The best place to find government services and information")</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#0b0c0c" />