Skip to content

Commit 065bd33

Browse files
kevwhitt-heekevwhitt-hee
committed
TD-4599 Implements links to legacy super admin from super admin - system
1 parent 0aeac45 commit 065bd33

File tree

3 files changed

+62
-43
lines changed

3 files changed

+62
-43
lines changed

‎DigitalLearningSolutions.Web/Controllers/SuperAdmin/SuperAdminFaqsController.cs‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ namespace DigitalLearningSolutions.Web.Controllers.SuperAdmin
1111
using Microsoft.AspNetCore.Mvc;
1212
using Microsoft.FeatureManagement.Mvc;
1313
using DigitalLearningSolutions.Web.ViewModels.SuperAdmin.Faqs;
14+
using DigitalLearningSolutions.Data.Extensions;
15+
using Microsoft.Extensions.Configuration;
1416

1517
[FeatureGate(FeatureFlags.RefactoredSuperAdminInterface)]
1618
[SetSelectedTab(nameof(NavMenuTab.System))]
@@ -20,10 +22,14 @@ namespace DigitalLearningSolutions.Web.Controllers.SuperAdmin
2022
public class SuperAdminFaqsController : Controller
2123
{
2224
private readonly IFaqsService faqsService;
25+
private readonly IConfiguration configuration;
26+
private readonly string legacyUrl;
2327

24-
public SuperAdminFaqsController(IFaqsService faqsService)
28+
public SuperAdminFaqsController(IFaqsService faqsService, IConfiguration configuration)
2529
{
2630
this.faqsService = faqsService;
31+
this.configuration = configuration;
32+
legacyUrl = configuration.GetCurrentSystemBaseUrl();
2733
}
2834

2935
public IActionResult Index()
@@ -37,5 +43,21 @@ public IActionResult Index()
3743

3844
return View("SuperAdminFaqs", model);
3945
}
46+
public IActionResult ManageFaqs()
47+
{
48+
return RedirectToPage(legacyUrl + "tracking/admin-faqs");
49+
}
50+
public IActionResult Resources()
51+
{
52+
return RedirectToPage(legacyUrl + "tracking/admin-resources");
53+
}
54+
public IActionResult Notifications()
55+
{
56+
return RedirectToPage(legacyUrl + "tracking/admin-notifications");
57+
}
58+
public IActionResult Brands()
59+
{
60+
return RedirectToPage(legacyUrl + "tracking/admin-landing");
61+
}
4062
}
4163
}

‎DigitalLearningSolutions.Web/Views/SuperAdmin/Shared/_SystemSideNavMenu.cshtml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@
33

44
<h2 class="side-nav__heading">System</h2>
55
<ul class="nhsuk-list side-nav__list">
6-
<vc:side-menu-link asp-action="Index"
7-
asp-controller="SuperAdminFaqs"
8-
link-text="Configuration"
9-
is-current-page="@(Model == SuperAdminSystemPage.Configuration)" />
106

11-
<vc:side-menu-link asp-action="Index"
7+
<vc:side-menu-link asp-action="Brands"
128
asp-controller="SuperAdminFaqs"
13-
link-text="Manage Lists"
9+
link-text="Brands"
1410
is-current-page="@(Model == SuperAdminSystemPage.ManageLists)" />
1511

16-
<vc:side-menu-link asp-action="Index"
12+
<vc:side-menu-link asp-action="Notifications"
1713
asp-controller="SuperAdminFaqs"
1814
link-text="Notifications"
1915
is-current-page="@(Model == SuperAdminSystemPage.Notifications)" />
2016

21-
<vc:side-menu-link asp-action="Index"
17+
<vc:side-menu-link asp-action="Resources"
2218
asp-controller="SuperAdminFaqs"
2319
link-text="Resources"
2420
is-current-page="@(Model == SuperAdminSystemPage.Resources)" />

‎DigitalLearningSolutions.Web/Views/SuperAdmin/SuperAdminFaqs/SuperAdminFaqs.cshtml‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,46 @@
44
<link rel="stylesheet" href="@Url.Content("~/css/superAdmin/faqs.css")" asp-append-version="true">
55

66
@{
7-
ViewData["Title"] = "FAQs";
7+
ViewData["Title"] = "FAQs";
88
}
99

1010
<div class="nhsuk-grid-row">
11-
<div class="nhsuk-grid-column-one-quarter">
12-
<nav class="side-nav-menu" aria-label="Side navigation bar">
13-
<partial name="~/Views/SuperAdmin/Shared/_SystemSideNavMenu.cshtml" model="Model.CurrentPage" />
14-
</nav>
15-
</div>
16-
17-
<div class="nhsuk-grid-column-three-quarters">
18-
<div class="nhsuk-grid-row">
19-
<div class="nhsuk-grid-column-one-third">
20-
<h1 class="nhsuk-heading-xl">FAQs</h1>
21-
</div>
22-
<div class="nhsuk-grid-column-two-thirds heading-button-group">
23-
<a class="nhsuk-button heading-button" role="button">
24-
Add
25-
</a>
26-
</div>
11+
<div class="nhsuk-grid-column-one-quarter">
12+
<nav class="side-nav-menu" aria-label="Side navigation bar">
13+
<partial name="~/Views/SuperAdmin/Shared/_SystemSideNavMenu.cshtml" model="Model.CurrentPage" />
14+
</nav>
2715
</div>
2816

29-
@if (!Model.Faqs.Any())
30-
{
31-
<p class="nhsuk-u-margin-top-4" role="alert">
32-
<b>No FAQs found.</b>
33-
</p>
34-
}
35-
else
36-
{
37-
<div id="searchable-elements">
38-
@foreach (var faq in Model.Faqs)
17+
<div class="nhsuk-grid-column-three-quarters">
18+
<div class="nhsuk-grid-row">
19+
<div class="nhsuk-grid-column-one-third">
20+
<h1 class="nhsuk-heading-xl">FAQs</h1>
21+
</div>
22+
<div class="nhsuk-grid-column-two-thirds heading-button-group">
23+
<a class="nhsuk-button heading-button" role="button" asp-action="ManageFaqs"
24+
asp-controller="SuperAdminFaqs">
25+
Manage FAQs
26+
</a>
27+
</div>
28+
</div>
29+
30+
@if (!Model.Faqs.Any())
3931
{
40-
<partial name="_FaqCard" model="faq" />
32+
<p class="nhsuk-u-margin-top-4" role="alert">
33+
<b>No FAQs found.</b>
34+
</p>
4135
}
42-
</div>
43-
}
44-
<nav class="side-nav-menu-bottom" aria-label="Bottom navigation bar">
45-
<partial name="~/Views/SuperAdmin/Shared/_SystemSideNavMenu.cshtml" model="Model.CurrentPage" />
46-
</nav>
47-
</div>
36+
else
37+
{
38+
<div id="searchable-elements">
39+
@foreach (var faq in Model.Faqs)
40+
{
41+
<partial name="_FaqCard" model="faq" />
42+
}
43+
</div>
44+
}
45+
<nav class="side-nav-menu-bottom" aria-label="Bottom navigation bar">
46+
<partial name="~/Views/SuperAdmin/Shared/_SystemSideNavMenu.cshtml" model="Model.CurrentPage" />
47+
</nav>
48+
</div>
4849
</div>

0 commit comments

Comments
 (0)