add support for optional widget title tooltip text

pgrisu
1 parent 0e5c4e69
Showing 9 changed files with 30 additions and 2 deletions
ui/src/app/components/dashboard.directive.js
ui/src/app/components/dashboard.tpl.html
ui/src/app/components/widget/widget-config.directive.js
ui/src/app/components/widget/widget-config.tpl.html
ui/src/app/locale/locale.constant-de_DE.json
ui/src/app/locale/locale.constant-en_US.json
ui/src/app/locale/locale.constant-es_ES.json
ui/src/app/locale/locale.constant-fr_FR.json
ui/src/app/locale/locale.constant-it_IT.json
--- a/ui/src/app/components/dashboard.directive.js
View file @821f3eb
+++ b/ui/src/app/components/dashboard.directive.js
View file @821f3eb
@@ -187,6 +187,7 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, $
     vm.showWidgetActions = showWidgetActions;
     vm.widgetTitleStyle = widgetTitleStyle;
     vm.widgetTitle = widgetTitle;
+    vm.widgetTitleTooltip = widgetTitleTooltip;
     vm.customWidgetHeaderActions = customWidgetHeaderActions;
     vm.widgetActions = widgetActions;
     vm.dropWidgetShadow = dropWidgetShadow;
@@ -934,6 +935,16 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, $
         }
     }
+    function widgetTitleTooltip(widget) {
+        var ctx = widgetContext(widget);
+        if (ctx && ctx.widgetTitleTooltip
+            && ctx.widgetTitleTooltip.length) {
+            return ctx.widgetTitleTooltip;
+        } else {
+            return widget.config.titleTooltip;
+        }
+    }
+
     function customWidgetHeaderActions(widget) {
         var ctx = widgetContext(widget);
         if (ctx && ctx.customHeaderActions && ctx.customHeaderActions.length) {
--- a/ui/src/app/components/dashboard.tpl.html
View file @821f3eb
+++ b/ui/src/app/components/dashboard.tpl.html
View file @821f3eb
@@ -47,7 +47,11 @@
 								<div layout="row" layout-align="space-between start">
 									<div class="tb-widget-title" layout="column" layout-align="center start" ng-show="vm.showWidgetTitlePanel(widget)">
 										<div ng-if="vm.hasWidgetTitleTemplate(widget)" ng-include="vm.widgetTitleTemplate(widget)"></div>
-										<span ng-show="vm.showWidgetTitle(widget)" ng-style="vm.widgetTitleStyle(widget)" class="md-subhead title">{{vm.widgetTitle(widget)}}</span>
+										<span ng-show="vm.showWidgetTitle(widget)" ng-style="vm.widgetTitleStyle(widget)" class="md-subhead title">{{vm.widgetTitle(widget)}}
+											<md-tooltip ng-show="vm.widgetTitleTooltip(widget)" md-direction="{{vm.isWidgetExpanded ? 'bottom' : 'top'}}">
+												{{vm.widgetTitleTooltip(widget)}}
+											</md-tooltip>
+										</span>
 										<tb-timewindow aggregation="{{vm.hasAggregation(widget)}}" ng-if="vm.hasTimewindow(widget)" ng-model="widget.config.timewindow"></tb-timewindow>
 									</div>
 									<div class="tb-widget-actions" layout="row" layout-align="start center" ng-show="vm.showWidgetActions(widget)" tb-mousedown="$event.stopPropagation()"
--- a/ui/src/app/components/widget/widget-config.directive.js
View file @821f3eb
+++ b/ui/src/app/components/widget/widget-config.directive.js
View file @821f3eb
@@ -109,6 +109,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout
                 if (config) {
                     scope.selectedTab = 0;
                     scope.title = config.title;
+                    scope.titleTooltip = angular.isDefined(config.titleTooltip) ? config.titleTooltip : '';
                     scope.showTitle = config.showTitle;
                     scope.dropShadow = angular.isDefined(config.dropShadow) ? config.dropShadow : true;
                     scope.enableFullscreen = angular.isDefined(config.enableFullscreen) ? config.enableFullscreen : true;
@@ -236,7 +237,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout
             }
         };
-        scope.$watch('title + showTitle + dropShadow + enableFullscreen + backgroundColor + color + ' +
+        scope.$watch('title + titleTooltip + showTitle + dropShadow + enableFullscreen + backgroundColor + color + ' +
             'padding + margin + widgetStyle + titleStyle + mobileOrder + mobileHeight + units + decimals + useDashboardTimewindow + displayTimewindow + ' +
             'alarmSearchStatus + alarmsPollingInterval + showLegend', function () {
             if (ngModelCtrl.$viewValue) {
@@ -244,6 +245,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout
                 if (value.config) {
                     var config = value.config;
                     config.title = scope.title;
+                    config.titleTooltip = scope.titleTooltip;
                     config.showTitle = scope.showTitle;
                     config.dropShadow = scope.dropShadow;
                     config.enableFullscreen = scope.enableFullscreen;
--- a/ui/src/app/components/widget/widget-config.tpl.html
View file @821f3eb
+++ b/ui/src/app/components/widget/widget-config.tpl.html
View file @821f3eb
@@ -191,6 +191,12 @@
                     </div>
                 </div>
                 <div layout='column' layout-align="center" layout-gt-sm='row' layout-align-gt-sm="start center">
+                    <md-input-container flex class="md-block">
+                        <label translate>widget-config.title-tooltip</label>
+                        <input name="titleTooltip" ng-model="titleTooltip">
+                    </md-input-container>
+                </div>
+                <div layout='column' layout-align="center" layout-gt-sm='row' layout-align-gt-sm="start center">
                     <div layout="row" layout-padding>
                         <md-checkbox aria-label="{{ 'widget-config.display-title' | translate }}"
                                      ng-model="showTitle">{{ 'widget-config.display-title' | translate }}
--- a/ui/src/app/locale/locale.constant-de_DE.json
View file @821f3eb
+++ b/ui/src/app/locale/locale.constant-de_DE.json
View file @821f3eb
@@ -1498,6 +1498,7 @@
     "settings": "Einstellungen",
     "advanced": "Erweitert ",
     "title": "Titel",
+    "title-tooltip": "Titel Tooltip",
     "general-settings": "Allgemeine Einstellungen",
     "display-title": "Titel anzeigen",
     "drop-shadow": "Schlagschatten",
--- a/ui/src/app/locale/locale.constant-en_US.json
View file @821f3eb
+++ b/ui/src/app/locale/locale.constant-en_US.json
View file @821f3eb
@@ -1568,6 +1568,7 @@
         "settings": "Settings",
         "advanced": "Advanced",
         "title": "Title",
+        "title-tooltip": "Title Tooltip",
         "general-settings": "General settings",
         "display-title": "Display title",
         "drop-shadow": "Drop shadow",
--- a/ui/src/app/locale/locale.constant-es_ES.json
View file @821f3eb
+++ b/ui/src/app/locale/locale.constant-es_ES.json
View file @821f3eb
@@ -1498,6 +1498,7 @@
         "settings": "Configuración",
         "advanced": "Avanzado",
         "title": "Título",
+        "title-tooltip": "Tooltip Título",
         "general-settings": "Configuaración general",
         "display-title": "Mostrar título",
         "drop-shadow": "Colocar sombra",
--- a/ui/src/app/locale/locale.constant-fr_FR.json
View file @821f3eb
+++ b/ui/src/app/locale/locale.constant-fr_FR.json
View file @821f3eb
@@ -1429,6 +1429,7 @@
         "timewindow": "Fenêtre de temps",
         "title": "Titre",
         "title-style": "Style de titre",
+        "title-tooltip": "Tooltip de titre",
         "units": "Symbole spécial à afficher à côté de la valeur",
         "use-dashboard-timewindow": "Utiliser la fenêtre de temps du tableau de bord",
         "widget-style": "Style du widget"
--- a/ui/src/app/locale/locale.constant-it_IT.json
View file @821f3eb
+++ b/ui/src/app/locale/locale.constant-it_IT.json
View file @821f3eb
@@ -1503,6 +1503,7 @@
         "settings": "Impostazioni",
         "advanced": "Avanzate",
         "title": "Titolo",
+        "title-tooltip": "Tooltip titolo",
         "general-settings": "Impostazioni generali",
         "display-title": "Mostra titolo",
         "drop-shadow": "Drop shadow",