Add/use some more similarly styled icons here, for a more consistent look.

42 files changed, 8 insertions, 5 deletions

diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc
index e593342..bdfa7dd 100644
--- a/etc/inc/service-utils.inc
+++ b/etc/inc/service-utils.inc
@@ -403,14 +403,14 @@ function get_service_status_icon($service, $withtext = true) {
 	if(get_service_status($service)) {
 		$statustext = gettext("Running");
 		$output .= '<td class="listr"><center>' . "\n";
-		$output .= "<img style=\"vertical-align:middle\" title=\"" . sprintf(gettext("%s Service is"),$service["name"]) . " {$statustext}\" src=\"/themes/" . $g["theme"] . "/images/icons/icon_pass.gif\">";
+		$output .= "<img style=\"vertical-align:middle\" title=\"" . sprintf(gettext("%s Service is"),$service["name"]) . " {$statustext}\" src=\"/themes/" . $g["theme"] . "/images/icons/icon_service_running.gif\">";
 		if ($withtext)
 			$output .= " " . $statustext;
 		$output .= "</td>\n";
 	} else {
 		$statustext = gettext("Stopped");
 		$output .= '<td class="listbg"><center>' . "\n";
-		$output .= "<img style=\"vertical-align:middle\" title=\"" . sprintf(gettext("%s Service is"),$service["name"]) . " {$statustext}\" src=\"/themes/" . $g["theme"] . "/images/icons/icon_block.gif\">";
+		$output .= "<img style=\"vertical-align:middle\" title=\"" . sprintf(gettext("%s Service is"),$service["name"]) . " {$statustext}\" src=\"/themes/" . $g["theme"] . "/images/icons/icon_service_stopped.gif\">";
 		if ($withtext)
 			$output .= "<font color=\"white\">{$statustext}</font>";
 		$output .= "</td>\n";
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index d784d81..f5ba888 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -407,13 +407,16 @@ if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service'])) {
 	}
 } ?>
 <?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>
+
+<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/icons/icon_service_status.gif" border="0"></a>
 <?php endif; ?>
 <?php if(!empty($shortcut_section) && !empty($shortcuts[$shortcut_section]['log'])): ?>
-<a href="<?php echo $shortcuts[$shortcut_section]['log']; ?>" title="<?php echo gettext("Log entries for items on this page."); ?>"><img style="vertical-align:middle" src="/themes/<?php echo $g['theme']; ?>/images/log.png" border="0"></a>
+
+<a href="<?php echo $shortcuts[$shortcut_section]['log']; ?>" title="<?php echo gettext("Log entries for items on this page."); ?>"><img style="vertical-align:middle" src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_logs.gif" border="0"></a>
 <?php endif; ?>
 <?php if(! $g['disablehelpicon']): ?>
-<a href="<?php echo $helpurl; ?>" title="<?php echo gettext("Help for items on this page."); ?>"><img style="vertical-align:middle" src="/themes/<?php echo $g['theme']; ?>/images/help.png" border="0"></a>
+
+<a href="<?php echo $helpurl; ?>" title="<?php echo gettext("Help for items on this page."); ?>"><img style="vertical-align:middle" src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_help.gif" border="0"></a>
 <?php endif; ?>
 </span>
 </div>
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_help.gif b/usr/local/www/themes/_corporate/images/icons/icon_help.gif
new file mode 100644
index 0000000..84c84db
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_help.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_logs.gif b/usr/local/www/themes/_corporate/images/icons/icon_logs.gif
new file mode 100644
index 0000000..afe0104
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_logs.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_service_running.gif b/usr/local/www/themes/_corporate/images/icons/icon_service_running.gif
new file mode 100644
index 0000000..543fd56
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_service_running.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_service_status.gif b/usr/local/www/themes/_corporate/images/icons/icon_service_status.gif
new file mode 100644
index 0000000..a93bcfb
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_service_status.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_service_stopped.gif b/usr/local/www/themes/_corporate/images/icons/icon_service_stopped.gif
new file mode 100644
index 0000000..f93a25d
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_service_stopped.gif
diff --git a/usr/local/www/themes/code-red/images/icons/icon_help.gif b/usr/local/www/themes/code-red/images/icons/icon_help.gif
new file mode 100644
index 0000000..84c84db
--- /dev/null
+++ b/usr/local/www/themes/code-red/images/icons/icon_help.gif
diff --git a/usr/local/www/themes/code-red/images/icons/icon_logs.gif b/usr/local/www/themes/code-red/images/icons/icon_logs.gif
new file mode 100644
index 0000000..afe0104
--- /dev/null
+++ b/usr/local/www/themes/code-red/images/icons/icon_logs.gif
diff --git a/usr/local/www/themes/code-red/images/icons/icon_service_running.gif b/usr/local/www/themes/code-red/images/icons/icon_service_running.gif
new file mode 100644
index 0000000..543fd56
--- /dev/null
+++ b/usr/local/www/themes/code-red/images/icons/icon_service_running.gif
diff --git a/usr/local/www/themes/code-red/images/icons/icon_service_status.gif b/usr/local/www/themes/code-red/images/icons/icon_service_status.gif
new file mode 100644
index 0000000..a93bcfb
--- /dev/null
+++ b/usr/local/www/themes/code-red/images/icons/icon_service_status.gif
diff --git a/usr/local/www/themes/code-red/images/icons/icon_service_stopped.gif b/usr/local/www/themes/code-red/images/icons/icon_service_stopped.gif
new file mode 100644
index 0000000..f93a25d
--- /dev/null
+++ b/usr/local/www/themes/code-red/images/icons/icon_service_stopped.gif
diff --git a/usr/local/www/themes/metallic/images/icons/icon_help.gif b/usr/local/www/themes/metallic/images/icons/icon_help.gif
new file mode 100644
index 0000000..84c84db
--- /dev/null
+++ b/usr/local/www/themes/metallic/images/icons/icon_help.gif
diff --git a/usr/local/www/themes/metallic/images/icons/icon_logs.gif b/usr/local/www/themes/metallic/images/icons/icon_logs.gif
new file mode 100644
index 0000000..afe0104
--- /dev/null
+++ b/usr/local/www/themes/metallic/images/icons/icon_logs.gif
diff --git a/usr/local/www/themes/metallic/images/icons/icon_service_running.gif b/usr/local/www/themes/metallic/images/icons/icon_service_running.gif
new file mode 100644
index 0000000..543fd56
--- /dev/null
+++ b/usr/local/www/themes/metallic/images/icons/icon_service_running.gif
diff --git a/usr/local/www/themes/metallic/images/icons/icon_service_status.gif b/usr/local/www/themes/metallic/images/icons/icon_service_status.gif
new file mode 100644
index 0000000..a93bcfb
--- /dev/null
+++ b/usr/local/www/themes/metallic/images/icons/icon_service_status.gif
diff --git a/usr/local/www/themes/metallic/images/icons/icon_service_stopped.gif b/usr/local/www/themes/metallic/images/icons/icon_service_stopped.gif
new file mode 100644
index 0000000..f93a25d
--- /dev/null
+++ b/usr/local/www/themes/metallic/images/icons/icon_service_stopped.gif
diff --git a/usr/local/www/themes/nervecenter/images/icons/icon_help.gif b/usr/local/www/themes/nervecenter/images/icons/icon_help.gif
new file mode 100644
index 0000000..84c84db
--- /dev/null
+++ b/usr/local/www/themes/nervecenter/images/icons/icon_help.gif
diff --git a/usr/local/www/themes/nervecenter/images/icons/icon_logs.gif b/usr/local/www/themes/nervecenter/images/icons/icon_logs.gif
new file mode 100644
index 0000000..afe0104
--- /dev/null
+++ b/usr/local/www/themes/nervecenter/images/icons/icon_logs.gif
diff --git a/usr/local/www/themes/nervecenter/images/icons/icon_service_running.gif b/usr/local/www/themes/nervecenter/images/icons/icon_service_running.gif
new file mode 100644
index 0000000..543fd56
--- /dev/null
+++ b/usr/local/www/themes/nervecenter/images/icons/icon_service_running.gif
diff --git a/usr/local/www/themes/nervecenter/images/icons/icon_service_status.gif b/usr/local/www/themes/nervecenter/images/icons/icon_service_status.gif
new file mode 100644
index 0000000..a93bcfb
--- /dev/null
+++ b/usr/local/www/themes/nervecenter/images/icons/icon_service_status.gif
diff --git a/usr/local/www/themes/nervecenter/images/icons/icon_service_stopped.gif b/usr/local/www/themes/nervecenter/images/icons/icon_service_stopped.gif
new file mode 100644
index 0000000..f93a25d
--- /dev/null
+++ b/usr/local/www/themes/nervecenter/images/icons/icon_service_stopped.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_help.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_help.gif
new file mode 100644
index 0000000..84c84db
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_help.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_logs.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_logs.gif
new file mode 100644
index 0000000..afe0104
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_logs.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_service_running.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_service_running.gif
new file mode 100644
index 0000000..543fd56
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_service_running.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_service_status.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_service_status.gif
new file mode 100644
index 0000000..a93bcfb
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_service_status.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_service_stopped.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_service_stopped.gif
new file mode 100644
index 0000000..f93a25d
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_service_stopped.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_help.gif b/usr/local/www/themes/pfsense/images/icons/icon_help.gif
new file mode 100644
index 0000000..84c84db
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_help.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_logs.gif b/usr/local/www/themes/pfsense/images/icons/icon_logs.gif
new file mode 100644
index 0000000..afe0104
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_logs.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_service_running.gif b/usr/local/www/themes/pfsense/images/icons/icon_service_running.gif
new file mode 100644
index 0000000..543fd56
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_service_running.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_service_status.gif b/usr/local/www/themes/pfsense/images/icons/icon_service_status.gif
new file mode 100644
index 0000000..a93bcfb
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_service_status.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_service_stopped.gif b/usr/local/www/themes/pfsense/images/icons/icon_service_stopped.gif
new file mode 100644
index 0000000..f93a25d
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_service_stopped.gif
diff --git a/usr/local/www/themes/pfsense_ng/images/icons/icon_help.gif b/usr/local/www/themes/pfsense_ng/images/icons/icon_help.gif
new file mode 100644
index 0000000..84c84db
--- /dev/null
+++ b/usr/local/www/themes/pfsense_ng/images/icons/icon_help.gif
diff --git a/usr/local/www/themes/pfsense_ng/images/icons/icon_logs.gif b/usr/local/www/themes/pfsense_ng/images/icons/icon_logs.gif
new file mode 100644
index 0000000..afe0104
--- /dev/null
+++ b/usr/local/www/themes/pfsense_ng/images/icons/icon_logs.gif
diff --git a/usr/local/www/themes/pfsense_ng/images/icons/icon_service_running.gif b/usr/local/www/themes/pfsense_ng/images/icons/icon_service_running.gif
new file mode 100644
index 0000000..543fd56
--- /dev/null
+++ b/usr/local/www/themes/pfsense_ng/images/icons/icon_service_running.gif
diff --git a/usr/local/www/themes/pfsense_ng/images/icons/icon_service_status.gif b/usr/local/www/themes/pfsense_ng/images/icons/icon_service_status.gif
new file mode 100644
index 0000000..a93bcfb
--- /dev/null
+++ b/usr/local/www/themes/pfsense_ng/images/icons/icon_service_status.gif
diff --git a/usr/local/www/themes/pfsense_ng/images/icons/icon_service_stopped.gif b/usr/local/www/themes/pfsense_ng/images/icons/icon_service_stopped.gif
new file mode 100644
index 0000000..f93a25d
--- /dev/null
+++ b/usr/local/www/themes/pfsense_ng/images/icons/icon_service_stopped.gif
diff --git a/usr/local/www/themes/the_wall/images/icons/icon_help.gif b/usr/local/www/themes/the_wall/images/icons/icon_help.gif
new file mode 100644
index 0000000..84c84db
--- /dev/null
+++ b/usr/local/www/themes/the_wall/images/icons/icon_help.gif
diff --git a/usr/local/www/themes/the_wall/images/icons/icon_logs.gif b/usr/local/www/themes/the_wall/images/icons/icon_logs.gif
new file mode 100644
index 0000000..afe0104
--- /dev/null
+++ b/usr/local/www/themes/the_wall/images/icons/icon_logs.gif
diff --git a/usr/local/www/themes/the_wall/images/icons/icon_service_running.gif b/usr/local/www/themes/the_wall/images/icons/icon_service_running.gif
new file mode 100644
index 0000000..543fd56
--- /dev/null
+++ b/usr/local/www/themes/the_wall/images/icons/icon_service_running.gif
diff --git a/usr/local/www/themes/the_wall/images/icons/icon_service_status.gif b/usr/local/www/themes/the_wall/images/icons/icon_service_status.gif
new file mode 100644
index 0000000..a93bcfb
--- /dev/null
+++ b/usr/local/www/themes/the_wall/images/icons/icon_service_status.gif
diff --git a/usr/local/www/themes/the_wall/images/icons/icon_service_stopped.gif b/usr/local/www/themes/the_wall/images/icons/icon_service_stopped.gif
new file mode 100644
index 0000000..f93a25d
--- /dev/null
+++ b/usr/local/www/themes/the_wall/images/icons/icon_service_stopped.gif