diff --git a/ui/src/app/components/dashboard.directive.js b/ui/src/app/components/dashboard.directive.js index dc550ecd25..d7e8b6247c 100644 --- a/ui/src/app/components/dashboard.directive.js +++ b/ui/src/app/components/dashboard.directive.js @@ -190,6 +190,7 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, $ vm.widgetTitle = widgetTitle; vm.widgetTitleIcon = widgetTitleIcon; vm.widgetTitleIconStyle = widgetTitleIconStyle; + vm.widgetTitleTooltip = widgetTitleTooltip; vm.customWidgetHeaderActions = customWidgetHeaderActions; vm.widgetActions = widgetActions; vm.dropWidgetShadow = dropWidgetShadow; @@ -964,6 +965,16 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, $ return style; } + 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) { diff --git a/ui/src/app/components/dashboard.tpl.html b/ui/src/app/components/dashboard.tpl.html index 9e6b81fd71..e136851fce 100644 --- a/ui/src/app/components/dashboard.tpl.html +++ b/ui/src/app/components/dashboard.tpl.html @@ -52,6 +52,9 @@ {{vm.widgetTitleIcon(widget)}} {{vm.widgetTitle(widget)}} + + + diff --git a/ui/src/app/components/widget/widget-config.directive.js b/ui/src/app/components/widget/widget-config.directive.js index 370c70aa80..5c0b704eb1 100644 --- a/ui/src/app/components/widget/widget-config.directive.js +++ b/ui/src/app/components/widget/widget-config.directive.js @@ -113,6 +113,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout scope.titleIcon = angular.isDefined(config.titleIcon) ? config.titleIcon : ''; scope.iconColor = angular.isDefined(config.iconColor) ? config.iconColor : 'rgba(0, 0, 0, 0.87)'; scope.iconSize = angular.isDefined(config.iconSize) ? config.iconSize : '24px'; + 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; @@ -240,7 +241,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout } }; - scope.$watch('title + showTitleIcon + titleIcon + iconColor + iconSize + showTitle + dropShadow + enableFullscreen + backgroundColor + ' + + scope.$watch('title + showTitleIcon + titleIcon + iconColor + iconSize + titleTooltip + showTitle + dropShadow + enableFullscreen + backgroundColor + ' + 'color + padding + margin + widgetStyle + titleStyle + mobileOrder + mobileHeight + units + decimals + useDashboardTimewindow + ' + 'displayTimewindow + alarmSearchStatus + alarmsPollingInterval + showLegend', function () { if (ngModelCtrl.$viewValue) { @@ -252,6 +253,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout config.titleIcon = scope.titleIcon; config.iconColor = scope.iconColor; config.iconSize = scope.iconSize; + config.titleTooltip = scope.titleTooltip; config.showTitle = scope.showTitle; config.dropShadow = scope.dropShadow; config.enableFullscreen = scope.enableFullscreen; diff --git a/ui/src/app/components/widget/widget-config.tpl.html b/ui/src/app/components/widget/widget-config.tpl.html index 03de4b9776..239853087a 100644 --- a/ui/src/app/components/widget/widget-config.tpl.html +++ b/ui/src/app/components/widget/widget-config.tpl.html @@ -215,6 +215,10 @@ + + + +
diff --git a/ui/src/app/locale/locale.constant-de_DE.json b/ui/src/app/locale/locale.constant-de_DE.json index f7048368b4..9f76888a15 100644 --- a/ui/src/app/locale/locale.constant-de_DE.json +++ b/ui/src/app/locale/locale.constant-de_DE.json @@ -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", diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json index 073f5c8f23..689bd149ef 100644 --- a/ui/src/app/locale/locale.constant-en_US.json +++ b/ui/src/app/locale/locale.constant-en_US.json @@ -1569,6 +1569,7 @@ "settings": "Settings", "advanced": "Advanced", "title": "Title", + "title-tooltip": "Title Tooltip", "general-settings": "General settings", "display-title": "Display title", "drop-shadow": "Drop shadow", diff --git a/ui/src/app/locale/locale.constant-es_ES.json b/ui/src/app/locale/locale.constant-es_ES.json index 4fd2be2efb..472722a758 100644 --- a/ui/src/app/locale/locale.constant-es_ES.json +++ b/ui/src/app/locale/locale.constant-es_ES.json @@ -1568,6 +1568,7 @@ "settings": "Configuración", "advanced": "Avanzado", "title": "Título", + "title-tooltip": "Tooltip Título", "general-settings": "Configuración general", "display-title": "Mostrar título", "drop-shadow": "Colocar sombra", diff --git a/ui/src/app/locale/locale.constant-fr_FR.json b/ui/src/app/locale/locale.constant-fr_FR.json index 1fdec0d6d5..5dc4dfbc13 100644 --- a/ui/src/app/locale/locale.constant-fr_FR.json +++ b/ui/src/app/locale/locale.constant-fr_FR.json @@ -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", diff --git a/ui/src/app/locale/locale.constant-it_IT.json b/ui/src/app/locale/locale.constant-it_IT.json index 2f36ba5f52..9de447eb0c 100644 --- a/ui/src/app/locale/locale.constant-it_IT.json +++ b/ui/src/app/locale/locale.constant-it_IT.json @@ -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", diff --git a/ui/src/scss/main.scss b/ui/src/scss/main.scss index 07cea7f1f7..e2c03ce2fe 100644 --- a/ui/src/scss/main.scss +++ b/ui/src/scss/main.scss @@ -483,6 +483,15 @@ pre.tb-highlight { @include line-clamp(2, 1.1); } +.tb-tooltip-multiline { + max-width: 400px; + height: auto !important; + padding-top: 6px; + padding-bottom: 6px; + line-height: 1.5; + white-space: normal !important; +} + /*********************** * Flow ***********************/