diff --git a/NHSUKFrontendRazor/ViewComponents/RadioListViewComponent.cs b/NHSUKFrontendRazor/ViewComponents/RadioListViewComponent.cs index 92d0036..3ff0c2f 100644 --- a/NHSUKFrontendRazor/ViewComponents/RadioListViewComponent.cs +++ b/NHSUKFrontendRazor/ViewComponents/RadioListViewComponent.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Mvc; using NHSUKFrontendRazor.ViewModels; - using NHSUKFrontendRazor.ViewModels; public class RadioListViewComponent : ViewComponent { @@ -24,10 +23,9 @@ public IViewComponentResult Invoke( { var model = ViewData.Model; var property = model.GetType().GetProperty(aspFor); - var errorMessages = ViewData.ModelState[property?.Name]?.Errors.Select(e => e.ErrorMessage) ?? - new string[] { }; + var errorMessages = ViewData.ModelState[property?.Name]?.Errors.Select(e => e.ErrorMessage) ?? new string[] { }; - var radiosList = radios.Where(x=>x.Label != optionalRadio).Select( + var radiosList = radios.Where(x => x.Label != optionalRadio).Select( r => new RadiosItemViewModel( r.Value, r.Label, @@ -35,7 +33,7 @@ public IViewComponentResult Invoke( r.HintText ) ); - + var viewModel = new RadiosViewModel( aspFor, @@ -64,4 +62,4 @@ private bool IsSelectedRadio(string aspFor, RadiosItemViewModel radioItem, bool return populateWithCurrentValue && value != null && value.Equals(radioItem.Value); } } -} +} \ No newline at end of file diff --git a/NHSUKFrontendRazor/ViewComponents/SkipLinkViewComponent.cs b/NHSUKFrontendRazor/ViewComponents/SkipLinkViewComponent.cs index eb77774..b88533e 100644 --- a/NHSUKFrontendRazor/ViewComponents/SkipLinkViewComponent.cs +++ b/NHSUKFrontendRazor/ViewComponents/SkipLinkViewComponent.cs @@ -1,6 +1,5 @@ namespace NHSUKFrontendRazor.ViewComponents { - using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; using NHSUKFrontendRazor.ViewModels; @@ -10,10 +9,10 @@ namespace NHSUKFrontendRazor.ViewComponents public class SkipLinkViewComponent : ViewComponent { public IViewComponentResult Invoke( - string maincContentID, + string mainContentID, string text = "Skip to main content") { - var model = new SkipLinkViewModel(maincContentID, text); + var model = new SkipLinkViewModel(mainContentID, text); return View(model); } diff --git a/NHSUKFrontendRazor/ViewModels/SkipLinkViewModel.cs b/NHSUKFrontendRazor/ViewModels/SkipLinkViewModel.cs index e6f25b8..a063994 100644 --- a/NHSUKFrontendRazor/ViewModels/SkipLinkViewModel.cs +++ b/NHSUKFrontendRazor/ViewModels/SkipLinkViewModel.cs @@ -5,20 +5,20 @@ public class SkipLinkViewModel /// /// Initializes a new instance of the class. /// - /// The ID of the main content element to which the skip link will navigate. + /// The ID of the main content element to which the skip link will navigate. /// The text to be displayed for the skip link. public SkipLinkViewModel( - string maincContentID, + string mainContentID, string text) { - MaincContentID = maincContentID; + MainContentID = mainContentID; Text = text; } /// /// Gets or sets the ID of the main content element to which the skip link will navigate. /// - public string MaincContentID { get; set; } + public string MainContentID { get; set; } /// /// Gets or sets the text to be displayed for the skip link. diff --git a/NHSUKFrontendRazor/Views/Shared/Components/ActionLink/Default.cshtml b/NHSUKFrontendRazor/Views/Shared/Components/ActionLink/Default.cshtml index 937d592..9fe0736 100644 --- a/NHSUKFrontendRazor/Views/Shared/Components/ActionLink/Default.cshtml +++ b/NHSUKFrontendRazor/Views/Shared/Components/ActionLink/Default.cshtml @@ -1,12 +1,9 @@ @using NHSUKFrontendRazor.ViewModels @model LinkViewModel -
- - @Model.LinkText - -
+ \ No newline at end of file diff --git a/NHSUKFrontendRazor/Views/Shared/Components/BackLink/Default.cshtml b/NHSUKFrontendRazor/Views/Shared/Components/BackLink/Default.cshtml index d41140a..f5ea0ec 100644 --- a/NHSUKFrontendRazor/Views/Shared/Components/BackLink/Default.cshtml +++ b/NHSUKFrontendRazor/Views/Shared/Components/BackLink/Default.cshtml @@ -1,11 +1,6 @@ @using NHSUKFrontendRazor.ViewModels @model LinkViewModel -
- - + @Model.LinkText - -
+ \ No newline at end of file diff --git a/NHSUKFrontendRazor/Views/Shared/Components/Breadcrumbs/Default.cshtml b/NHSUKFrontendRazor/Views/Shared/Components/Breadcrumbs/Default.cshtml index 6bc9d8c..c2c5d27 100644 --- a/NHSUKFrontendRazor/Views/Shared/Components/Breadcrumbs/Default.cshtml +++ b/NHSUKFrontendRazor/Views/Shared/Components/Breadcrumbs/Default.cshtml @@ -8,7 +8,7 @@
    @foreach (var link in Model.Links) { -
  1. +
  2. @if (link == lastLink) { @link.Title @@ -23,12 +23,9 @@ @if (Model.Links.Count > 0) { -

    - - Back to   - @lastLink.Title - -

    + + @lastLink.Title + } - + \ No newline at end of file diff --git a/NHSUKFrontendRazor/Views/Shared/Components/Card/Default.cshtml b/NHSUKFrontendRazor/Views/Shared/Components/Card/Default.cshtml index 4392aca..e36f064 100644 --- a/NHSUKFrontendRazor/Views/Shared/Components/Card/Default.cshtml +++ b/NHSUKFrontendRazor/Views/Shared/Components/Card/Default.cshtml @@ -40,13 +40,9 @@ @if (Model.HasArrow == true) { -
    @@ -28,7 +28,7 @@
    } -
    +
    @foreach (var checkbox in Model.Checkboxes) { if (!string.IsNullOrWhiteSpace(Model.Class)) @@ -45,4 +45,4 @@ }
    -
    + \ No newline at end of file diff --git a/NHSUKFrontendRazor/Views/Shared/Components/DoDontList/Default.cshtml b/NHSUKFrontendRazor/Views/Shared/Components/DoDontList/Default.cshtml index 46dd8a2..8084caa 100644 --- a/NHSUKFrontendRazor/Views/Shared/Components/DoDontList/Default.cshtml +++ b/NHSUKFrontendRazor/Views/Shared/Components/DoDontList/Default.cshtml @@ -9,15 +9,14 @@
  3. @if (Model.IsDo) { -
    4. } - + \ No newline at end of file diff --git a/NHSUKFrontendRazor/Views/Shared/Components/Footer/Default.cshtml b/NHSUKFrontendRazor/Views/Shared/Components/Footer/Default.cshtml index b2bc674..31ecee1 100644 --- a/NHSUKFrontendRazor/Views/Shared/Components/Footer/Default.cshtml +++ b/NHSUKFrontendRazor/Views/Shared/Components/Footer/Default.cshtml @@ -1,29 +1,29 @@ @using NHSUKFrontendRazor.ViewModels @model FooterViewModel -
    -
    -
    -

    Support links

    -
    - - @foreach (var group in Model.FooterGroupList) +
    +
    + @(Model.IsVerticallyAligned ? "" : Html.Raw("
    ")) + @foreach (var group in Model.FooterGroupList) + { + @(Model.IsVerticallyAligned ? "" : Html.Raw("
    ")) + @(group.IsMeta? Html.Raw("

    Support links

    ") : "") +
      + @foreach (var item in group.FooterItemList) { -
        - @foreach (var item in group.FooterItemList) - { -
      • - @item.Title -
        • - } -
      +
    • + @item.Title +
      • } -
    - -
    -

    @Model.Copyright

    -
    + + @(group.IsMeta? Html.Raw("
    ") : "") + @(Model.IsVerticallyAligned ? "" : Html.Raw("
    ")) + } + @(Model.IsVerticallyAligned ? "" : Html.Raw("
    ")) +
    +

    @Model.Copyright

    +
    -
    + \ No newline at end of file diff --git a/NHSUKFrontendRazor/Views/Shared/Components/Pagination/Default.cshtml b/NHSUKFrontendRazor/Views/Shared/Components/Pagination/Default.cshtml index bb17ed2..e078f34 100644 --- a/NHSUKFrontendRazor/Views/Shared/Components/Pagination/Default.cshtml +++ b/NHSUKFrontendRazor/Views/Shared/Components/Pagination/Default.cshtml @@ -8,12 +8,12 @@
  4. @if (Model.CurrentPage > 0) { - + Previous : @(Model.CurrentPage - 1) of @Model.TotalPage - } @@ -25,13 +25,12 @@ Next : @(Model.CurrentPage + 1) of @Model.TotalPage -
    5. -} +} \ No newline at end of file diff --git a/NHSUKFrontendRazor/Views/Shared/Components/RadioList/Default.cshtml b/NHSUKFrontendRazor/Views/Shared/Components/RadioList/Default.cshtml index 6317375..9e5516a 100644 --- a/NHSUKFrontendRazor/Views/Shared/Components/RadioList/Default.cshtml +++ b/NHSUKFrontendRazor/Views/Shared/Components/RadioList/Default.cshtml @@ -48,7 +48,7 @@ } -
    +
    @foreach (var (radio, index) in Model.Radios.Select((r, i) => (r, i))) { counter = index; @@ -63,9 +63,9 @@ type="radio" value="@radio.Value" aria-describedby="@(!string.IsNullOrEmpty(radio.HintText) ? $"{radio.Value}-item-hint" : string.Empty)" - data-val-required="@(Model.Required ? Model.RequiredClientSideErrorMessage : "")" + data-val-required="@(Model.Required? Model.RequiredClientSideErrorMessage: "")" data-val="@(Model.Required ? "true" : "false")" - @(radio.Selected ? "checked" : string.Empty) /> + @(radio.Selected ? "checked" : string.Empty) /> @@ -87,9 +87,9 @@ type="radio" value="@radio.Value" aria-describedby="@(!string.IsNullOrEmpty(radio.HintText) ? $"{radio.Value}-item-hint" : string.Empty)" - data-val-required="@(Model.Required ? Model.RequiredClientSideErrorMessage : "")" + data-val-required="@(Model.Required? Model.RequiredClientSideErrorMessage: "")" data-val="@(Model.Required ? "true" : "false")" - @(radio.Selected ? "checked" : string.Empty) /> + @(radio.Selected ? "checked" : string.Empty) /> @@ -114,9 +114,9 @@ type="radio" value="@Model.OptionalRadio.Value" aria-describedby="@(!string.IsNullOrEmpty(Model.OptionalRadio.HintText) ? $"{Model.OptionalRadio.Value}-item-hint" : string.Empty)" - data-val-required="@(Model.Required ? Model.RequiredClientSideErrorMessage : "")" + data-val-required="@(Model.Required? Model.RequiredClientSideErrorMessage: "")" data-val="@(Model.Required ? "true" : "false")" - @(Model.OptionalRadio.Selected ? "checked" : string.Empty) /> + @(Model.OptionalRadio.Selected ? "checked" : string.Empty) /> @@ -146,4 +146,4 @@ }); }; -
    +
    \ No newline at end of file diff --git a/NHSUKFrontendRazor/Views/Shared/Components/SkipLink/Default.cshtml b/NHSUKFrontendRazor/Views/Shared/Components/SkipLink/Default.cshtml index 622e12c..721cb8f 100644 --- a/NHSUKFrontendRazor/Views/Shared/Components/SkipLink/Default.cshtml +++ b/NHSUKFrontendRazor/Views/Shared/Components/SkipLink/Default.cshtml @@ -1,4 +1,4 @@ @using NHSUKFrontendRazor.ViewModels @model SkipLinkViewModel -@Model.Text +@Model.Text \ No newline at end of file