From 677c08696aa3dbffd25fed94c82563773d419b84 Mon Sep 17 00:00:00 2001 From: Erik Kristensen Date: Thu, 21 Jul 2005 00:17:40 +0000 Subject: updating files to use theme images removing images from /usr/local/www adding specific images into the correct theme directories --- usr/local/www/carp_status.php | 8 ++-- usr/local/www/diag_confbak.php | 4 +- usr/local/www/diag_ipsec_sad.php | 2 +- usr/local/www/diag_ipsec_spd.php | 8 ++-- usr/local/www/diag_logs_filter.php | 4 +- usr/local/www/diag_logs_vpn.php | 4 +- usr/local/www/firewall_aliases.php | 6 +-- usr/local/www/firewall_aliases_edit.php | 4 +- usr/local/www/firewall_nat.php | 12 +++--- usr/local/www/firewall_nat_1to1.php | 6 +-- usr/local/www/firewall_nat_out.php | 12 +++--- usr/local/www/firewall_nat_server.php | 6 +-- usr/local/www/firewall_rules.php | 34 ++++++++-------- usr/local/www/firewall_shaper.php | 22 +++++------ usr/local/www/firewall_shaper_queues.php | 6 +-- usr/local/www/firewall_virtual_ip.php | 8 ++-- usr/local/www/guiconfig.inc | 4 +- usr/local/www/index.php | 44 ++++++++++----------- usr/local/www/interfaces_assign.php | 4 +- usr/local/www/interfaces_vlan.php | 6 +-- usr/local/www/pkg.php | 6 +-- usr/local/www/pkg_edit.php | 4 +- usr/local/www/pkg_mgr.php | 2 +- usr/local/www/pkg_mgr_install.php | 6 +-- usr/local/www/pkg_mgr_installed.php | 6 +-- usr/local/www/progress.php | 6 +-- usr/local/www/services_captiveportal_ip.php | 14 +++---- usr/local/www/services_captiveportal_mac.php | 2 +- usr/local/www/services_captiveportal_users.php | 8 ++-- usr/local/www/services_dhcp.php | 6 +-- usr/local/www/services_dnsmasq.php | 12 +++--- usr/local/www/services_proxyarp.php | 6 +-- usr/local/www/services_usermanager.php | 8 ++-- usr/local/www/services_wol.php | 6 +-- usr/local/www/status_captiveportal.php | 2 +- usr/local/www/status_queues.php | 8 ++-- usr/local/www/status_services.php | 6 +-- usr/local/www/system_firmware_auto.php | 2 +- usr/local/www/system_firmware_check.php | 14 +++---- usr/local/www/system_routes.php | 6 +-- .../www/themes/metallic/images/misc/tri_c.gif | Bin 0 -> 61 bytes .../themes/metallic/images/misc/tri_c_black.gif | Bin 0 -> 69 bytes .../www/themes/metallic/images/misc/tri_o.gif | Bin 0 -> 58 bytes .../themes/metallic/images/misc/tri_o_black.gif | Bin 0 -> 67 bytes .../pfsense-dropdown/images/icons/icon_e.gif | Bin 0 -> 1106 bytes .../pfsense-dropdown/images/icons/icon_e_mo.gif | Bin 0 -> 1120 bytes .../themes/pfsense-dropdown/images/misc/tri_c.gif | Bin 0 -> 61 bytes .../pfsense-dropdown/images/misc/tri_c_black.gif | Bin 0 -> 69 bytes .../themes/pfsense-dropdown/images/misc/tri_o.gif | Bin 0 -> 58 bytes .../pfsense-dropdown/images/misc/tri_o_black.gif | Bin 0 -> 67 bytes usr/local/www/themes/pfsense/images/misc/tri_c.gif | Bin 0 -> 61 bytes .../www/themes/pfsense/images/misc/tri_c_black.gif | Bin 0 -> 69 bytes usr/local/www/themes/pfsense/images/misc/tri_o.gif | Bin 0 -> 58 bytes .../www/themes/pfsense/images/misc/tri_o_black.gif | Bin 0 -> 67 bytes usr/local/www/vpn_ipsec.php | 6 +-- usr/local/www/vpn_ipsec_ca.php | 6 +-- usr/local/www/vpn_ipsec_keys.php | 6 +-- usr/local/www/vpn_openvpn_cli.php | 6 +-- usr/local/www/vpn_pptp_users.php | 6 +-- usr/local/www/wizard.php | 2 +- 60 files changed, 183 insertions(+), 183 deletions(-) create mode 100755 usr/local/www/themes/metallic/images/misc/tri_c.gif create mode 100755 usr/local/www/themes/metallic/images/misc/tri_c_black.gif create mode 100755 usr/local/www/themes/metallic/images/misc/tri_o.gif create mode 100755 usr/local/www/themes/metallic/images/misc/tri_o_black.gif create mode 100755 usr/local/www/themes/pfsense-dropdown/images/icons/icon_e.gif create mode 100644 usr/local/www/themes/pfsense-dropdown/images/icons/icon_e_mo.gif create mode 100755 usr/local/www/themes/pfsense-dropdown/images/misc/tri_c.gif create mode 100755 usr/local/www/themes/pfsense-dropdown/images/misc/tri_c_black.gif create mode 100755 usr/local/www/themes/pfsense-dropdown/images/misc/tri_o.gif create mode 100755 usr/local/www/themes/pfsense-dropdown/images/misc/tri_o_black.gif create mode 100755 usr/local/www/themes/pfsense/images/misc/tri_c.gif create mode 100755 usr/local/www/themes/pfsense/images/misc/tri_c_black.gif create mode 100755 usr/local/www/themes/pfsense/images/misc/tri_o.gif create mode 100755 usr/local/www/themes/pfsense/images/misc/tri_o_black.gif (limited to 'usr') diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index 8811893..7a2e0c0 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -121,16 +121,16 @@ if(is_array($config['virtualip']['vip'])) { echo ""; $align = "valign='middle'"; if($carp_enabled == false) { - $icon = ""; + $icon = ""; $status = "DISABLED"; $carp_int = "carp" . $carpint; } else { if($status == "MASTER") { - $icon = ""; + $icon = ""; } else if($status == "BACKUP") { - $icon = ""; + $icon = ""; } else if($status == "INIT") { - $icon = ""; + $icon = ""; } } echo "
" . $carp_int . " "; diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php index b49bd5e..93f9d2a 100755 --- a/usr/local/www/diag_confbak.php +++ b/usr/local/www/diag_confbak.php @@ -96,10 +96,10 @@ if(is_array($confvers)) { - + - + diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index 72ef8d8..355a383 100755 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -127,7 +127,7 @@ foreach ($sad as $sa): ?> $args .= "&proto=" . rawurlencode($sa['proto']); $args .= "&spi=" . rawurlencode("0x" . $sa['spi']); ?> - + diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index 2c05faa..3099bac 100755 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -119,7 +119,7 @@ foreach ($spd as $sp): ?> - + -
@@ -129,7 +129,7 @@ foreach ($spd as $sp): ?> $args .= "&dst=" . rawurlencode($sp['dst']); $args .= "&dir=" . rawurlencode($sp['dir']); ?> - + @@ -138,14 +138,14 @@ foreach ($spd as $sp): ?>
- + - + diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 5079b07..5c3c07c 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -156,9 +156,9 @@ include("head.inc"); diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index cc9c18a..b127f17 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -59,9 +59,9 @@ function dump_clog_vpn($logfile, $tail) { echo "\n"; if ($llent[0] == "login") - echo "\n"; + echo "\n"; else - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index 6d42fe2..df38db6 100755 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -118,8 +118,8 @@ include("head.inc"); @@ -130,7 +130,7 @@ include("head.inc"); diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 08a9193..4a9cab3 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -286,7 +286,7 @@ rowtype[2] = "select"; 0) - echo ""; + echo ""; ?> @@ -294,7 +294,7 @@ rowtype[2] = "select";
incoming (as seen by firewall)
outgoing (as seen by firewall)
" . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "" . htmlspecialchars($llent[3]) . "" . htmlspecialchars($llent[2]) . "  - - + +
- +
- + diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index b064b74..73cbe5b 100755 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -214,11 +214,11 @@ include("head.inc"); - + - - + +
@@ -228,11 +228,11 @@ include("head.inc"); - - + + - +
diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php index 3c77bb8..e7d2b6f 100755 --- a/usr/local/www/firewall_nat_1to1.php +++ b/usr/local/www/firewall_nat_1to1.php @@ -127,8 +127,8 @@ include("head.inc"); - - + +
@@ -139,7 +139,7 @@ include("head.inc"); - +
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index d7e556a..e446950 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -297,11 +297,11 @@ include("head.inc"); - + - - + +
@@ -310,11 +310,11 @@ include("head.inc"); - - + + - +
diff --git a/usr/local/www/firewall_nat_server.php b/usr/local/www/firewall_nat_server.php index 6c40db5..3336f1b 100755 --- a/usr/local/www/firewall_nat_server.php +++ b/usr/local/www/firewall_nat_server.php @@ -126,8 +126,8 @@ include("head.inc"); - - + +
@@ -138,7 +138,7 @@ include("head.inc"); - +
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index cb0fc3b..cb6abe4 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -213,13 +213,13 @@ include("head.inc"); $textss = $textse = ""; } ?> - + -
+
@@ -243,12 +243,12 @@ include("head.inc"); - - + + - +
@@ -261,7 +261,7 @@ include("head.inc"); No rules are currently defined for this interface.
All incoming connections on this interface will be blocked until you add pass rules.

- Click the button to add a new rule. + Click the button to add a new rule. @@ -277,12 +277,12 @@ include("head.inc"); + - - + +
-
@@ -290,29 +290,29 @@ include("head.inc"); - + - + - + - + - + - + - + - + diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index f954216..17bb609 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -255,9 +255,9 @@ include("head.inc"); echo "
"; echo ""; if ($shaperent['direction'] == "in") - echo ""; + echo ""; if ($shaperent['direction'] == "out") - echo ""; + echo ""; echo "" . $textse;; ?> @@ -288,28 +288,28 @@ include("head.inc"); - - + @@ -188,7 +188,7 @@ include("head.inc"); diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index eee8e72..04d9d41 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -129,7 +129,7 @@ include("head.inc"); ?> @@ -149,7 +149,7 @@ include("head.inc"); diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 0b53dc8..7920bbf 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -135,7 +135,7 @@ function do_input_validation($postdata, $reqdfields, $reqdfieldsn, $input_errors function print_input_errors($input_errors) { echo "

pass block reject log
pass (disabled)   block (disabled)   reject (disabled)   log (disabled)
  + 0): ?> - + - + -
+
- + - + - + - +

Note:
diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php index 01fbb42..904ef55 100755 --- a/usr/local/www/firewall_shaper_queues.php +++ b/usr/local/www/firewall_shaper_queues.php @@ -176,8 +176,8 @@ include("head.inc");

- - + +
- +
- "; else echo "";?> + "; else echo "";?>   @@ -137,8 +137,8 @@ include("head.inc"); - - + +
- +
\n"; - echo "\n"; + echo "\n"; echo "
"; echo "

The following input errors were detected:

    \n"; @@ -184,7 +184,7 @@ function print_info_box_np($msg) { echo "
\n"; echo "
\n"; echo " \n"; echo " "; diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 66512c6..402c878 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -63,7 +63,7 @@ include("head.inc"); "; - echo "

"; + echo "

"; echo "Welcome to pfSense!

"; echo "One moment while we start the initial setup wizard.

"; echo "Embedded platform users: Please be patient, the wizard takes a little longer to run than the normal gui.

"; @@ -156,7 +156,7 @@ include("head.inc"); include("fbegin.inc"); if(!file_exists("/usr/local/www/themes/{$g['theme']}/no_big_logo")) - echo "


"; + echo "

"; ?>

System Overview

@@ -222,10 +222,10 @@ include("fbegin.inc"); "; -echo ""; -echo ""; -echo " "; +echo ""; +echo ""; +echo ""; +echo " "; echo ""; //echo $cpuUsage . "%"; ?> @@ -244,10 +244,10 @@ $freeMem = $memory[4]; $usedMem = $totalMem - $freeMem; $memUsage = round(($usedMem * 100) / $totalMem, 0); -echo " "; -echo ""; -echo ""; -echo " "; +echo " "; +echo ""; +echo ""; +echo " "; echo ""; //echo $memUsage . "%"; ?> @@ -266,10 +266,10 @@ $swapUsage = ereg_replace('%', "", $swapUsage); $swapUsage = ereg_replace(' ', "", $swapUsage); $swapUsage = rtrim($swapUsage); -echo ""; -echo ""; -echo ""; -echo " "; +echo ""; +echo ""; +echo ""; +echo " "; echo ""; //echo $swapUsage . "%"; @@ -288,10 +288,10 @@ echo " "; echo " "; @@ -304,10 +304,10 @@ echo " "; exec("df -h | grep -w '/' | awk '{ print $5 }' | cut -d '%' -f 1", $dfout); $diskusage = trim($dfout[0]); -echo ""; -echo ""; -echo ""; -echo " "; +echo ""; +echo ""; +echo ""; +echo " "; echo $diskusage . "%"; ?> diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 8e8cdc5..2f10b66 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -232,7 +232,7 @@ include("head.inc"); @@ -241,7 +241,7 @@ include("head.inc"); diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index 4e11750..cbfa9ca 100755 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -125,13 +125,13 @@ include("head.inc"); - + - + @@ -188,7 +188,7 @@ if ($pkg['tabs'] <> "") { diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index dd28821..dbb167f 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -456,7 +456,7 @@ if ($pkg['tabs'] <> "") { $rowcounter++; echo "\n"; echo "\n"; } @@ -494,7 +494,7 @@ if ($pkg['tabs'] <> "") {
\n"; - echo "    \n"; + echo "    \n"; echo " {$msg}\n"; echo "
"; // Initialize hw monitor exec("/usr/local/sbin/env4801 -i"); $Temp = rtrim(`/usr/local/sbin/env4801 | grep Temp |cut -c24-25`); -echo ""; -echo ""; -echo ""; -echo " "; +echo ""; +echo ""; +echo ""; +echo " "; echo ""; echo "
- +
- +
  -   +  
 

diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php index 0ac0879..4ce86c1 100755 --- a/usr/local/www/pkg.php +++ b/usr/local/www/pkg.php @@ -173,8 +173,8 @@ if ($pkg['tabs'] <> "") {

- - + +
- +
"; - echo ""; + echo ""; echo "
-
+