Skip to content

HEEDLS-465 - Made help and github links open in new tabs #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 8, 2021
Merged

HEEDLS-465 - Made help and github links open in new tabs #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28a9497
HEEDLS-465 - Made help and github links open in new tabs
DanBloxham-sw Jul 8, 2021
7bd6a5f
HEEDLS-465 - Cleaned up code
DanBloxham-sw Jul 8, 2021
38852ba
HEEDLS-465 - Revert side menu link view component
DanBloxham-sw Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ...alLearningSolutions.Web/ViewModels/Common/ViewComponents/SideMenuLinkWithHrefViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@

public class SideMenuLinkWithHrefViewModel
{
public readonly Dictionary<string, string>? AspAllRouteData;
public readonly string? Href;

public readonly string LinkText;

public readonly bool IsCurrentPage;
public readonly string LinkText;

public readonly Dictionary<string, string>? AspAllRouteData;

public SideMenuLinkWithHrefViewModel(string hRef, string linkText, bool isCurrentPage, Dictionary<string, string>? aspAllRouteData)
public SideMenuLinkWithHrefViewModel(
string hRef,
string linkText,
bool isCurrentPage,
Dictionary<string, string>? aspAllRouteData
)
{
Href = hRef;
LinkText = linkText;
Expand Down
4 changes: 3 additions & 1 deletion DigitalLearningSolutions.Web/Views/Shared/Components/SideMenuLinkWithHref/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
</li>
} else {
<li class="side-nav__item">
<a class="side-nav__link" href="@Model.Href" asp-all-route-data="@Model.AspAllRouteData">@Model.LinkText</a>
<a class="side-nav__link" href="@Model.Href" asp-all-route-data="@Model.AspAllRouteData">
@Model.LinkText
</a>
</li>
}
79 changes: 48 additions & 31 deletions DigitalLearningSolutions.Web/Views/Support/Shared/_SupportSideNavMenu.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,52 @@

<h2 class="side-nav__heading">Support</h2>
<ul class="nhsuk-list side-nav__list">
<vc:side-menu-link
asp-action="Index"
asp-controller="Support"
asp-all-route-data="@routeData"
link-text="Support"
is-current-page="@(Model.CurrentPage == SupportPage.Support)" />

<vc:side-menu-link-with-href
href="@configuration["CurrentSystemBaseUrl"]/help/Introduction.html"
link-text="Help documentation"
is-current-page="@(Model.CurrentPage == SupportPage.HelpDocumentation)" />

<vc:side-menu-link-with-href
href="@configuration["CurrentSystemBaseUrl"]/tracking/faqs"
link-text="FAQs"
is-current-page="@(Model.CurrentPage == SupportPage.Faqs)" />

<vc:side-menu-link-with-href
href="@configuration["CurrentSystemBaseUrl"]/tracking/resources"
link-text="Resources"
is-current-page="@(Model.CurrentPage == SupportPage.Resources)" />

<vc:side-menu-link-with-href
href="@configuration["CurrentSystemBaseUrl"]/tracking/tickets"
link-text="Support tickets"
is-current-page="@(Model.CurrentPage == SupportPage.SupportTickets)" />

<vc:side-menu-link-with-href
href="https://github.com/TechnologyEnhancedLearning/DLSV2/projects/1?fullscreen=true"
link-text="Change requests"
is-current-page="@(Model.CurrentPage == SupportPage.ChangeRequests)" />
<vc:side-menu-link asp-action="Index"
asp-controller="Support"
asp-all-route-data="@routeData"
link-text="Support"
is-current-page="@(Model.CurrentPage == SupportPage.Support)" />

@if (Model.CurrentPage == SupportPage.HelpDocumentation)
{
<li class="side-nav__item side-nav__item--selected" aria-current="page">
<span class="nhsuk-contents-list__current">Help documentation</span>
</li>
}
else
{
<li class="side-nav__item">
<a class="side-nav__link" href="@configuration["CurrentSystemBaseUrl"]/help/Introduction.html" target="_blank">
Help documentation
</a>
</li>
}

<vc:side-menu-link-with-href href="@configuration["CurrentSystemBaseUrl"]/tracking/faqs"
link-text="FAQs"
is-current-page="@(Model.CurrentPage == SupportPage.Faqs)" />

<vc:side-menu-link-with-href href="@configuration["CurrentSystemBaseUrl"]/tracking/resources"
link-text="Resources"
is-current-page="@(Model.CurrentPage == SupportPage.Resources)" />

<vc:side-menu-link-with-href href="@configuration["CurrentSystemBaseUrl"]/tracking/tickets"
link-text="Support tickets"
is-current-page="@(Model.CurrentPage == SupportPage.SupportTickets)" />

@if (Model.CurrentPage == SupportPage.ChangeRequests)
{
<li class="side-nav__item side-nav__item--selected" aria-current="page">
<span class="nhsuk-contents-list__current">Change requests</span>
</li>
}
else
{
<li class="side-nav__item">
<a class="side-nav__link" href="https://github.com/TechnologyEnhancedLearning/DLSV2/projects/1?fullscreen=true" target="_blank" rel="noreferrer">
Change requests
</a>
</li>
}

</ul>