Skip to content

TD-5327 fix styling issues in request support and super admin #3213

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 1 commit into from
Apr 9, 2025
Merged

TD-5327 fix styling issues in request support and super admin #3213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 24 additions & 22 deletions DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using DigitalLearningSolutions.Web.ViewModels.SuperAdmin.Administrators
@model AdminAccountsViewModel
@{
ViewData["Title"] = "Administrators";
ViewData["Title"] = "Administrators";
}
<link rel="stylesheet" href="@Url.Content("~/css/superAdmin/users.css")" asp-append-version="true">
<div class="nhsuk-grid-row">
Expand All @@ -16,23 +16,23 @@

<div class="nhsuk-grid-column-three-quarters">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-one-half">
<h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
</div>
<div class="nhsuk-grid-column-one-half">
<a class="nhsuk-button nhsuk-button--secondary nhsuk-u-float-right"
id="export"
asp-controller="AdminAccounts"
asp-action="Export"
asp-route-searchString="@Model.SearchString"
asp-route-existingFilterString="@Model.ExistingFilterString"
role="button">
Export to Excel
</a>
</div>
<div class="nhsuk-grid-column-one-half">
<h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
</div>
<div class="nhsuk-grid-column-one-half">
<a class="nhsuk-button nhsuk-button--secondary nhsuk-u-float-right"
id="export"
asp-controller="AdminAccounts"
asp-action="Export"
asp-route-searchString="@Model.SearchString"
asp-route-existingFilterString="@Model.ExistingFilterString"
role="button">
Export to Excel
</a>
</div>
</div>
<form class="nhsuk-u-margin-bottom-3" method="get" role="search" asp-controller="AdminAccounts" asp-action="Index" asp-route-page="@Model.Page">
<input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
<input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
<div class="nhsuk-grid-row">
<div id="search">
<div class="nhsuk-grid-column-one-quarter">
Expand Down Expand Up @@ -64,24 +64,26 @@
</div>
</div>
</div>
</div>
<div class="nhsuk-grid-row">
<div class="filter-container nhsuk-u-margin-top-5">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
<vc:select-list asp-for="@nameof(Model.UserStatus)"
label="Account status"
value="@Model.UserStatus"
required="true"
hint-text=""
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
css-class=""
default-option=""
select-list-options="@ViewBag.UserStatus" />
</div>
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
<vc:select-list asp-for="@nameof(Model.Role)"
label="Role"
value="@Model.Role"
required="true"
hint-text=""
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
css-class=""
default-option=""
select-list-options="@ViewBag.Roles" />
</div>
Expand All @@ -91,7 +93,7 @@
value="@Model.CentreID.ToString()"
hint-text=""
required="true"
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
css-class=""
default-option=""
select-list-options="@ViewBag.Centres" />
</div>
Expand All @@ -115,7 +117,7 @@
<partial name="_SearchableAdminAccountsCard" model="admin" />
}
</div>
<partial name="SearchablePage/_BottomPagination" model="Model" />
<partial name="SearchablePage/_BottomPagination" model="Model" />
}
</div>
<nav class="side-nav-menu-bottom" aria-label="Bottom navigation bar">
Expand Down
44 changes: 23 additions & 21 deletions DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

<div class="nhsuk-grid-column-three-quarters">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-one-half">
<h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
</div>
<div class="nhsuk-grid-column-one-half">
</div>
<div class="nhsuk-grid-column-one-half">
<h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
</div>
<div class="nhsuk-grid-column-one-half">
</div>
</div>
<form class="nhsuk-u-margin-bottom-3" method="get" role="search" asp-controller="Delegates" asp-action="Index" asp-route-page="@Model.Page">
<input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
<input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
<div class="nhsuk-grid-row">
<div id="search">
<div class="nhsuk-grid-column-one-quarter">
Expand Down Expand Up @@ -55,24 +55,26 @@
</div>
</div>
</div>
</div>
<div class="nhsuk-grid-row">
<div class="filter-container nhsuk-u-margin-top-5">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
<vc:select-list asp-for="@nameof(Model.AccountStatus)"
label="Account status"
value="@Model.AccountStatus"
required="true"
hint-text=""
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
css-class=""
default-option=""
select-list-options="@ViewBag.AccountStatus" />
</div>
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
<vc:select-list asp-for="@nameof(Model.LHLinkStatus)"
label="LH link status"
value="@Model.LHLinkStatus"
required="true"
hint-text=""
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
css-class=""
default-option=""
select-list-options="@ViewBag.LHLinkStatus" />
</div>
Expand All @@ -82,7 +84,7 @@
value="@Model.CentreID.ToString()"
hint-text=""
required="true"
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
css-class=""
default-option=""
select-list-options="@ViewBag.Centres" />
</div>
Expand All @@ -91,26 +93,26 @@
</form>
@if (Model.NoDataFound)
{
<p class="nhsuk-u-margin-top-4" role="alert">
<b>No delegate found.</b>
</p>
<p class="nhsuk-u-margin-top-4" role="alert">
<b>No delegate found.</b>
</p>
}
else
{
<partial name="SearchablePage/Configurations/_ResultsCountAndItemsPerPage" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
<div id="searchable-elements">
<partial name="SearchablePage/Configurations/_ResultsCountAndItemsPerPage" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
<div id="searchable-elements">
@foreach (var delegates in Model.Delegates)
{
<partial name="_SearchableDelegatesCard" model="delegates" />
}
</div>
<partial name="SearchablePage/_BottomPagination" model="Model" />
</div>
<partial name="SearchablePage/_BottomPagination" model="Model" />
}
</div>
<nav class="side-nav-menu-bottom" aria-label="Bottom navigation bar">
<partial name="~/Views/SuperAdmin/Shared/_UserAccountsSideNavMenu.cshtml"model="Model.CurrentPage" />
<partial name="~/Views/SuperAdmin/Shared/_UserAccountsSideNavMenu.cshtml" model="Model.CurrentPage" />
</nav>
</div>
</div>
Expand Down
20 changes: 12 additions & 8 deletions DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestAttachment.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@
{
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.ImageFiles),nameof(Model.FileSizeError),nameof(Model.FileExtensionError) })" />
}
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="RequestSummary" asp-all-route-data="@cancelLinkData">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Back
</a>
</div>
@section NavBreadcrumbs {
<div class="nhsuk-width-container">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="RequestSummary" asp-all-route-data="@cancelLinkData">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Back
</a>
</div>
</div>
}
<div id="form-group">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
Expand Down
40 changes: 21 additions & 19 deletions DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,24 @@
{
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.RequestSubject),nameof(Model.RequestDescription) })" />
}
<div class=" nhsuk-u-margin-top-1">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="TypeofRequest" asp-route-dlsSubApplication="@ViewContext.RouteData.Values["dlsSubApplication"]">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Back
</a>
@section NavBreadcrumbs {
<div class="nhsuk-width-container">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="TypeofRequest" asp-route-dlsSubApplication="@ViewContext.RouteData.Values["dlsSubApplication"]">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Back
</a>
</div>
</div>
</div>
}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<div class="nhsuk-u-reading-width">
<h1 class="nhsuk-heading-xl">@Model.RequestType</h1>
<form class="nhsuk-u-margin-bottom-3" method="post" asp-action="SetRequestSummary" asp-all-route-data="@cancelLinkData">
<vc:text-input asp-for="RequestSubject"
<vc:text-input asp-for="RequestSubject"
label="Enter a summary of your problem or request"
populate-with-current-value="true"
type="text"
Expand All @@ -39,15 +41,15 @@
css-class=""
required="true" />
<nhs-form-group nhs-validation-for="RequestDescription">
<vc:text-area asp-for="RequestDescription"
label="Describe your problem or request"
populate-with-current-value="true"
rows="5"
spell-check="false"
hint-text="If you are reporting a problem, please tell us exactly where it occurs and steps to recreate it. If you need to add screenshots, you will be able to do this in the next step."
css-class=""
character-count="null">
</vc:text-area>
<vc:text-area asp-for="RequestDescription"
label="Describe your problem or request"
populate-with-current-value="true"
rows="5"
spell-check="false"
hint-text="If you are reporting a problem, please tell us exactly where it occurs and steps to recreate it. If you need to add screenshots, you will be able to do this in the next step."
css-class=""
character-count="null">
</vc:text-area>
</nhs-form-group>
<button class="nhsuk-button" type="submit">Next</button>
</form>
Expand Down
20 changes: 12 additions & 8 deletions ...lLearningSolutions.Web/Views/Support/RequestSupportTicket/SupportTicketSummaryPage.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,18 @@
ViewData["Title"] = "Request summary";
var cancelLinkData = Html.GetRouteValues();
}
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="RequestAttachment" asp-all-route-data="@cancelLinkData">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Back
</a>
</div>
@section NavBreadcrumbs {
<div class="nhsuk-width-container">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="RequestAttachment" asp-all-route-data="@cancelLinkData">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Back
</a>
</div>
</div>
}
<div class="nhsuk-grid-row">
<form class="nhsuk-u-margin-bottom-3" method="post" asp-action="SubmitSupportSummary" asp-route-dlsSubApplication="@ViewContext.RouteData.Values["dlsSubApplication"]">
<div class="nhsuk-grid-column-full">
Expand Down
Loading
Loading