Merge branch 'hide_template' of https://github.com/mtanda/grafana into mtanda-hide_template

This commit is contained in:
bergquist
2016-02-29 10:20:44 +01:00
2 changed files with 2 additions and 1 deletions
@@ -1,6 +1,6 @@
<div class="submenu-controls">
<ul ng-if="ctrl.dashboard.templating.list.length > 0">
<li ng-repeat="variable in ctrl.variables" class="submenu-item">
<li ng-repeat="variable in ctrl.variables" ng-show="!variable.hideVariable" class="submenu-item">
<span class="submenu-item-label template-variable " ng-show="!variable.hideLabel">
{{variable.label || variable.name}}:
</span>
@@ -95,6 +95,7 @@
<span class="gf-form-label width-7">Label</span>
<input type="text" class="gf-form-input max-width-14" ng-model='current.label' placeholder="optional display name"></input>
<editor-checkbox class="width-13" text="Hide label" model="current.hideLabel" change="runQuery()"></editor-checkbox>
<editor-checkbox class="width-13" text="Hide variable" model="current.hideVariable" change="runQuery()"></editor-checkbox>
</div>
</div>