diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2016-09-14 15:32:20 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-09-14 15:32:20 -0400 |
| commit | 1c402413913bab1938b967283b315adca364a23b (patch) | |
| tree | b775363283a51c9f6811709a0e8004180301c5bc /src/usr/local | |
| parent | 1c1f08f92e8841f7282280caeed7613edd810453 (diff) | |
| parent | 9979487e0e2b24a3fa5daebc96902f78185cc64d (diff) | |
| download | pfsense-1c402413913bab1938b967283b315adca364a23b.zip pfsense-1c402413913bab1938b967283b315adca364a23b.tar.gz | |
Merge pull request #2975 from NOYB/Services_Status
Diffstat (limited to 'src/usr/local')
| -rw-r--r-- | src/usr/local/www/status_openvpn.php | 8 | ||||
| -rw-r--r-- | src/usr/local/www/status_services.php | 12 | ||||
| -rw-r--r-- | src/usr/local/www/widgets/widgets/services_status.widget.php | 2 |
3 files changed, 7 insertions, 15 deletions
diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index 0ff285f..ff5ee45 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -139,10 +139,12 @@ include("head.inc"); ?> <td colspan="2"> <table> <tr> - <td> <?php $ssvc = find_service_by_openvpn_vpnid($server['vpnid']); ?> - <?= get_service_status_icon($ssvc, true, true); ?> - <?= get_service_control_links($ssvc); ?> + <td> + <?= gettext("Status") . ": " . get_service_status_icon($ssvc, false, true, false, "service_state"); ?> + </td> + <td> + <?= gettext("Actions") . ": " . get_service_control_links($ssvc); ?> </td> </tr> </table> diff --git a/src/usr/local/www/status_services.php b/src/usr/local/www/status_services.php index b241b141..2e7a0eb 100644 --- a/src/usr/local/www/status_services.php +++ b/src/usr/local/www/status_services.php @@ -107,21 +107,11 @@ if (count($services) > 0) { <td> <?=$service['name']?> </td> - <td> <?=$service['description']?> </td> -<?php - // if service is running then listr else listbg - $bgclass = null; - $running = false; - - if (get_service_status($service)) { - $running = true; - } -?> <td> - <?=$running ? '<span class="text-success">' . gettext("Running") . '</span>':'<span class="text-danger">' . gettext("Stopped") . '</span>'?> + <?= get_service_status_icon($service, false, true, false, "state"); ?> </td> <td> <?=get_service_control_links($service)?> diff --git a/src/usr/local/www/widgets/widgets/services_status.widget.php b/src/usr/local/www/widgets/widgets/services_status.widget.php index 5da0adc..53cb8f9 100644 --- a/src/usr/local/www/widgets/widgets/services_status.widget.php +++ b/src/usr/local/www/widgets/widgets/services_status.widget.php @@ -95,7 +95,7 @@ if (count($services) > 0) { $service_desc = explode(".",$service['description']); ?> <tr> - <td><i class="fa fa-<?=get_service_status($service) ? 'check-circle text-success' : 'times-circle text-warning'?>"></i></td> + <td><?=get_service_status_icon($service, false, true, false, "state")?></td> <td><?=$service['dispname']?></td> <td><?=$service_desc[0]?></td> <td><?=get_service_control_links($service)?></td> |
