From 8f929489e485fd1eb29ebf225bdcdbe636c9856b Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 8 Jan 2021 16:00:24 +0100 Subject: [PATCH] UI: tooltip service widgets, closes https://github.com/opnsense/core/issues/4188 --- .../Base/ApiMutableServiceControllerBase.php | 9 ++++++++- src/opnsense/www/js/opnsense_ui.js | 13 +++++++++++++ src/www/guiconfig.inc | 6 +++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableServiceControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableServiceControllerBase.php index a24c1206c..d8cd14796 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableServiceControllerBase.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableServiceControllerBase.php @@ -221,6 +221,13 @@ abstract class ApiMutableServiceControllerBase extends ApiControllerBase $status = 'unknown'; } - return array('status' => $status); + return array( + 'status' => $status, + 'widget' => array( + 'caption_stop' => gettext("stop service"), + 'caption_start' => gettext("start service"), + 'caption_restart' => gettext("restart service") + ) + ); } } diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js index 66758392e..cdf905e30 100644 --- a/src/opnsense/www/js/opnsense_ui.js +++ b/src/opnsense/www/js/opnsense_ui.js @@ -195,6 +195,19 @@ function updateServiceControlUI(serviceName) $('#service_status_container').html(status_html + " " + buttons); + if (data['widget'] !== undefined) { + // tooltip service action widgets + ['stop', 'start', 'restart'].forEach(function(action){ + let obj = $("#" + action + "Service"); + if (obj.length > 0) { + obj.tooltip({ + 'placement': 'bottom', + 'title': data['widget']['caption_' + action] + }); + } + }); + } + const commands = ["start", "restart", "stop"]; commands.forEach(function(command) { $("#" + command + "Service").click(function(){ diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc index 45343d637..1c39affdc 100644 --- a/src/www/guiconfig.inc +++ b/src/www/guiconfig.inc @@ -581,7 +581,8 @@ function service_control_links($service, $xs = false) $service_id = isset($service['id']) ? $service['id'] : ''; $template = '