Skip to content

Commit 9b5a190

Browse files
ABSinhaaABSinhaa
committed
TD_5434 Corrected the spacing indentation within the cshtml pages.
1 parent c6bdcc3 commit 9b5a190

File tree

3 files changed

+122
-122
lines changed

3 files changed

+122
-122
lines changed

‎DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,47 @@
1414
}
1515

1616
@section NavMenuItems {
17-
<partial name="Shared/_NavMenuItems" />
17+
<partial name="Shared/_NavMenuItems" />
1818
}
1919

20-
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
20+
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
2121
{
22-
<vc:loading-spinner page-has-side-nav-menu="false" />
22+
<vc:loading-spinner page-has-side-nav-menu="false" />
2323
}
2424
<div class="nhsuk-grid-row" id="@(Model.JavascriptSearchSortFilterPaginateEnabled ? "js-styling-hidden-area-while-loading" : "no-js-styling")">
2525

26-
<div class="nhsuk-grid-column-full">
27-
<h1 id="page-heading">Available Activities</h1>
26+
<div class="nhsuk-grid-column-full">
27+
<h1 id="page-heading">Available Activities</h1>
2828

29-
<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />
29+
<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />
3030

31-
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
32-
@if (Model.NoDataFound)
33-
{
34-
<p class="nhsuk-u-margin-top-4" role="alert">
35-
<b>No data to display</b>
36-
</p>
37-
}
38-
else
39-
{
40-
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
41-
<partial name="SearchablePage/_TopPagination" model="Model" />
42-
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
43-
44-
<div id="searchable-elements">
45-
@foreach (var availableCourse in Model.AvailableCourses)
31+
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
32+
@if (Model.NoDataFound)
4633
{
47-
<partial name="Available/_AvailableCourseCard" model="availableCourse" />
34+
<p class="nhsuk-u-margin-top-4" role="alert">
35+
<b>No data to display</b>
36+
</p>
4837
}
49-
</div>
50-
}
51-
<partial name="SearchablePage/_BottomPagination" model="Model" />
52-
</div>
38+
else
39+
{
40+
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
41+
<partial name="SearchablePage/_TopPagination" model="Model" />
42+
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
43+
44+
<div id="searchable-elements">
45+
@foreach (var availableCourse in Model.AvailableCourses)
46+
{
47+
<partial name="Available/_AvailableCourseCard" model="availableCourse" />
48+
}
49+
</div>
50+
}
51+
<partial name="SearchablePage/_BottomPagination" model="Model" />
52+
</div>
5353
</div>
5454

5555
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
5656
{
57-
@section scripts {
58-
<script src="@Url.Content("~/js/learningPortal/available.js")" asp-append-version="true"></script>
59-
}
57+
@section scripts {
58+
<script src="@Url.Content("~/js/learningPortal/available.js")" asp-append-version="true"></script>
59+
}
6060
}

‎DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,64 +6,64 @@
66
<link rel="stylesheet" href="@Url.Content("~/css/learningPortal/completed.css")" asp-append-version="true">
77

88
@{
9-
ViewData["Application"] = "Learning Portal";
10-
ViewData["Title"] = "My Completed Activities";
11-
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Completed";
12-
ViewData["HeaderPathName"] = "Learning Portal";
13-
ViewData["BannerText"] = Model.BannerText;
9+
ViewData["Application"] = "Learning Portal";
10+
ViewData["Title"] = "My Completed Activities";
11+
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Completed";
12+
ViewData["HeaderPathName"] = "Learning Portal";
13+
ViewData["BannerText"] = Model.BannerText;
1414
}
1515

1616
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
1717
{
18-
<vc:loading-spinner page-has-side-nav-menu="false" />
18+
<vc:loading-spinner page-has-side-nav-menu="false" />
1919
}
2020
<div class="nhsuk-grid-row" id="@(Model.JavascriptSearchSortFilterPaginateEnabled ? "js-styling-hidden-area-while-loading" : "no-js-styling")">
21-
<div class="nhsuk-grid-column-full">
22-
<h1 id="page-heading">My Completed Activities</h1>
23-
24-
@if (!Model.ApiIsAccessible)
25-
{
26-
<vc:learning-resource-warning css-class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-4"
27-
text="@LearningHubWarningTextHelper.ResourceDetailsMayBeOutOfDate" />
28-
}
21+
<div class="nhsuk-grid-column-full">
22+
<h1 id="page-heading">My Completed Activities</h1>
2923

30-
<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />
24+
@if (!Model.ApiIsAccessible)
25+
{
26+
<vc:learning-resource-warning css-class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-4"
27+
text="@LearningHubWarningTextHelper.ResourceDetailsMayBeOutOfDate" />
28+
}
3129

32-
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
33-
@if (Model.NoDataFound)
34-
{
35-
<p class="nhsuk-u-margin-top-4" role="alert">
36-
<b>No data to display</b>
37-
</p>
38-
}
39-
else
40-
{
41-
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
42-
<partial name="SearchablePage/_TopPagination" model="Model" />
43-
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
30+
<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />
4431

45-
<div id="searchable-elements">
46-
@foreach (var completedLearningItem in Model.CompletedActivities)
32+
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
33+
@if (Model.NoDataFound)
4734
{
48-
if (completedLearningItem is CompletedCourseViewModel)
49-
{
50-
<partial name="Completed/CompletedCourseCard/_CompletedCourseCard" model="completedLearningItem" />
51-
}
52-
else
53-
{
54-
<partial name="Completed/CompletedActionPlanResourceCard/_CompletedActionPlanResourceCard" model="completedLearningItem" />
55-
}
35+
<p class="nhsuk-u-margin-top-4" role="alert">
36+
<b>No data to display</b>
37+
</p>
38+
}
39+
else
40+
{
41+
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
42+
<partial name="SearchablePage/_TopPagination" model="Model" />
43+
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
44+
45+
<div id="searchable-elements">
46+
@foreach (var completedLearningItem in Model.CompletedActivities)
47+
{
48+
if (completedLearningItem is CompletedCourseViewModel)
49+
{
50+
<partial name="Completed/CompletedCourseCard/_CompletedCourseCard" model="completedLearningItem" />
51+
}
52+
else
53+
{
54+
<partial name="Completed/CompletedActionPlanResourceCard/_CompletedActionPlanResourceCard" model="completedLearningItem" />
55+
}
56+
}
57+
</div>
5658
}
57-
</div>
58-
}
5959

60-
<partial name="SearchablePage/_BottomPagination" model="Model" />
61-
</div>
60+
<partial name="SearchablePage/_BottomPagination" model="Model" />
61+
</div>
6262
</div>
6363

6464
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
6565
{
66-
@section scripts {
67-
<script src="@Url.Content("~/js/learningPortal/completed.js")" asp-append-version="true"></script>
68-
}
66+
@section scripts {
67+
<script src="@Url.Content("~/js/learningPortal/completed.js")" asp-append-version="true"></script>
68+
}
6969
}

‎DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,72 +8,72 @@
88
<link rel="stylesheet" href="@Url.Content("~/css/learningPortal/current.css")" asp-append-version="true">
99

1010
@{
11-
ViewData["Application"] = "Learning Portal";
12-
ViewData["Title"] = "My Current Activities";
13-
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Current";
14-
ViewData["HeaderPathName"] = "Learning Portal";
11+
ViewData["Application"] = "Learning Portal";
12+
ViewData["Title"] = "My Current Activities";
13+
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Current";
14+
ViewData["HeaderPathName"] = "Learning Portal";
1515
ViewData["BannerText"] = Model.BannerText;
1616
}
1717

1818
@section NavMenuItems {
19-
<partial name="Shared/_NavMenuItems" />
19+
<partial name="Shared/_NavMenuItems" />
2020
}
2121

22-
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
22+
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
2323
{
24-
<vc:loading-spinner page-has-side-nav-menu="false" />
24+
<vc:loading-spinner page-has-side-nav-menu="false" />
2525
}
2626
<div class="nhsuk-grid-row" id="@(Model.JavascriptSearchSortFilterPaginateEnabled ? "js-styling-hidden-area-while-loading" : "no-js-styling")">
27-
<div class="nhsuk-grid-column-full">
28-
<h1 id="page-heading">My Current Activities</h1>
29-
30-
@if (!Model.ApiIsAccessible)
31-
{
32-
<vc:learning-resource-warning css-class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-4"
33-
text="@LearningHubWarningTextHelper.ResourceDetailsMayBeOutOfDate" />
34-
}
27+
<div class="nhsuk-grid-column-full">
28+
<h1 id="page-heading">My Current Activities</h1>
3529

36-
<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />
30+
@if (!Model.ApiIsAccessible)
31+
{
32+
<vc:learning-resource-warning css-class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-4"
33+
text="@LearningHubWarningTextHelper.ResourceDetailsMayBeOutOfDate" />
34+
}
3735

38-
@if (Model.NoDataFound)
39-
{
40-
<p class="nhsuk-u-margin-top-4" role="alert">
41-
<b>You are not enrolled on anything.</b> View <a asp-action="Available">Available activities</a>.
42-
</p>
43-
}
44-
else
45-
{
46-
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
47-
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
48-
<partial name="SearchablePage/_TopPagination" model="Model" />
49-
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
36+
<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />
5037

51-
<div id="searchable-elements">
52-
@foreach (var currentLearningItem in Model.CurrentActivities)
38+
@if (Model.NoDataFound)
5339
{
54-
if (currentLearningItem is SelfAssessmentCardViewModel)
55-
{
56-
<partial name="SelfAssessments/_SelfAssessmentCard" model="currentLearningItem" />
57-
}
58-
else if (currentLearningItem is CurrentLearningResourceViewModel)
59-
{
60-
<partial name="Current/_CurrentLearningResourceCard" model="currentLearningItem" />
61-
}
62-
else
63-
{
64-
<partial name="Current/CurrentCourseCard/_CurrentCourseCard" model="currentLearningItem" />
65-
}
40+
<p class="nhsuk-u-margin-top-4" role="alert">
41+
<b>You are not enrolled on anything.</b> View <a asp-action="Available">Available activities</a>.
42+
</p>
43+
}
44+
else
45+
{
46+
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
47+
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
48+
<partial name="SearchablePage/_TopPagination" model="Model" />
49+
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
50+
51+
<div id="searchable-elements">
52+
@foreach (var currentLearningItem in Model.CurrentActivities)
53+
{
54+
if (currentLearningItem is SelfAssessmentCardViewModel)
55+
{
56+
<partial name="SelfAssessments/_SelfAssessmentCard" model="currentLearningItem" />
57+
}
58+
else if (currentLearningItem is CurrentLearningResourceViewModel)
59+
{
60+
<partial name="Current/_CurrentLearningResourceCard" model="currentLearningItem" />
61+
}
62+
else
63+
{
64+
<partial name="Current/CurrentCourseCard/_CurrentCourseCard" model="currentLearningItem" />
65+
}
66+
}
67+
</div>
6668
}
67-
</div>
68-
}
6969

70-
<partial name="SearchablePage/_BottomPagination" model="Model" />
71-
</div>
70+
<partial name="SearchablePage/_BottomPagination" model="Model" />
71+
</div>
7272
</div>
7373

7474
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
7575
{
76-
@section scripts {
77-
<script src="@Url.Content("~/js/learningPortal/current.js")" asp-append-version="true"></script>
78-
}
76+
@section scripts {
77+
<script src="@Url.Content("~/js/learningPortal/current.js")" asp-append-version="true"></script>
78+
}
7979
}

0 commit comments

Comments
 (0)