From 8c14e565a7bdee9619dbf396d7b9a560fa37b2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 17:54:22 +0200 Subject: [PATCH] Restored the variable color for the label/name in the submenu --- public/app/directives/templateParamSelector.js | 8 ++------ .../features/dashboard/partials/variableValueSelect.html | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/public/app/directives/templateParamSelector.js b/public/app/directives/templateParamSelector.js index 3d7a9f964d4..629c3ececcc 100644 --- a/public/app/directives/templateParamSelector.js +++ b/public/app/directives/templateParamSelector.js @@ -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() { diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 1904aa598ee..058500c495c 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -1,3 +1,6 @@ + + {{labelText}}: + {{linkText}}