diff options
| -rw-r--r-- | etc/inc/service-utils.inc | 9 | ||||
| -rwxr-xr-x | usr/local/www/fbegin.inc | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc index 0651f03..fa1ea1a 100644 --- a/etc/inc/service-utils.inc +++ b/etc/inc/service-utils.inc @@ -400,9 +400,10 @@ function get_service_status_icon($service, $withtext = true) { return $output; } -function get_service_control_links($service) { +function get_service_control_links($service, $addname = false) { global $g; $output = ""; + $stitle = ($addname) ? $service['name'] . " " : ""; if(get_service_status($service)) { switch ($service['name']) { case "openvpn": @@ -414,7 +415,7 @@ function get_service_control_links($service) { default: $output .= "<a href='status_services.php?mode=restartservice&service={$service['name']}'>"; } - $output .= "<img style=\"vertical-align:middle\" title='" . gettext("Restart Service") . "' border='0' src='./themes/".$g['theme']."/images/icons/icon_service_restart.gif'></a>\n"; + $output .= "<img style=\"vertical-align:middle\" title='" . sprintf(gettext("Restart %sService"),$stitle) . "' border='0' src='./themes/".$g['theme']."/images/icons/icon_service_restart.gif'></a>\n"; switch ($service['name']) { case "openvpn": $output .= "<a href='status_services.php?mode=stopservice&service={$service['name']}&vpnmode={$service['mode']}&id={$service['vpnid']}'>"; @@ -425,7 +426,7 @@ function get_service_control_links($service) { default: $output .= "<a href='status_services.php?mode=stopservice&service={$service['name']}'>"; } - $output .= "<img style=\"vertical-align:middle\" title='" . gettext("Stop Service") . "' border='0' src='./themes/".$g['theme']."/images/icons/icon_service_stop.gif'>"; + $output .= "<img style=\"vertical-align:middle\" title='" . sprintf(gettext("Stop %sService"),$stitle) . "' border='0' src='./themes/".$g['theme']."/images/icons/icon_service_stop.gif'>"; $output .= "</a>"; } else { switch ($service['name']) { @@ -438,7 +439,7 @@ function get_service_control_links($service) { default: $output .= "<a href='status_services.php?mode=startservice&service={$service['name']}'>"; } - $output .= "<img style=\"vertical-align:middle\" title='" . gettext("Start Service") . "' border='0' src='./themes/".$g['theme']."/images/icons/icon_service_start.gif'></a>\n"; + $output .= "<img style=\"vertical-align:middle\" title='" . sprintf(gettext("Start %sService"),$stitle) . "' border='0' src='./themes/".$g['theme']."/images/icons/icon_service_start.gif'></a>\n"; } return $output; } diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index cc205cd..edd4592 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -392,7 +392,7 @@ function add_to_menu($url, $name) { if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service'])) { $ssvc = find_service_by_name($shortcuts[$shortcut_section]['service']); echo get_service_status_icon($ssvc, false); - echo get_service_control_links($ssvc); + echo get_service_control_links($ssvc, true); } ?> <?php if(!empty($shortcut_section) && !empty($shortcuts[$shortcut_section]['status'])): ?> <a href="<?php echo $shortcuts[$shortcut_section]['status']; ?>" title="<?php echo gettext("Status of items on this page."); ?>"><img style="vertical-align:middle" src="/themes/<?php echo $g['theme']; ?>/images/status.png" border="0"></a> |
