Skip to content

TD1871 Radio and Date Input style update when view component is set as page header #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 9, 2023
Merged

TD1871 Radio and Date Input style update when view component is set as page header #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c37199e
TD-1871: updated page header styles for radioitem and datetime input
OluwatobiAwe Jun 8, 2023
dd723bb
TD-1871: removed css class nhsuk-fieldset__heading from fieldset lege…
OluwatobiAwe Jun 9, 2023
3ab8298
Merge remote-tracking branch 'origin/main' into Develop/Feature/TD-18…
OluwatobiAwe Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions NHSUKViewComponents.Web/ViewComponents/RadioListViewComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ public IViewComponentResult Invoke(
bool required,
string? requiredClientSideErrorMessage = default,
string cssClass = default,
string? optionalRadio = default
string? optionalRadio = default,
bool? isPageHeading = false
)
{
var model = ViewData.Model;
Expand Down Expand Up @@ -46,7 +47,8 @@ public IViewComponentResult Invoke(
errorMessages,
required,
string.IsNullOrEmpty(requiredClientSideErrorMessage) ? null : requiredClientSideErrorMessage,
string.IsNullOrEmpty(cssClass) ? null : cssClass
string.IsNullOrEmpty(cssClass) ? null : cssClass,
isPageHeading
);

return View(viewModel);
Expand Down
5 changes: 4 additions & 1 deletion NHSUKViewComponents.Web/ViewModels/RadiosViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ public RadiosViewModel(
IEnumerable<string> errorMessages,
bool required,
string? requiredClientSideErrorMessage = default,
string? cssClass = default
string? cssClass = default,
bool? isPageHeading = false
)
{
var errorMessageList = errorMessages.ToList();
Expand All @@ -28,6 +29,7 @@ public RadiosViewModel(
Required = required;
RequiredClientSideErrorMessage = requiredClientSideErrorMessage;
Class = cssClass;
IsPageHeading = isPageHeading;
}

public string AspFor { get; set; }
Expand All @@ -41,6 +43,7 @@ public RadiosViewModel(

public IEnumerable<RadiosItemViewModel> Radios { get; set; }
public RadiosItemViewModel OptionalRadio { get; set; }
public bool? IsPageHeading { get; set; }
public bool Required { get; set; }
public string RequiredClientSideErrorMessage { get; set; }
}
Expand Down
24 changes: 12 additions & 12 deletions NHSUKViewComponents.Web/Views/Shared/Components/DateInput/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@

<div class="@Model.CssClass @errorCss" id="@Model.Id">
<fieldset class="nhsuk-fieldset" aria-describedby="@Model.Id-hint" role="group">
<legend class="nhsuk-fieldset__legend @(Model.IsPageHeading.GetValueOrDefault() ? "nhsuk-fieldset__legend--l":"nhsuk-label")">
@if(Model.IsPageHeading.GetValueOrDefault()==true)
{
<h1 class="nhsuk-fieldset__heading">
<legend class="nhsuk-fieldset__legend nhsuk-label">
@if (Model.IsPageHeading.GetValueOrDefault() == true)
{
<h1>
@Model.Label
</h1>
}
else
{
@Model.Label
</h1>
}
else
{
@Model.Label
}

</legend>
}
</legend>

@if (Model.HintTextLines != null) {
@foreach (var hintText in Model.HintTextLines) {
<div class="nhsuk-hint">
Expand Down
15 changes: 12 additions & 3 deletions NHSUKViewComponents.Web/Views/Shared/Components/RadioList/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,18 @@

<fieldset class="nhsuk-fieldset" aria-describedby="@Model.Label.RemoveWhitespace()-hint">
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
<label class="nhsuk-fieldset__heading">
@Model.Label
</label>
@if (Model.IsPageHeading.GetValueOrDefault() == true)
{
<h1>
@Model.Label
</h1>
}
else
{
<label class="nhsuk-fieldset__heading">
@Model.Label
</label>
}
</legend>

@if (Model.HintText != null)
Expand Down