Skip to content

Commit 792ec05

Browse files
rshrirohitrshrirohit
authored
Merge pull request #3213 from TechnologyEnhancedLearning/Develop/Fixes/TD-5327-FixStylingIssues
TD-5327 fix styling issues in request support and super admin
2 parents 5349926 + 45d5ab0 commit 792ec05

File tree

6 files changed

+130
-113
lines changed

6 files changed

+130
-113
lines changed

‎DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/Index.cshtml‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@using DigitalLearningSolutions.Web.ViewModels.SuperAdmin.Administrators
22
@model AdminAccountsViewModel
33
@{
4-
ViewData["Title"] = "Administrators";
4+
ViewData["Title"] = "Administrators";
55
}
66
<link rel="stylesheet" href="@Url.Content("~/css/superAdmin/users.css")" asp-append-version="true">
77
<div class="nhsuk-grid-row">
@@ -16,23 +16,23 @@
1616

1717
<div class="nhsuk-grid-column-three-quarters">
1818
<div class="nhsuk-grid-row">
19-
<div class="nhsuk-grid-column-one-half">
20-
<h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
21-
</div>
22-
<div class="nhsuk-grid-column-one-half">
23-
<a class="nhsuk-button nhsuk-button--secondary nhsuk-u-float-right"
24-
id="export"
25-
asp-controller="AdminAccounts"
26-
asp-action="Export"
27-
asp-route-searchString="@Model.SearchString"
28-
asp-route-existingFilterString="@Model.ExistingFilterString"
29-
role="button">
30-
Export to Excel
31-
</a>
32-
</div>
19+
<div class="nhsuk-grid-column-one-half">
20+
<h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
21+
</div>
22+
<div class="nhsuk-grid-column-one-half">
23+
<a class="nhsuk-button nhsuk-button--secondary nhsuk-u-float-right"
24+
id="export"
25+
asp-controller="AdminAccounts"
26+
asp-action="Export"
27+
asp-route-searchString="@Model.SearchString"
28+
asp-route-existingFilterString="@Model.ExistingFilterString"
29+
role="button">
30+
Export to Excel
31+
</a>
32+
</div>
3333
</div>
3434
<form class="nhsuk-u-margin-bottom-3" method="get" role="search" asp-controller="AdminAccounts" asp-action="Index" asp-route-page="@Model.Page">
35-
<input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
35+
<input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
3636
<div class="nhsuk-grid-row">
3737
<div id="search">
3838
<div class="nhsuk-grid-column-one-quarter">
@@ -64,24 +64,26 @@
6464
</div>
6565
</div>
6666
</div>
67+
</div>
68+
<div class="nhsuk-grid-row">
6769
<div class="filter-container nhsuk-u-margin-top-5">
68-
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
70+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
6971
<vc:select-list asp-for="@nameof(Model.UserStatus)"
7072
label="Account status"
7173
value="@Model.UserStatus"
7274
required="true"
7375
hint-text=""
74-
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
76+
css-class=""
7577
default-option=""
7678
select-list-options="@ViewBag.UserStatus" />
7779
</div>
78-
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
80+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
7981
<vc:select-list asp-for="@nameof(Model.Role)"
8082
label="Role"
8183
value="@Model.Role"
8284
required="true"
8385
hint-text=""
84-
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
86+
css-class=""
8587
default-option=""
8688
select-list-options="@ViewBag.Roles" />
8789
</div>
@@ -91,7 +93,7 @@
9193
value="@Model.CentreID.ToString()"
9294
hint-text=""
9395
required="true"
94-
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
96+
css-class=""
9597
default-option=""
9698
select-list-options="@ViewBag.Centres" />
9799
</div>
@@ -115,7 +117,7 @@
115117
<partial name="_SearchableAdminAccountsCard" model="admin" />
116118
}
117119
</div>
118-
<partial name="SearchablePage/_BottomPagination" model="Model" />
120+
<partial name="SearchablePage/_BottomPagination" model="Model" />
119121
}
120122
</div>
121123
<nav class="side-nav-menu-bottom" aria-label="Bottom navigation bar">

‎DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/Index.cshtml‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
<div class="nhsuk-grid-column-three-quarters">
1818
<div class="nhsuk-grid-row">
19-
<div class="nhsuk-grid-column-one-half">
20-
<h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
21-
</div>
22-
<div class="nhsuk-grid-column-one-half">
23-
</div>
19+
<div class="nhsuk-grid-column-one-half">
20+
<h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
21+
</div>
22+
<div class="nhsuk-grid-column-one-half">
23+
</div>
2424
</div>
2525
<form class="nhsuk-u-margin-bottom-3" method="get" role="search" asp-controller="Delegates" asp-action="Index" asp-route-page="@Model.Page">
26-
<input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
26+
<input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
2727
<div class="nhsuk-grid-row">
2828
<div id="search">
2929
<div class="nhsuk-grid-column-one-quarter">
@@ -55,24 +55,26 @@
5555
</div>
5656
</div>
5757
</div>
58+
</div>
59+
<div class="nhsuk-grid-row">
5860
<div class="filter-container nhsuk-u-margin-top-5">
59-
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
61+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
6062
<vc:select-list asp-for="@nameof(Model.AccountStatus)"
6163
label="Account status"
6264
value="@Model.AccountStatus"
6365
required="true"
6466
hint-text=""
65-
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
67+
css-class=""
6668
default-option=""
6769
select-list-options="@ViewBag.AccountStatus" />
6870
</div>
69-
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
71+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
7072
<vc:select-list asp-for="@nameof(Model.LHLinkStatus)"
7173
label="LH link status"
7274
value="@Model.LHLinkStatus"
7375
required="true"
7476
hint-text=""
75-
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
77+
css-class=""
7678
default-option=""
7779
select-list-options="@ViewBag.LHLinkStatus" />
7880
</div>
@@ -82,7 +84,7 @@
8284
value="@Model.CentreID.ToString()"
8385
hint-text=""
8486
required="true"
85-
css-class="nhsuk-grid-column-full nhsuk-u-width-full"
87+
css-class=""
8688
default-option=""
8789
select-list-options="@ViewBag.Centres" />
8890
</div>
@@ -91,26 +93,26 @@
9193
</form>
9294
@if (Model.NoDataFound)
9395
{
94-
<p class="nhsuk-u-margin-top-4" role="alert">
95-
<b>No delegate found.</b>
96-
</p>
96+
<p class="nhsuk-u-margin-top-4" role="alert">
97+
<b>No delegate found.</b>
98+
</p>
9799
}
98100
else
99101
{
100-
<partial name="SearchablePage/Configurations/_ResultsCountAndItemsPerPage" model="Model" />
101-
<partial name="SearchablePage/_TopPagination" model="Model" />
102-
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
103-
<div id="searchable-elements">
102+
<partial name="SearchablePage/Configurations/_ResultsCountAndItemsPerPage" model="Model" />
103+
<partial name="SearchablePage/_TopPagination" model="Model" />
104+
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
105+
<div id="searchable-elements">
104106
@foreach (var delegates in Model.Delegates)
105107
{
106108
<partial name="_SearchableDelegatesCard" model="delegates" />
107109
}
108-
</div>
109-
<partial name="SearchablePage/_BottomPagination" model="Model" />
110+
</div>
111+
<partial name="SearchablePage/_BottomPagination" model="Model" />
110112
}
111113
</div>
112114
<nav class="side-nav-menu-bottom" aria-label="Bottom navigation bar">
113-
<partial name="~/Views/SuperAdmin/Shared/_UserAccountsSideNavMenu.cshtml"model="Model.CurrentPage" />
115+
<partial name="~/Views/SuperAdmin/Shared/_UserAccountsSideNavMenu.cshtml" model="Model.CurrentPage" />
114116
</nav>
115117
</div>
116118
</div>

‎DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestAttachment.cshtml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@
1313
{
1414
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.ImageFiles),nameof(Model.FileSizeError),nameof(Model.FileExtensionError) })" />
1515
}
16-
<div class="nhsuk-back-link">
17-
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="RequestSummary" asp-all-route-data="@cancelLinkData">
18-
<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">
19-
<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>
20-
</svg>
21-
Back
22-
</a>
23-
</div>
16+
@section NavBreadcrumbs {
17+
<div class="nhsuk-width-container">
18+
<div class="nhsuk-back-link">
19+
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="RequestSummary" asp-all-route-data="@cancelLinkData">
20+
<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">
21+
<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>
22+
</svg>
23+
Back
24+
</a>
25+
</div>
26+
</div>
27+
}
2428
<div id="form-group">
2529
<div class="nhsuk-grid-row">
2630
<div class="nhsuk-grid-column-full">

‎DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestSummary.cshtml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,24 @@
1414
{
1515
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.RequestSubject),nameof(Model.RequestDescription) })" />
1616
}
17-
<div class=" nhsuk-u-margin-top-1">
18-
<div class="nhsuk-back-link">
19-
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="TypeofRequest" asp-route-dlsSubApplication="@ViewContext.RouteData.Values["dlsSubApplication"]">
20-
<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">
21-
<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>
22-
</svg>
23-
Back
24-
</a>
17+
@section NavBreadcrumbs {
18+
<div class="nhsuk-width-container">
19+
<div class="nhsuk-back-link">
20+
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="TypeofRequest" asp-route-dlsSubApplication="@ViewContext.RouteData.Values["dlsSubApplication"]">
21+
<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">
22+
<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>
23+
</svg>
24+
Back
25+
</a>
26+
</div>
2527
</div>
26-
</div>
28+
}
2729
<div class="nhsuk-grid-row">
2830
<div class="nhsuk-grid-column-full">
2931
<div class="nhsuk-u-reading-width">
3032
<h1 class="nhsuk-heading-xl">@Model.RequestType</h1>
3133
<form class="nhsuk-u-margin-bottom-3" method="post" asp-action="SetRequestSummary" asp-all-route-data="@cancelLinkData">
32-
<vc:text-input asp-for="RequestSubject"
34+
<vc:text-input asp-for="RequestSubject"
3335
label="Enter a summary of your problem or request"
3436
populate-with-current-value="true"
3537
type="text"
@@ -39,15 +41,15 @@
3941
css-class=""
4042
required="true" />
4143
<nhs-form-group nhs-validation-for="RequestDescription">
42-
<vc:text-area asp-for="RequestDescription"
43-
label="Describe your problem or request"
44-
populate-with-current-value="true"
45-
rows="5"
46-
spell-check="false"
47-
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."
48-
css-class=""
49-
character-count="null">
50-
</vc:text-area>
44+
<vc:text-area asp-for="RequestDescription"
45+
label="Describe your problem or request"
46+
populate-with-current-value="true"
47+
rows="5"
48+
spell-check="false"
49+
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."
50+
css-class=""
51+
character-count="null">
52+
</vc:text-area>
5153
</nhs-form-group>
5254
<button class="nhsuk-button" type="submit">Next</button>
5355
</form>

‎DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/SupportTicketSummaryPage.cshtml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@
88
ViewData["Title"] = "Request summary";
99
var cancelLinkData = Html.GetRouteValues();
1010
}
11-
<div class="nhsuk-back-link">
12-
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="RequestAttachment" asp-all-route-data="@cancelLinkData">
13-
<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">
14-
<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>
15-
</svg>
16-
Back
17-
</a>
18-
</div>
11+
@section NavBreadcrumbs {
12+
<div class="nhsuk-width-container">
13+
<div class="nhsuk-back-link">
14+
<a class="nhsuk-back-link__link" role="button" asp-controller="RequestSupportTicket" asp-action="RequestAttachment" asp-all-route-data="@cancelLinkData">
15+
<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">
16+
<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>
17+
</svg>
18+
Back
19+
</a>
20+
</div>
21+
</div>
22+
}
1923
<div class="nhsuk-grid-row">
2024
<form class="nhsuk-u-margin-bottom-3" method="post" asp-action="SubmitSupportSummary" asp-route-dlsSubApplication="@ViewContext.RouteData.Values["dlsSubApplication"]">
2125
<div class="nhsuk-grid-column-full">

0 commit comments

Comments
 (0)