mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
feat(sidemenu): pinned work started
This commit is contained in:
@@ -150,6 +150,9 @@ export function grafanaAppDirective(playlistSrv) {
|
||||
scope.$watch('contextSrv.sidemenu', newVal => {
|
||||
if (newVal !== undefined) {
|
||||
elem.toggleClass('sidemenu-open', scope.contextSrv.sidemenu);
|
||||
if (!newVal) {
|
||||
scope.contextSrv.setPinnedState(false);
|
||||
}
|
||||
}
|
||||
if (scope.contextSrv.sidemenu) {
|
||||
ignoreSideMenuHide = true;
|
||||
@@ -159,6 +162,12 @@ export function grafanaAppDirective(playlistSrv) {
|
||||
}
|
||||
});
|
||||
|
||||
scope.$watch('contextSrv.pinned', newVal => {
|
||||
if (newVal !== undefined) {
|
||||
elem.toggleClass('sidemenu-pinned', newVal);
|
||||
}
|
||||
});
|
||||
|
||||
// tooltip removal fix
|
||||
scope.$on("$routeChangeSuccess", function() {
|
||||
$("#tooltip, .tooltip").remove();
|
||||
@@ -182,7 +191,7 @@ export function grafanaAppDirective(playlistSrv) {
|
||||
}
|
||||
}
|
||||
// hide sidemenu
|
||||
if (!ignoreSideMenuHide && elem.find('.sidemenu').length > 0) {
|
||||
if (!ignoreSideMenuHide && !scope.contextSrv.pinned && elem.find('.sidemenu').length > 0) {
|
||||
if (target.parents('.sidemenu').length === 0) {
|
||||
scope.$apply(() => scope.contextSrv.toggleSideMenu());
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
<div class="navbar navbar-static-top">
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner"><div class="container-fluid">
|
||||
<div class="top-nav-btn top-nav-menu-btn">
|
||||
<a class="pointer" ng-click="ctrl.contextSrv.toggleSideMenu()">
|
||||
|
@@ -62,5 +62,11 @@
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a class="sidemenu-item" target="_self" ng-click="ctrl.contextSrv.setPinnedState(true)">
|
||||
<span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-flag-o"></i></span>
|
||||
<span class="sidemenu-item-text">Pin</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
@@ -22,8 +22,11 @@ export class SideMenuCtrl {
|
||||
this.appSubUrl = config.appSubUrl;
|
||||
this.showSignout = this.contextSrv.isSignedIn && !config['authProxyEnabled'];
|
||||
this.updateMenu();
|
||||
|
||||
this.$scope.$on('$routeChangeSuccess', () => {
|
||||
this.contextSrv.sidemenu = false;
|
||||
if (!this.contextSrv.pinned) {
|
||||
this.contextSrv.sidemenu = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user