Skip to content

Commit 6678960

Browse files
rshrirohitrshrirohit
committed
Merge branch 'DLS-Release-v1.2.0' into UAT
2 parents 1dde515 + 02c9d1e commit 6678960

File tree

4 files changed

+59
-87
lines changed

4 files changed

+59
-87
lines changed

‎DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml‎

Lines changed: 51 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,17 @@
1717
{
1818
<div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
1919
<div class="nhsuk-card nhsuk-card--clickable">
20-
<div class="nhsuk-card__content beta-card__content">
20+
<div class="nhsuk-card__content nhsuk-card__content--primary">
2121
<h2 class="nhsuk-card__heading nhsuk-heading-m">
2222
<a class="nhsuk-card__link" asp-controller="LearningPortal" asp-action="Current">Learning Portal</a>
2323
</h2>
2424
<p class="nhsuk-card__description">Access to your current, available and completed learning courses.</p>
25-
</div>
26-
<div class="beta-hub-arrow">
27-
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
28-
xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
29-
<circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
30-
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
31-
stroke-miterlimit="10" stroke-width="2.667">
32-
<path d="M15.438 13l-3.771 3.771">
33-
</path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
25+
26+
<svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
27+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
28+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
29+
<path d="M15.438 13l-3.771 3.771" />
30+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
3431
</g>
3532
</svg>
3633
</div>
@@ -41,7 +38,7 @@
4138
{
4239
<div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
4340
<div class="nhsuk-card nhsuk-card--clickable">
44-
<div class="nhsuk-card__content beta-card__content">
41+
<div class="nhsuk-card__content nhsuk-card__content--primary">
4542
<h2 class="nhsuk-card__heading nhsuk-heading-m">
4643
<feature name="@(FeatureFlags.RefactoredTrackingSystem)">
4744
<a class="nhsuk-card__link" asp-controller="Dashboard" asp-action="Index">Tracking System</a>
@@ -51,15 +48,12 @@
5148
</feature>
5249
</h2>
5350
<p class="nhsuk-card__description">Manage and distribute learning to your organisation and access reports.</p>
54-
</div>
55-
<div class="beta-hub-arrow">
56-
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
57-
xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
58-
<circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
59-
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
60-
stroke-miterlimit="10" stroke-width="2.667">
61-
<path d="M15.438 13l-3.771 3.771">
62-
</path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
51+
52+
<svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
53+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
54+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
55+
<path d="M15.438 13l-3.771 3.771" />
56+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
6357
</g>
6458
</svg>
6559
</div>
@@ -69,26 +63,23 @@
6963
<feature name="@(FeatureFlags.RefactoredTrackingSystem)">
7064
<div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
7165
<div class="nhsuk-card nhsuk-card--clickable">
72-
<div class="nhsuk-card__content beta-card__content">
66+
<div class="nhsuk-card__content nhsuk-card__content--primary">
7367
<h2 class="nhsuk-card__heading nhsuk-heading-m">
7468
<a class="nhsuk-card__link" href="@Configuration.GetCurrentSystemBaseUrl()/tracking/dashboard">Legacy Tracking System</a>
7569
</h2>
7670
<p class="nhsuk-card__description">
7771
Access the old Tracking System if you can't find the functionality you need in the new one.
7872
Please raise a ticket to tell us about any missing functionality, too.
7973
</p>
80-
</div>
81-
<div class="beta-hub-arrow">
82-
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
83-
xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
84-
<circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
85-
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
86-
stroke-miterlimit="10" stroke-width="2.667">
87-
<path d="M15.438 13l-3.771 3.771">
88-
</path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
74+
<svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
75+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
76+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
77+
<path d="M15.438 13l-3.771 3.771" />
78+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
8979
</g>
9080
</svg>
9181
</div>
82+
9283
</div>
9384
</div>
9485
</feature>
@@ -98,20 +89,16 @@
9889
{
9990
<div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
10091
<div class="nhsuk-card nhsuk-card--clickable">
101-
<div class="nhsuk-card__content beta-card__content">
92+
<div class="nhsuk-card__content nhsuk-card__content--primary">
10293
<h2 class="nhsuk-card__heading nhsuk-heading-m">
10394
<a class="nhsuk-card__link" href="@Configuration.GetCurrentSystemBaseUrl()/cms/courses">Content Management System</a>
10495
</h2>
10596
<p class="nhsuk-card__description">Import and manage learning content that's delivered through the Digital Learning Solutions platform.</p>
106-
</div>
107-
<div class="beta-hub-arrow">
108-
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
109-
xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
110-
<circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
111-
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
112-
stroke-miterlimit="10" stroke-width="2.667">
113-
<path d="M15.438 13l-3.771 3.771">
114-
</path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
97+
<svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
98+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
99+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
100+
<path d="M15.438 13l-3.771 3.771" />
101+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
115102
</g>
116103
</svg>
117104
</div>
@@ -122,20 +109,16 @@
122109
{
123110
<div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
124111
<div class="nhsuk-card nhsuk-card--clickable">
125-
<div class="nhsuk-card__content beta-card__content">
112+
<div class="nhsuk-card__content nhsuk-card__content--primary">
126113
<h2 class="nhsuk-card__heading nhsuk-heading-m">
127114
<a class="nhsuk-card__link" asp-controller="Supervisor" asp-action="Index">Supervise</a>
128115
</h2>
129116
<p class="nhsuk-card__description">Assign and review staff profile assessments and arrange supervision sessions.</p>
130-
</div>
131-
<div class="beta-hub-arrow">
132-
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
133-
xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
134-
<circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
135-
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
136-
stroke-miterlimit="10" stroke-width="2.667">
137-
<path d="M15.438 13l-3.771 3.771">
138-
</path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
117+
<svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
118+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
119+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
120+
<path d="M15.438 13l-3.771 3.771" />
121+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
139122
</g>
140123
</svg>
141124
</div>
@@ -146,20 +129,16 @@
146129
{
147130
<div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
148131
<div class="nhsuk-card nhsuk-card--clickable">
149-
<div class="nhsuk-card__content beta-card__content">
132+
<div class="nhsuk-card__content nhsuk-card__content--primary">
150133
<h2 class="nhsuk-card__heading nhsuk-heading-m">
151134
<a class="nhsuk-card__link" href="@Configuration.GetCurrentSystemBaseUrl()/cms/contentcreator">Content Creator</a>
152135
</h2>
153136
<p class="nhsuk-card__description">Create interactive elearning and assessments.</p>
154-
</div>
155-
<div class="beta-hub-arrow">
156-
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
157-
xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
158-
<circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
159-
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
160-
stroke-miterlimit="10" stroke-width="2.667">
161-
<path d="M15.438 13l-3.771 3.771">
162-
</path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
137+
<svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
138+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
139+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
140+
<path d="M15.438 13l-3.771 3.771" />
141+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
163142
</g>
164143
</svg>
165144
</div>
@@ -170,20 +149,16 @@
170149
{
171150
<div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
172151
<div class="nhsuk-card nhsuk-card--clickable">
173-
<div class="nhsuk-card__content beta-card__content">
152+
<div class="nhsuk-card__content nhsuk-card__content--primary">
174153
<h2 class="nhsuk-card__heading nhsuk-heading-m">
175154
<a class="nhsuk-card__link" asp-controller="Frameworks" asp-action="Index">Frameworks</a>
176155
</h2>
177156
<p class="nhsuk-card__description">Create and distribute competency frameworks and role profiles.</p>
178-
</div>
179-
<div class="beta-hub-arrow">
180-
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
181-
xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
182-
<circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
183-
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
184-
stroke-miterlimit="10" stroke-width="2.667">
185-
<path d="M15.438 13l-3.771 3.771">
186-
</path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
157+
<svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
158+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
159+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
160+
<path d="M15.438 13l-3.771 3.771" />
161+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
187162
</g>
188163
</svg>
189164
</div>
@@ -194,7 +169,7 @@
194169
{
195170
<div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
196171
<div class="nhsuk-card nhsuk-card--clickable">
197-
<div class="nhsuk-card__content beta-card__content">
172+
<div class="nhsuk-card__content nhsuk-card__content--primary">
198173
<h2 class="nhsuk-card__heading nhsuk-heading-m">
199174
<feature name="@(FeatureFlags.RefactoredSuperAdminInterface)">
200175
<a class="nhsuk-card__link" asp-controller="Users" asp-action="Index">Super Admin</a>
@@ -204,15 +179,11 @@
204179
</feature>
205180
</h2>
206181
<p class="nhsuk-card__description">Manage content and settings across the whole system.</p>
207-
</div>
208-
<div class="beta-hub-arrow">
209-
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
210-
xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
211-
<circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
212-
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
213-
stroke-miterlimit="10" stroke-width="2.667">
214-
<path d="M15.438 13l-3.771 3.771">
215-
</path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
182+
<svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
183+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
184+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
185+
<path d="M15.438 13l-3.771 3.771" />
186+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
216187
</g>
217188
</svg>
218189
</div>

‎DigitalLearningSolutions.Web/Views/Frameworks/Developer/FrameworkPrintLayout.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
{
109109
groupNum++;
110110
int compNum = 0;
111-
<h2>Ungrouped competencies</h2>
111+
<h2>Ungrouped @Model.VocabPlural().ToLower()</h2>
112112
foreach (var frameworkCompetency in Model.FrameworkCompetencies)
113113
{
114114
compNum++;

‎DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@inject IConfiguration Configuration
22
@using DigitalLearningSolutions.Data.Extensions
3+
@using DigitalLearningSolutions.Web.Helpers
34
@using DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments
45
@using Microsoft.Extensions.Configuration
56
@model SelfAssessmentOverviewViewModel
@@ -113,7 +114,7 @@
113114
</summary>
114115
<div class="nhsuk-details__text">
115116
<partial name="SelfAssessments/_CompetencySummary" view-data="@competencySummariesEnumerator.Current" />
116-
@if (!String.IsNullOrEmpty(groupDetails.CompetencyGroupDescription))
117+
@if (!String.IsNullOrEmpty(StringHelper.StripHtmlTags(groupDetails.CompetencyGroupDescription)))
117118
{
118119
<p class="nhsuk-body-l nhsuk-u-margin-left-7">@Html.Raw(groupDetails.CompetencyGroupDescription)</p>
119120
}

0 commit comments

Comments
 (0)