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

removing pulldowns and simplifying submenu controls code

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-08-25 13:31:31 +02:00
parent 4f8b2ad245
commit 6969a4121c
4 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/controllers/dashboardCtrl.js
View File

@ -48,6 +48,9 @@ function (angular, $, config, _) {
$scope.filter = filterSrv;
$scope.filter.init($scope.dashboard);
$scope.submenuEnabled = $scope.dashboard.templating.enable ||
$scope.dashboard.annotations.enable;
var panelMove = panelMoveSrv.create($scope.dashboard);
$scope.panelMoveDrop = panelMove.onDrop;

11
src/app/partials/dashboard.html
View File

@ -3,16 +3,7 @@
<div ng-include="'app/partials/dashboard_topnav.html'">
</div>
<div class="submenu-controls">
<div class="submenu-panel" ng-controller="SubmenuCtrl" ng-repeat="pulldown in dashboard.pulldowns | filter:{ enable: true }">
<div class="submenu-panel-title">
<span class="small"><strong>{{pulldown.type}}:</strong></span>
</div>
<div class="submenu-panel-wrapper">
<grafana-simple-panel type="pulldown.type" ng-cloak></grafana-simple-panel>
</div>
</div>
<div class="clearfix"></div>
<div ng-if="submenuEnabled" ng-include="'app/partials/submenu.html'">
</div>
<div class="clearfix"></div>

38
src/app/partials/submenu.html Normal file
View File

@ -0,0 +1,38 @@
<div class="submenu-controls" ng-controller="SubmenuCtrl">
<div class="grafana-target">
<div class="grafana-target-inner-wrapper">
<div class="grafana-target-inner">
<ul class="grafana-target-controls-left">
<li class="grafana-target-segment">
<i class="icon-remove pointer"></i>
</li>
</ul>
<ul class="grafana-segment-list">
<li ng-repeat="filter in filter.templateParameters" class="grafana-target-segment">
<div class="dropdown">
{{filter.name}} =
<a class="dropdown-toggle" data-toggle="dropdown">
{{filter.current.text}}
</a>
<ul class="dropdown-menu">
<li ng-repeat="option in filter.options">
<a ng-click="filterOptionSelected(filter, option)">{{option.text}}</a>
</li>
</ul>
</div>
</li>
<li ng-repeat="annotation in dashboard.annotations.list" class="grafana-target-segment" ng-class="{'annotation-disabled': !annotation.enable }">
<i class="annotation-color-icon icon-minus"></i>
<a ng-click="hide(annotation)" class="small">{{annotation.name}}</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
</div>