RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41550 from aaryanporwal/navbar-fix

Browse Source 
mgr/dashboard: fix for right sidebar nav icon not clickable

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: aaryanporwal <NOT@FOUND>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
This commit is contained in:
Ernesto Puerta 2021-06-11 19:46:15 +02:00 committed by GitHub
commit 0b9f06d63d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
View File

@ -18,7 +18,7 @@
<button type="button"
class="navbar-toggler"
(click)="isCollapsed = !isCollapsed">
(click)="toggleRightSidebar()">
<span i18n
class="sr-only">Toggle navigation</span>
<span class="">
@ -26,7 +26,8 @@
</span>
</button>
<div class="collapse navbar-collapse">
<div class="collapse navbar-collapse"
[ngClass]="{'show': rightSidebarOpen}">
<ul class="nav navbar-nav cd-navbar-utility my-2 my-md-0">
<ng-container *ngTemplateOutlet="cd_utilities"> </ng-container>
</ul>
@ -57,7 +58,8 @@
<cd-language-selector class="cd-navbar"></cd-language-selector>
</li>
<li class="nav-item ">
<cd-notifications class="cd-navbar"></cd-notifications>
<cd-notifications class="cd-navbar"
(click)="toggleRightSidebar()"></cd-notifications>
</li>
<li class="nav-item ">
<cd-dashboard-help class="cd-navbar"></cd-dashboard-help>

6
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
View File

@ -29,7 +29,7 @@ export class NavigationComponent implements OnInit, OnDestroy {
summaryData: any;
icons = Icons;
isCollapsed = true;
rightSidebarOpen = false; // rightSidebar only opens when width is less than 768px
showMenuSidebar = true;
displayedSubMenu = '';
@ -96,6 +96,10 @@ export class NavigationComponent implements OnInit, OnDestroy {
}
}
toggleRightSidebar() {
this.rightSidebarOpen = !this.rightSidebarOpen;
}
showTopNotification(name: string, isDisplayed: boolean) {
if (isDisplayed) {
if (!this.notifications.includes(name)) {