diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/AccessibilityStatement/Index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/AccessibilityStatement/Index.cshtml index 203e683d..39e3f337 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/AccessibilityStatement/Index.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/AccessibilityStatement/Index.cshtml @@ -8,9 +8,11 @@ await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton); } -
-
-

@Model.Heading

-
@Html.Raw(Model.BodyContent)
+
+
+
+

@Model.Heading

+
@Html.Raw(Model.BodyContent)
+
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Advice/Advice.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Advice/Advice.cshtml index e8c4176a..93ec5069 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/Advice/Advice.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/Advice/Advice.cshtml @@ -8,9 +8,11 @@ await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton); } -
-
-

@Model.Heading

-
@Html.Raw(Model.BodyContent)
+
+
+
+

@Model.Heading

+
@Html.Raw(Model.BodyContent)
+
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml index c35bad77..85fbf09e 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml @@ -8,87 +8,89 @@ await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton); } -
-
- @if (Model.HasErrors) - { -
-
-

- @Model.ErrorBannerHeading -

-
- +
+
+
+ @if (Model.HasErrors) + { +
+
+

+ @Model.ErrorBannerHeading +

+
+ +
-
- } -

@Model.Heading

-
-
-
- @Model.QualificationLabel -
-
- @Model.QualificationName -
-
-
-
- @Model.LevelLabel -
-
- @Model.QualificationLevel -
-
-
-
- @Model.AwardingOrganisationLabel -
-
- @Model.QualificationAwardingOrganisation -
-
-
-
- @Model.DateAddedLabel -
-
- @Model.QualificationDateAdded -
-
-
-
- -
-

@Model.RadioHeading

-
- @if (Model.HasErrors) - { -

- Error: @Model.ErrorText -

- } - @foreach (var option in Model.Options) - { -
- @Html.RadioButtonFor(x => x.ConfirmQualificationAnswer, option.Value, new { @class = "govuk-radios__input", id = option.Value }) - -
- } -
-
-
- -
-
+ } +

@Model.Heading

+
+
+
+ @Model.QualificationLabel +
+
+ @Model.QualificationName +
+
+
+
+ @Model.LevelLabel +
+
+ @Model.QualificationLevel +
+
+
+
+ @Model.AwardingOrganisationLabel +
+
+ @Model.QualificationAwardingOrganisation +
+
+
+
+ @Model.DateAddedLabel +
+
+ @Model.QualificationDateAdded +
+
+
+
+ +
+

@Model.RadioHeading

+
+ @if (Model.HasErrors) + { +

+ Error: @Model.ErrorText +

+ } + @foreach (var option in Model.Options) + { +
+ @Html.RadioButtonFor(x => x.ConfirmQualificationAnswer, option.Value, new { @class = "govuk-radios__input", id = option.Value }) + +
+ } +
+
+
+ +
+
+
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/CookiesPreference/Index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/CookiesPreference/Index.cshtml index a36b476e..70e1fe28 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/CookiesPreference/Index.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/CookiesPreference/Index.cshtml @@ -25,51 +25,53 @@ await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton); } -
-
- @{ - var userPreferenceSet = TempData["UserPreferenceRecorded"] as bool? ?? false; - if (userPreferenceSet) - { - \ No newline at end of file + \ No newline at end of file diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Home/Index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Home/Index.cshtml index 7e405a13..4e02865b 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/Home/Index.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/Home/Index.cshtml @@ -3,27 +3,28 @@ @{ ViewData["Title"] = "Start"; } - -
-
-

@Model.Header

-
@Html.Raw(Model.PreCtaButtonContent)
- - @Model.CtaButtonText - - -
@Html.Raw(Model.PostCtaButtonContent)
-
-
- +
+
+
+

@Model.Header

+
@Html.Raw(Model.PreCtaButtonContent)
+ + @Model.CtaButtonText + + +
@Html.Raw(Model.PostCtaButtonContent)
+
+
+ +
-
\ No newline at end of file + diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml index dcdb9f72..f712736d 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml @@ -9,53 +9,55 @@ await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton); } -
-
-

- -

-
    - @if (!string.IsNullOrEmpty(Model.Filters?.WhereWasQualificationAwarded)) - { -
  • @Model.Filters!.WhereWasQualificationAwarded
    • - } +
    +
    +
    +

    + +

    +
      + @if (!string.IsNullOrEmpty(Model.Filters?.WhereWasQualificationAwarded)) + { +
    • @Model.Filters!.WhereWasQualificationAwarded
      • + } - @if (!string.IsNullOrEmpty(Model.Filters?.WhenWasQualificationAwarded)) - { -
    • @Model.Filters!.WhenWasQualificationAwarded
      • - } + @if (!string.IsNullOrEmpty(Model.Filters?.WhenWasQualificationAwarded)) + { +
    • @Model.Filters!.WhenWasQualificationAwarded
      • + } - @if (!string.IsNullOrEmpty(Model.Filters?.LevelOfQualification)) - { -
    • @Model.Filters!.LevelOfQualification
      • - } + @if (!string.IsNullOrEmpty(Model.Filters?.LevelOfQualification)) + { +
    • @Model.Filters!.LevelOfQualification
      • + } - @if (!string.IsNullOrEmpty(Model.Filters?.WhatIsTheAwardingOrganisation)) - { -
    • @Model.Filters!.WhatIsTheAwardingOrganisation
      • - } -
    + @if (!string.IsNullOrEmpty(Model.Filters?.WhatIsTheAwardingOrganisation)) + { +
  • @Model.Filters!.WhatIsTheAwardingOrganisation
    • + } +
-

- Change my search -

-
-
-

@Model.Header

- - - - - - - - @foreach (var qualification in qualifications) - { +

+ Change my search +

+ +
+

@Model.Header

+
Qualification link
+ - + - } - -
@Html.ActionLink(qualification, "Index", "ConfirmQualification", new { qualificationId = qualification })Qualification link
+ + + @foreach (var qualification in qualifications) + { + + @Html.ActionLink(qualification, "Index", "ConfirmQualification", new { qualificationId = qualification }) + + } + + +
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Index.cshtml index 6ee1f82b..5dbccff3 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Index.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Index.cshtml @@ -8,71 +8,73 @@ await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton); } -
-
- - @Model.Content!.MainHeader - -

@Model.QualificationName

-
-
-
- @Model.Content.AwardingOrgLabel -
-
- @Model.AwardingOrganisationTitle -
-
-
-
- @Model.Content.LevelLabel -
-
- @Model.QualificationLevel -
-
-
-
- @Model.Content.QualificationNumberLabel -
-
- @Model.QualificationNumber -
-
-
-
- @Model.Content.DateAddedLabel -
-
- @Model.FromWhichYear -
-
-
-
- @Model.Content.DateOfCheckLabel -
-
- @DateTime.UtcNow.ToString("dd MMMM yyyy") -
-
-
-

@Model.AdditionalRequirements

-

- @Model.Content.BookmarkHeading -

-

- @Model.Content.BookmarkText -
-
- @Model.BookmarkUrl -

-

- @Model.Content.CheckAnotherQualificationHeading -

- @Html.Raw(Model.Content.CheckAnotherQualificationText) -

- @Model.Content.FurtherInfoHeading -

- @Html.Raw(Model.Content.FurtherInfoText) +
+
+
+ + @Model.Content!.MainHeader + +

@Model.QualificationName

+
+
+
+ @Model.Content.AwardingOrgLabel +
+
+ @Model.AwardingOrganisationTitle +
+
+
+
+ @Model.Content.LevelLabel +
+
+ @Model.QualificationLevel +
+
+
+
+ @Model.Content.QualificationNumberLabel +
+
+ @Model.QualificationNumber +
+
+
+
+ @Model.Content.DateAddedLabel +
+
+ @Model.FromWhichYear +
+
+
+
+ @Model.Content.DateOfCheckLabel +
+
+ @DateTime.UtcNow.ToString("dd MMMM yyyy") +
+
+
+

@Model.AdditionalRequirements

+

+ @Model.Content.BookmarkHeading +

+

+ @Model.Content.BookmarkText +
+
+ @Model.BookmarkUrl +

+

+ @Model.Content.CheckAnotherQualificationHeading +

+ @Html.Raw(Model.Content.CheckAnotherQualificationText) +

+ @Model.Content.FurtherInfoHeading +

+ @Html.Raw(Model.Content.FurtherInfoText) +
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml index a0bc8c79..44a3ce5a 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml @@ -8,47 +8,49 @@ await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton); } -
-
-
- @using (Html.BeginForm(Model.ActionName, Model.ControllerName, FormMethod.Post)) - { -
- -

- @Model.Question -

- -
@Model.QuestionHint
+
+
+
+
+ @using (Html.BeginForm(Model.ActionName, Model.ControllerName, FormMethod.Post)) + { +
+ +

+ @Model.Question +

+ +
@Model.QuestionHint
- @if (Model.HasErrors) - { -

- Error: @Model.ErrorMessage -

- } + @if (Model.HasErrors) + { +

+ Error: @Model.ErrorMessage +

+ } -
-
-
- - @Html.TextBoxFor(x => x.SelectedMonth, "{0:#.#}", new { id = "date-started-month", @class = "govuk-input govuk-date-input__input govuk-input--width-2", maxlength = "2", name = "date-started-month", type = "text", inputmode = "numeric", Value = "" }) +
+
+
+ + @Html.TextBoxFor(x => x.SelectedMonth, "{0:#.#}", new { id = "date-started-month", @class = "govuk-input govuk-date-input__input govuk-input--width-2", maxlength = "2", name = "date-started-month", type = "text", inputmode = "numeric", Value = "" }) +
-
-
-
- - @Html.TextBoxFor(x => x.SelectedYear, "{0:#.#}", new { id = "date-started-year", @class = "govuk-input govuk-date-input__input govuk-input--width-4", maxlength = "4", name = "date-started-month", type = "text", inputmode = "numeric", Value = "" }) +
+
+ + @Html.TextBoxFor(x => x.SelectedYear, "{0:#.#}", new { id = "date-started-year", @class = "govuk-input govuk-date-input__input govuk-input--width-4", maxlength = "4", name = "date-started-month", type = "text", inputmode = "numeric", Value = "" }) +
+
+
+
-
-
- -
- } + } +
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml index 303f76f0..d7e759f1 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml @@ -19,48 +19,50 @@ await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton); } -
-
-
- @using (Html.BeginForm(Model.ActionName, Model.ControllerName, FormMethod.Post)) - { -
- -

- @Model.Question -

- +
+
+
+
+ @using (Html.BeginForm(Model.ActionName, Model.ControllerName, FormMethod.Post)) + { +
+ +

+ @Model.Question +

+ - @if (Model.HasErrors) - { - - } + @if (Model.HasErrors) + { + + } -
+
-

- @Html.Label(Model.DropdownId, Model.DropdownHeading, new { @class = "govuk-label govuk-fieldset__legend--m" }) -

+

+ @Html.Label(Model.DropdownId, Model.DropdownHeading, new { @class = "govuk-label govuk-fieldset__legend--m" }) +

-
- @Html.DropDownListFor(x => x.SelectedValue, Model.Values, new { @class = Model.HasErrors ? "govuk-select govuk-select--error" : "govuk-select", id = Model.DropdownId }) -
+
+ @Html.DropDownListFor(x => x.SelectedValue, Model.Values, new { @class = Model.HasErrors ? "govuk-select govuk-select--error" : "govuk-select", id = Model.DropdownId }) +
-
-
- @Html.CheckBoxFor(x => x.NotInTheList, new { @class = "govuk-checkboxes__input", id = Model.CheckboxId, name = "awarding-organisation" }) - @Html.Label(Model.CheckboxId, Model.NotInListText, new { @class = "govuk-label govuk-checkboxes__label" }) +
+
+ @Html.CheckBoxFor(x => x.NotInTheList, new { @class = "govuk-checkboxes__input", id = Model.CheckboxId, name = "awarding-organisation" }) + @Html.Label(Model.CheckboxId, Model.NotInListText, new { @class = "govuk-label govuk-checkboxes__label" }) +
-
-
- -
- } +
+ +
+ } +
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml index 1c9f615c..2002bbec 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml @@ -8,54 +8,56 @@ await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton); } -
-
-
- @using (Html.BeginForm(Model.ActionName, Model.ControllerName, FormMethod.Post)) - { -
- -

- @Model.Question -

- - @if (!string.IsNullOrEmpty(Model.AdditionalInformationHeader) && !string.IsNullOrEmpty(Model.AdditionalInformationBody)) - { -
- - - @Model.AdditionalInformationHeader - - -
- @Html.Raw(Model.AdditionalInformationBody) -
-
- } - @if (Model.HasErrors) - { -

- Error: @Model.ErrorMessage -

- } -
- @foreach (var option in Model.Options) +
+
+
+
+ @using (Html.BeginForm(Model.ActionName, Model.ControllerName, FormMethod.Post)) + { +
+ +

+ @Model.Question +

+ + @if (!string.IsNullOrEmpty(Model.AdditionalInformationHeader) && !string.IsNullOrEmpty(Model.AdditionalInformationBody)) { -
- @Html.RadioButtonFor(x => x.Option, option.Value, new { @class = "govuk-radios__input", id = option.Value }) - -
+
+ + + @Model.AdditionalInformationHeader + + +
+ @Html.Raw(Model.AdditionalInformationBody) +
+
} + @if (Model.HasErrors) + { +

+ Error: @Model.ErrorMessage +

+ } +
+ @foreach (var option in Model.Options) + { +
+ @Html.RadioButtonFor(x => x.Option, option.Value, new { @class = "govuk-radios__input", id = option.Value }) + +
+ } +
+
+
+
-
-
- -
- } + } +
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Shared/_Layout.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Shared/_Layout.cshtml index f6708927..04d0d864 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/Shared/_Layout.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/Shared/_Layout.cshtml @@ -19,9 +19,7 @@ }
-
- @RenderBody() -
+ @RenderBody()
@{