Skip to content

Commit 46b4f4d

Browse files
kevwhitt-heekevwhitt-hee
committed
Formatting and labelling fixes
1 parent af9c63b commit 46b4f4d

File tree

3 files changed

+198
-196
lines changed

3 files changed

+198
-196
lines changed

‎DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,109 @@
11
@using DigitalLearningSolutions.Data.Models.CompetencyAssessments;
22
@model CompetencyAssessmentBase;
33
@{
4-
ViewData["Title"] = "New Competency Assessments";
5-
ViewData["Application"] = "Framework Service";
4+
ViewData["Title"] = "New Competency Assessments";
5+
ViewData["Application"] = "Framework Service";
66
}
77
<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
88
@section NavMenuItems {
9-
<partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
9+
<partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
1010
}
11-
@if ((string)ViewContext.RouteData.Values["actionName"] == "New")
11+
@if ((string)ViewContext.RouteData.Values["actionName"] == "New")
1212
{
13-
@section NavBreadcrumbs {
14-
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
15-
<div class="nhsuk-width-container">
16-
<ol class="nhsuk-breadcrumb__list">
17-
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
18-
<li class="nhsuk-breadcrumb__item">Create competency assessment</li>
19-
</ol>
20-
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Back to competency assessments</a></p>
21-
</div>
22-
</nav>
23-
}
13+
@section NavBreadcrumbs {
14+
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
15+
<div class="nhsuk-width-container">
16+
<ol class="nhsuk-breadcrumb__list">
17+
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
18+
<li class="nhsuk-breadcrumb__item">Create competency assessment</li>
19+
</ol>
20+
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Back to competency assessments</a></p>
21+
</div>
22+
</nav>
23+
}
2424
}
2525
else
2626
{
27-
@section NavBreadcrumbs {
28-
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
29-
<div class="nhsuk-width-container">
30-
<ol class="nhsuk-breadcrumb__list">
31-
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
32-
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID" asp-route-tabname="Details">Competency Assessment Details</a></li>
33-
<li class="nhsuk-breadcrumb__item">Name</li>
34-
</ol>
35-
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID" asp-route-tabname="Details">Back to competency assessment detail</a></p>
36-
</div>
37-
</nav>
38-
}
27+
@section NavBreadcrumbs {
28+
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
29+
<div class="nhsuk-width-container">
30+
<ol class="nhsuk-breadcrumb__list">
31+
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
32+
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID" asp-route-tabname="Details">Competency Assessment Details</a></li>
33+
<li class="nhsuk-breadcrumb__item">Name</li>
34+
</ol>
35+
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID" asp-route-tabname="Details">Back to competency assessment detail</a></p>
36+
</div>
37+
</nav>
38+
}
3939
}
4040
@if ((string)ViewContext.RouteData.Values["actionName"] == "New")
4141
{
42-
<h1>Create a new competency assessment</h1>
42+
<h1>Create a new competency assessment</h1>
4343
}
4444
else
4545
{
46-
<h1>Edit competency assessment name</h1>
46+
<h1>Edit competency assessment name</h1>
4747
}
4848
<form method="post">
49-
@if (!ViewData.ModelState.IsValid)
50-
{
51-
<partial name="_ErrorSummary" />
52-
}
53-
<nhs-form-group nhs-validation-for="CompetencyAssessmentName">
54-
<label class="nhsuk-label" for="framework-name-hint">
55-
<h2>What is the name of your competency assessment?</h2>
56-
</label>
57-
<div class="nhsuk-hint" id="framework-name-hint">
58-
Choose a title that identifies the job role or roles that this profile applies to and the scope of capabilities covered.
59-
</div>
60-
<span nhs-validation-for="CompetencyAssessmentName"></span>
61-
<input class="nhsuk-input" asp-for="CompetencyAssessmentName" id="roleprofilename" name="CompetencyAssessmentName" type="text" error-class-toggle="nhsuk-input--error" aria-describedby="framework-name-hint">
62-
</nhs-form-group>
63-
<input name="ID" type="hidden" asp-for="ID" />
64-
<input name="Description" type="hidden" asp-for="Description" />
65-
<input name="brandId" type="hidden" asp-for="BrandID" />
66-
<input name="ownerAdminId" type="hidden" asp-for="OwnerAdminID" />
67-
<input name="parentCompetencyAssessmentID" type="hidden" asp-for="ParentCompetencyAssessmentID" />
68-
<input name="publishStatusId" type="hidden" asp-for="PublishStatusID" />
69-
<input name="national" type="hidden" asp-for="National" />
70-
<input name="public" type="hidden" asp-for="Public" />
71-
<input name="publishStatusId" type="hidden" asp-for="PublishStatusID" />
72-
<input name="nrpProfessionalGroupID" type="hidden" asp-for="NRPProfessionalGroupID" />
73-
<input name="nrpSubGroupID" type="hidden" asp-for="NRPSubGroupID" />
74-
<input name="nrpRoleID" type="hidden" asp-for="NRPRoleID" />
75-
<input name="userRole" type="hidden" asp-for="UserRole" />
76-
@if ((string)ViewContext.RouteData.Values["actionName"] == "New")
77-
{
78-
<button class="nhsuk-button" type="submit">
79-
Next
80-
</button>
81-
<div class="nhsuk-back-link">
82-
<a class="nhsuk-back-link__link" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">
83-
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
84-
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
85-
</svg>
86-
Cancel
87-
</a>
88-
</div>
89-
}
90-
else
91-
{
92-
@if (Model.PublishStatusID == 3)
49+
@if (!ViewData.ModelState.IsValid)
50+
{
51+
<partial name="_ErrorSummary" />
52+
}
53+
<nhs-form-group nhs-validation-for="CompetencyAssessmentName">
54+
<label class="nhsuk-label" for="roleprofilename">
55+
<h2>What is the name of your competency assessment?</h2>
56+
</label>
57+
<div class="nhsuk-hint" id="assessment-name-hint">
58+
Choose a title that identifies scope of capabilities covered and/or the roles or levels the assessment targets.
59+
</div>
60+
<span nhs-validation-for="CompetencyAssessmentName"></span>
61+
<input class="nhsuk-input" asp-for="CompetencyAssessmentName" id="roleprofilename" name="CompetencyAssessmentName" type="text" error-class-toggle="nhsuk-input--error" aria-describedby="assessment-name-hint">
62+
</nhs-form-group>
63+
<input name="ID" type="hidden" asp-for="ID" />
64+
<input name="Description" type="hidden" asp-for="Description" />
65+
<input name="brandId" type="hidden" asp-for="BrandID" />
66+
<input name="ownerAdminId" type="hidden" asp-for="OwnerAdminID" />
67+
<input name="parentCompetencyAssessmentID" type="hidden" asp-for="ParentCompetencyAssessmentID" />
68+
<input name="publishStatusId" type="hidden" asp-for="PublishStatusID" />
69+
<input name="national" type="hidden" asp-for="National" />
70+
<input name="public" type="hidden" asp-for="Public" />
71+
<input name="publishStatusId" type="hidden" asp-for="PublishStatusID" />
72+
<input name="nrpProfessionalGroupID" type="hidden" asp-for="NRPProfessionalGroupID" />
73+
<input name="nrpSubGroupID" type="hidden" asp-for="NRPSubGroupID" />
74+
<input name="nrpRoleID" type="hidden" asp-for="NRPRoleID" />
75+
<input name="userRole" type="hidden" asp-for="UserRole" />
76+
@if ((string)ViewContext.RouteData.Values["actionName"] == "New")
77+
{
78+
<button class="nhsuk-button" type="submit">
79+
Next
80+
</button>
81+
<div class="nhsuk-back-link">
82+
<a class="nhsuk-back-link__link" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">
83+
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
84+
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
85+
</svg>
86+
Cancel
87+
</a>
88+
</div>
89+
}
90+
else
9391
{
94-
<partial name="Shared/_PublishedWarning" />
92+
@if (Model.PublishStatusID == 3)
93+
{
94+
<partial name="Shared/_PublishedWarning" />
95+
}
96+
<button class="nhsuk-button" type="submit">
97+
Save
98+
</button>
99+
<div class="nhsuk-back-link">
100+
<a class="nhsuk-back-link__link" asp-action="ManageCompetencyAssessment" asp-route-frameworkId="@Model.ID" asp-route-tabname="Details">
101+
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
102+
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
103+
</svg>
104+
Cancel
105+
</a>
106+
</div>
95107
}
96-
<button class="nhsuk-button" type="submit">
97-
Save
98-
</button>
99-
<div class="nhsuk-back-link">
100-
<a class="nhsuk-back-link__link" asp-action="ManageCompetencyAssessment" asp-route-frameworkId="@Model.ID" asp-route-tabname="Details">
101-
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
102-
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
103-
</svg>
104-
Cancel
105-
</a>
106-
</div>
107-
}
108108

109109
</form>

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

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
11
@using DigitalLearningSolutions.Web.ViewModels.Frameworks;
22
@model FrameworkViewModel;
33
@{
4-
ViewData["Title"] = Model.DetailFramework.FrameworkName;
5-
ViewData["Application"] = "Framework Service";
6-
ViewData["HeaderPathName"] = "Framework Service";
4+
ViewData["Title"] = Model.DetailFramework.FrameworkName;
5+
ViewData["Application"] = "Framework Service";
6+
ViewData["HeaderPathName"] = "Framework Service";
77
}
88
<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
99
@section NavMenuItems {
10-
<partial name="Shared/_NavMenuItems" />
10+
<partial name="Shared/_NavMenuItems" />
1111
}
12-
@section NavBreadcrumbs {
13-
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
14-
<div class="nhsuk-width-container">
15-
<ol class="nhsuk-breadcrumb__list">
16-
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
17-
<li class="nhsuk-breadcrumb__item">Framework @ViewContext.RouteData.Values["tabname"]</li>
18-
</ol>
19-
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewFrameworks" asp-route-tabname="Mine">Back to My Frameworks</a></p>
20-
</div>
21-
</nav>
12+
@section NavBreadcrumbs {
13+
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
14+
<div class="nhsuk-width-container">
15+
<ol class="nhsuk-breadcrumb__list">
16+
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
17+
<li class="nhsuk-breadcrumb__item">Framework @ViewContext.RouteData.Values["tabname"]</li>
18+
</ol>
19+
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewFrameworks" asp-route-tabname="Mine">Back to My Frameworks</a></p>
20+
</div>
21+
</nav>
2222
}
23-
<div class="nhsuk-grid-row">
23+
<div class="nhsuk-grid-row">
2424

2525
<div class="nhsuk-grid-column-full">
26-
<h1>
27-
@Model.DetailFramework.FrameworkName
28-
</h1>
26+
<h1>
27+
@Model.DetailFramework.FrameworkName
28+
</h1>
2929
</div>
30-
</div>
31-
<div class="nhsuk-grid-row">
30+
</div>
31+
<div class="nhsuk-grid-row">
3232
<div class="nhsuk-grid-column-two-thirds">
33-
<ol class="hee-fwservice--framework-progress-bar">
34-
<li class=@(Model.DetailFramework.PublishStatusID == 1 ? "active" : "")>
35-
<div class="hee-fwservice--framework-progress-marker">1</div><div class="hee-fwservice--framework-progress-caption">In draft</div>
36-
</li>
37-
<li class=@(Model.DetailFramework.PublishStatusID == 2 ? "active" : "")>
38-
<div class="hee-fwservice--framework-progress-marker">2</div><div class="hee-fwservice--framework-progress-caption">In review</div>
39-
</li>
40-
<li class=@(Model.DetailFramework.PublishStatusID == 3 ? "active" : "")>
41-
<div class="hee-fwservice--framework-progress-marker">3</div><div class="hee-fwservice--framework-progress-caption">Published</div>
42-
</li>
43-
</ol>
33+
<ol class="hee-fwservice--framework-progress-bar">
34+
<li class=@(Model.DetailFramework.PublishStatusID == 1 ? "active" : "")>
35+
<div class="hee-fwservice--framework-progress-marker">1</div><div class="hee-fwservice--framework-progress-caption">In draft</div>
36+
</li>
37+
<li class=@(Model.DetailFramework.PublishStatusID == 2 ? "active" : "")>
38+
<div class="hee-fwservice--framework-progress-marker">2</div><div class="hee-fwservice--framework-progress-caption">In review</div>
39+
</li>
40+
<li class=@(Model.DetailFramework.PublishStatusID == 3 ? "active" : "")>
41+
<div class="hee-fwservice--framework-progress-marker">3</div><div class="hee-fwservice--framework-progress-caption">Published</div>
42+
</li>
43+
</ol>
4444
</div>
4545
<div class="nhsuk-grid-column-one-third">
46-
@*<a class="nhsuk-button nhsuk-button--secondary">Preview</a>*@
47-
@if (Model.DetailFramework.UserRole > 1)
48-
{
49-
if (Model.DetailFramework.PublishStatusID == 2)
50-
{
51-
<a role="button" asp-action="ViewFrameworkReviews" asp-route-frameworkId="@Model.DetailFramework.ID" class="nhsuk-button">Publish</a>
52-
}
53-
else if (Model.DetailFramework.PublishStatusID == 3)
54-
{
55-
<button type="submit" class="nhsuk-button">Unpublish</button>
46+
@*<a class="nhsuk-button nhsuk-button--secondary">Preview</a>*@
47+
@if (Model.DetailFramework.UserRole > 1)
48+
{
49+
if (Model.DetailFramework.PublishStatusID == 2)
50+
{
51+
<a role="button" asp-action="ViewFrameworkReviews" asp-route-frameworkId="@Model.DetailFramework.ID" class="nhsuk-button">Publish</a>
52+
}
53+
else if (Model.DetailFramework.PublishStatusID == 3)
54+
{
55+
<button type="submit" class="nhsuk-button">Unpublish</button>
5656
<a role="button" asp-controller="CompetencyAssessments" asp-action="CompetencyAssessmentName" asp-route-actionName="New" asp-route-frameworkId="@Model.DetailFramework.ID" class="nhsuk-button nhsuk-button--secondary">Create assessment</a>
57-
}
58-
else
59-
{
60-
<a role="button" asp-action="SendForReview" asp-route-frameworkId="@Model.DetailFramework.ID" class="nhsuk-button">Send for review</a>
61-
}
62-
}
63-
@if (Model.DetailFramework.FrameworkReviewID != null)
64-
{
65-
<a role="button" asp-action="LoadReview" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-reviewId="@Model.DetailFramework.FrameworkReviewID" class="nhsuk-button">Submit my review</a>
66-
}
67-
</div>
57+
}
58+
else
59+
{
60+
<a role="button" asp-action="SendForReview" asp-route-frameworkId="@Model.DetailFramework.ID" class="nhsuk-button">Send for review</a>
61+
}
62+
}
63+
@if (Model.DetailFramework.FrameworkReviewID != null)
64+
{
65+
<a role="button" asp-action="LoadReview" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-reviewId="@Model.DetailFramework.FrameworkReviewID" class="nhsuk-button">Submit my review</a>
66+
}
67+
</div>
6868
</div>
6969

7070
<partial name="_SecondaryTabsNavMenu" model="Model.TabNavLinks" />
7171

7272
<div class="nhsuk-grid-row">
73-
<div class="nhsuk-grid-column-full">
74-
@if ((string)ViewContext.RouteData.Values["tabname"] == "Structure")
75-
{
76-
<partial name="_Structure.cshtml" model="Model" />
77-
}
78-
else if ((string)ViewContext.RouteData.Values["tabname"] == "Details")
79-
{
80-
<partial name="_Details.cshtml" model="Model" />
81-
}
82-
else if ((string)ViewContext.RouteData.Values["tabname"] == "Comments")
83-
{
84-
<partial name="_Comments.cshtml" model="Model" />
85-
}
86-
</div>
73+
<div class="nhsuk-grid-column-full">
74+
@if ((string)ViewContext.RouteData.Values["tabname"] == "Structure")
75+
{
76+
<partial name="_Structure.cshtml" model="Model" />
77+
}
78+
else if ((string)ViewContext.RouteData.Values["tabname"] == "Details")
79+
{
80+
<partial name="_Details.cshtml" model="Model" />
81+
}
82+
else if ((string)ViewContext.RouteData.Values["tabname"] == "Comments")
83+
{
84+
<partial name="_Comments.cshtml" model="Model" />
85+
}
86+
</div>
8787
</div>

0 commit comments

Comments
 (0)