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

Restored the variable color for the label/name in the submenu

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-04-28 17:54:22 +02:00
parent 53cb0feda9
commit 8c14e565a7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/directives/templateParamSelector.js
View File

@ -99,12 +99,8 @@ function (angular, app, _) {
};
scope.updateLinkText = function() {
scope.linkText = "";
if (!variable.hideLabel) {
scope.linkText = (variable.label || variable.name) + ': ';
}
scope.linkText += variable.current.text;
scope.labelText = variable.label || '$' + variable.name;
scope.linkText = variable.current.text;
};
scope.$watchGroup(['variable.hideLabel', 'variable.name', 'variable.label', 'variable.current.text'], function() {

3
public/app/features/dashboard/partials/variableValueSelect.html
View File

@ -1,3 +1,6 @@
<span class="template-variable" ng-show="!variable.hideLabel" style="padding-right: 5px">
{{labelText}}:
</span>
<a ng-click="show()" class="variable-value-link">
{{linkText}}
<i class="fa fa-caret-down"></i>