diff options
author | Renato Botelho <garga@pfSense.org> | 2013-11-15 10:20:24 -0800 |
---|---|---|
committer | Renato Botelho <garga@pfSense.org> | 2013-11-15 10:20:24 -0800 |
commit | 2d845db7b85c222e5cb7a6adb7ecd5c6502de4af (patch) | |
tree | 44d12dd1d451b8f9ee5b66e13c21a71832ac0625 /usr/local/www | |
parent | a2f0b7c13fba5a11c7d0fbfbd9fe48d58d3be742 (diff) | |
parent | 17b8c60a398c225db03cedbb936aa62b97cb4ee3 (diff) | |
download | pfsense-2d845db7b85c222e5cb7a6adb7ecd5c6502de4af.zip pfsense-2d845db7b85c222e5cb7a6adb7ecd5c6502de4af.tar.gz |
Merge pull request #855 from ExolonDX/branch_01
Tidy up the "Helper Icons"
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/status_services.php | 17 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/services_status.widget.php | 18 |
2 files changed, 22 insertions, 13 deletions
diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index 1f1fee5..48f9db4 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -93,11 +93,16 @@ if (count($services) > 0) { continue; if (empty($service['description'])) $service['description'] = get_pkg_descr($service['name']); - echo '<tr><td class="listlr" width="20%">' . $service['name'] . '</td>' . "\n"; - echo '<td class="listr" width="55%">' . $service['description'] . '</td>' . "\n"; - echo get_service_status_icon($service, true, true); - echo '<td valign="middle" class="list nowrap">'; - echo get_service_control_links($service); + echo "<tr><td class=\"listlr\" width=\"20%\">" . $service['name'] . "</td>\n"; + echo "<td class=\"listr\" width=\"55%\">" . $service['description'] . "</td>\n"; + // if service is running then listr else listbg + $bgclass = null; + if (get_service_status($service)) + $bgclass = "listr"; + else + $bgclass = "listbg"; + echo "<td class=\"" . $bgclass . "\" align=\"center\">" . get_service_status_icon($service, true, true) . "</td>\n"; + echo "<td valign=\"middle\" class=\"list nowrap\">" . get_service_control_links($service); $scut = get_shortcut_by_service_name($service['name']); if (!empty($scut)) { echo get_shortcut_main_link($scut, true, $service); @@ -107,7 +112,7 @@ if (count($services) > 0) { echo "</td></tr>\n"; } } else { - echo "<tr><td colspan=\"3\" align=\"center\">" . gettext("No services found") . ".</td></tr>\n"; + echo "<tr><td colspan=\"3\" align=\"center\">" . gettext("No services found") . " . </td></tr>\n"; } ?> diff --git a/usr/local/www/widgets/widgets/services_status.widget.php b/usr/local/www/widgets/widgets/services_status.widget.php index 9ae8696..dfe172b 100644 --- a/usr/local/www/widgets/widgets/services_status.widget.php +++ b/usr/local/www/widgets/widgets/services_status.widget.php @@ -73,15 +73,19 @@ if (count($services) > 0) { if (empty($service['description'])) $service['description'] = get_pkg_descr($service['name']); $service_desc = explode(".",$service['description']); - echo '<tr><td class="listlr">' . $service['name'] . '</td>' . "\n"; - echo '<td class="listr">' . $service_desc[0] . '</td>' . "\n"; - echo get_service_status_icon($service, false, true); - echo '<td valign="middle" class="list nowrap">'; - echo get_service_control_links($service); - echo "</td></tr>\n"; + echo "<tr><td class=\"listlr\">" . $service['name'] . "</td>\n"; + echo "<td class=\"listr\">" . $service_desc[0] . "</td>\n"; + // if service is running then listr else listbg + $bgclass = null; + if (get_service_status($service)) + $bgclass = "listr"; + else + $bgclass = "listbg"; + echo "<td class=\"" . $bgclass . "\" align=\"center\">" . get_service_status_icon($service, true, true) . "</td>\n"; + echo "<td valign=\"middle\" class=\"list nowrap\">" . get_service_control_links($service) . "</td></tr>\n"; } } else { - echo "<tr><td colspan=\"3\" align=\"center\">" . gettext("No services found") . ".</td></tr>\n"; + echo "<tr><td colspan=\"3\" align=\"center\">" . gettext("No services found") . " . </td></tr>\n"; } ?> </table> |