IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactoring(): unified dashboard top nav to a single dashnav component, uses new navbar component

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-01-17 11:34:51 +01:00
parent 070af40487
commit 723be4f612
13 changed files with 131 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
public/app/core/components/navbar/navbar.html
View File

@@ -1,24 +1,23 @@
<div class="navbar navbar-static-top">
<div class="navbar-inner"><div class="container-fluid">
<div class="top-nav">
<div class="top-nav-btn top-nav-menu-btn">
<a class="pointer" ng-click="ctrl.contextSrv.toggleSideMenu()">
<span class="top-nav-logo-background">
<img class="logo-icon" src="img/fav32.png"></img>
</span>
<i class="fa fa-caret-down"></i>
</a>
</div>
<div class="top-nav-btn top-nav-menu-btn">
<a class="pointer" ng-click="ctrl.contextSrv.toggleSideMenu()">
<span class="top-nav-logo-background">
<img class="logo-icon" src="img/fav32.png"></img>
</span>
<i class="fa fa-caret-down"></i>
</a>
</div>
<span ng-if="ctrl.title">
<span class="icon-circle top-nav-icon">
<i ng-class="icon"></i>
<i ng-class="ctrl.icon"></i>
</span>
<a ng-href="{{titleUrl}}" class="top-nav-title">
<a ng-href="{{ctl.titleUrl}}" class="top-nav-title">
{{ctrl.title}}
</a>
<i ng-show="subnav" class="top-nav-breadcrumb-icon fa fa-angle-right"></i>
</div>
<i ng-show="ctrl.subnav" class="top-nav-breadcrumb-icon fa fa-angle-right"></i>
</span>
<div ng-transclude></div>
</div>

11
public/app/core/components/navbar/navbar.ts
View File

@@ -6,11 +6,8 @@ import $ from 'jquery';
import coreModule from '../../core_module';
export class NavbarCtrl {
contextSrv: any;
/** @ngInject */
constructor(private $scope, contextSrv) {
this.contextSrv = contextSrv;
constructor(private $scope, private contextSrv) {
}
}
@@ -26,9 +23,9 @@ export function navbarDirective() {
title: "@",
titleUrl: "@",
},
link: function(scope, elem, attrs) {
scope.icon = attrs.icon;
scope.subnav = attrs.subnav;
link: function(scope, elem, attrs, ctrl) {
ctrl.icon = attrs.icon;
ctrl.subnav = attrs.subnav;
}
};
}

2
public/app/core/components/sidemenu/sidemenu.ts
View File

@@ -137,7 +137,7 @@ export class SideMenuCtrl {
export function sideMenuDirective() {
return {
restrict: 'E',
templateUrl: 'app/features/sidemenu/sidemenu.html',
templateUrl: 'app/core/components/sidemenu/sidemenu.html',
controller: SideMenuCtrl,
bindToController: true,
controllerAs: 'ctrl',