Skip to content
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

Jump to bottom

Fixing html error in the admin UI (Lombiq Technologies: OCORE-87) #11425

Merged
merged 9 commits into from
Mar 30, 2022
Merged

Fixing html error in the admin UI (Lombiq Technologies: OCORE-87) #11425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2132c30
Updated audittrail id in the setting menu
Mar 22, 2022
67256b4
Fixed buttons
Mar 22, 2022
2c349c3
Updated links to button
Mar 23, 2022
383adac
Updated admin css
Mar 23, 2022
35fda0c
Fixed collapse button
Mar 24, 2022
b362716
Updated text hiding
Mar 28, 2022
254ca31
Updated TheAdmin css for darkmode
Mar 28, 2022
c81546e
Fixed UserMenu and Layout html errors
Mar 29, 2022
a9db782
Reverted self-closing resource tag
Mar 30, 2022
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
8 changes: 4 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.Users/Views/UserMenu.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@inject IAuthorizationService AuthorizationService
<div class="dropdown">
<form asp-route-area="OrchardCore.Users" asp-controller="Account" asp-action="LogOff" method="post" class="form-inline" class="no-multisubmit">
<button class="ml-3 dropdown-toggle" id="navbarDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-toggle-tooltip="tooltip" title="@User.Identity.Name">
<form asp-route-area="OrchardCore.Users" asp-controller="Account" asp-action="LogOff" method="post" class="form-inline no-multisubmit">
<button type="button" class="ml-3 dropdown-toggle" id="navbarDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-toggle-tooltip="tooltip" title="@User.Identity.Name">
<i class="fa fa-fw fa-user" aria-hidden="true"></i>
<span>@T[User.Identity.Name]</span>
</button>
Expand All @@ -10,9 +10,9 @@
<div class="dropdown-divider"></div>
@if (await AuthorizationService.AuthorizeAsync(User, Permissions.ManageOwnUserInformation))
{
<a class="dropdown-item" asp-area="OrchardCore.Users" asp-action="Edit" asp-controller="Admin" asp-route-returnUrl="@FullRequestPath"><span><i class="far fa-address-card" aria-hidden="true"></i></span>&nbsp;<span> @T["Profile"]</span></a>
<a class="dropdown-item" asp-area="OrchardCore.Users" asp-action="Edit" asp-controller="Admin" asp-route-returnurl="@FullRequestPath"><span><i class="far fa-address-card" aria-hidden="true"></i></span>&nbsp;<span> @T["Profile"]</span></a>
Piedone marked this conversation as resolved.
Show resolved Hide resolved
}
<a class="dropdown-item" asp-area="OrchardCore.Users" asp-controller="Account" asp-action="ChangePassword" asp-route-returnUrl="@FullRequestPath"><span><i class="fas fa-key" aria-hidden="true"></i></span>&nbsp;<span> @T["Change password"]</span></a>
<a class="dropdown-item" asp-area="OrchardCore.Users" asp-controller="Account" asp-action="ChangePassword" asp-route-returnurl="@FullRequestPath"><span><i class="fas fa-key" aria-hidden="true"></i></span>&nbsp;<span> @T["Change password"]</span></a>
<button type="submit" class="dropdown-item"><span><i class="fa fa-sign-out-alt" aria-hidden="true"></i></span>&nbsp;<span> @T["Log off"]</span></button>
</div>
</form>
Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<script asp-name="font-awesome-v4-shims" at="Head" version="6"></script>
<script asp-name="js-cookie" at="Foot"></script>
<script asp-name="admin" version="1" at="Foot"></script>
<resources type="Header" />
<resources type="Header"></resources>
Piedone marked this conversation as resolved.
Show resolved Hide resolved

<!-- This script can't wait till the footer -->
<script asp-name="admin-head" version="1"></script>
Expand All @@ -43,7 +43,7 @@
@await RenderSectionAsync("NavbarTop", required: false)
@if (adminSettings.DisplayDarkMode)
{
<button id="btn-darkmode" class="ml-3" data-toggle="tooltip" title="@(darkMode ? T["Light mode"] : T["Dark mode"])">
<button type="button" id="btn-darkmode" class="ml-3" data-toggle="tooltip" title="@(darkMode ? T["Light mode"] : T["Dark mode"])">
@if (darkMode)
{
<i class="fas fa-sun" aria-hidden="true"></i>
Expand All @@ -56,7 +56,7 @@
}
</button>
}
<a href="@Url.Content("~/")" class="ml-3" target="_blank" data-toggle="tooltip" title="@T["Visit Site"]">
<a href="@Url.Content("~/")" class="ml-3" target="_blank" data-toggle="tooltip" aria-label="@T["Visit Site"]" title="@T["Visit Site"]">
<i class="fa fa-fw fa-external-link" aria-hidden="true"></i>
</a>
@await DisplayAsync(await New.UserMenu())
Expand All @@ -67,7 +67,7 @@
<div id="ta-left-sidebar" class="d-flex flex-column justify-content-between align-items-stretch">
@await RenderSectionAsync("Navigation", required: false)
<div class="footer">
<button class="leftbar-compactor" title="@T["Collapse / expand menu"]">
<button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
<span>@T["Collapse / expand menu"]</span>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Next time use class="d-none"

</button>
</div>
Expand All @@ -88,6 +88,6 @@

</div>
<div id="confirmRemoveModalMetadata" data-title="@T["Delete"]" data-message="@T["Are you sure you want to remove this element?"]" data-ok-text="@T["Ok"]" data-cancel-text="@T["Cancel"]" data-ok-class="btn-danger" data-cancel-class="btn-secondary"></div>
<resources type="Footer" />
<resources type="Footer"></resources>
</body>
</html>