diff options
-rw-r--r-- | etc/inc/pfsense-utils.inc | 14 | ||||
-rwxr-xr-x | usr/local/www/fbegin.inc | 2 | ||||
-rwxr-xr-x | usr/local/www/fend.inc | 2 | ||||
-rwxr-xr-x | usr/local/www/firewall_rules.php | 29 | ||||
-rwxr-xr-x | usr/local/www/gui.css | 14 | ||||
-rwxr-xr-x | usr/local/www/index.php | 6 |
6 files changed, 41 insertions, 26 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 79dc1d6..dade06f 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -884,18 +884,18 @@ function get_disk_info() { $tabscounter = 0; foreach ($tab_array as $ta) { if($ta[1] == true) { - echo " <td><div id='active'></div></td>\n"; + echo " <td bgcolor='#EEEEEE'><div id='tabactive'></div></td>\n"; } else { - echo " <td><div id='deactive{$tabscounter}'></div></td>\n"; + echo " <td bgcolor='#777777'><div id='tabdeactive{$tabscounter}'></div></td>\n"; } $tabscounter++; } - echo "</tr>\n"; + echo "</tr>\n<tr>\n"; foreach ($tab_array as $ta) { if($ta[1] == true) { - echo " <td class='tabact'><B> {$ta[0]} </div></a></td>\n"; + echo " <td bgcolor='#EEEEEE'><B> {$ta[0]} <br> </div></a></td>\n"; } else { - echo " <td class='tabinact'><B> <a href='{$ta[2]}'><font color='white'>{$ta[0]}</a> </div></a></td>\n"; + echo " <td bgcolor='#777777'><B> <a href='{$ta[2]}'><font color='white'>{$ta[0]}</a> <br> </div></a></td>\n"; } } echo " </tr>\n"; @@ -903,9 +903,9 @@ function get_disk_info() { echo "<script type=\"text/javascript\">"; echo "NiftyCheck();\n"; - echo "Rounded(\"div#active\",\"top\",\"#FFF\",\"#EEEEEE\",\"smooth\");\n"; + echo "Rounded(\"div#tabactive\",\"top\",\"#FFF\",\"#EEEEEE\",\"smooth\");\n"; for($x=0; $x<$tabscounter; $x++) - echo "Rounded(\"div#deactive{$x}\",\"top\",\"#FFF\",\"#777777\",\"smooth\");\n"; + echo "Rounded(\"div#tabdeactive{$x}\",\"top\",\"#FFF\",\"#777777\",\"smooth\");\n"; echo "</script>"; } diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 5eddf59..2dde58e 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -61,7 +61,7 @@ function showhide_black(tspan, tri) { } --> </script> -<div id="niftyOutter"> +<div id="niftyOutter" style="width:750"> <table width="750" border="0" cellspacing="0" cellpadding="2"> <tr valign="bottom"> <td width="150" height="65" align="center" valign="middle"> <strong><a href="/"><img src="/logo.gif" border="0"></a></strong></td> diff --git a/usr/local/www/fend.inc b/usr/local/www/fend.inc index 0e9a167..ff44f61 100755 --- a/usr/local/www/fend.inc +++ b/usr/local/www/fend.inc @@ -2,7 +2,7 @@ </tr> <tr align="center" valign="top" bgcolor="#990000"> <td id="red" name="testing" colspan="2" class="cpline"><a target="_NEW" href="http://www.pfSense.com">pfSense</a> is © 2004-2005 by Scott Ullrich. All Rights Reserved. -<br>pfSense is originally based on m0n0wall which is © 2002-2004 by Manuel Kasper. + <br>pfSense is originally based on m0n0wall which is © 2002-2004 by Manuel Kasper. All rights reserved. [<a href="/license.php" class="tblnk">view license</a>]</td> </tr> </table> diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index bf9dbda..fb3abc9 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -165,15 +165,28 @@ if (isset($_POST['del_x'])) { <?php endif; ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> + + + + $tab_array = array(); + $tab_array[0] = array("Inbound", true, "firewall_nat.php"); + $tab_array[1] = array("Server NAT", false, "firewall_nat_server.php"); + display_top_tabs($tab_array); + + <ul id="tabnav"> -<?php $i = 0; foreach ($iflist as $ifent => $ifname): - if ($ifent == $if): ?> - <li class="tabact"><?=htmlspecialchars($ifname);?></li> -<?php else: ?> - <li class="<?php if ($i == 0) echo "tabinact1"; else echo "tabinact";?>"><a href="firewall_rules.php?if=<?=$ifent;?>"><?=htmlspecialchars($ifname);?></a></li> -<?php endif; ?> -<?php $i++; endforeach; ?> - </ul> + <?php + /* active tabs */ + $tab_array = array(); + $tabscounter = 0; $i = 0; foreach ($iflist as $ifent => $ifname) { + if ($ifent == $if) + $active = true; + else + $active = false; + $tab_array[] = array($ifname, $active, "firewall_rules.php?if={$ifent}"); + } + display_top_tabs($tab_array); + ?> </td></tr> <tr> <td class="tabcont"> diff --git a/usr/local/www/gui.css b/usr/local/www/gui.css index dde9565..c5dda2b 100755 --- a/usr/local/www/gui.css +++ b/usr/local/www/gui.css @@ -312,13 +312,6 @@ ul#tabnav li.tabact { padding: 5px 8px 5px 8px; white-space: nowrap; } -.tabact { - float: left; - background-color: #EEEEEE; - color: #000000; - padding: 5px 8px 5px 8px; - white-space: nowrap; -} .tabcont { background-color: #EEEEEE; padding-right: 12px; @@ -327,6 +320,13 @@ ul#tabnav li.tabact { padding-bottom: 12px; font-weight: bold; } +.tabact { + float: left; + background-color: #EEEEEE; + color: #000000; + padding: 5px 8px 5px 8px; + white-space: nowrap; +} .tabinact { font-weight: bold; float: left; diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 91d247d..d66d1f4 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -53,8 +53,10 @@ if(file_exists("/trigger_initial_wizard")) { conf_mount_rw(); unlink("/trigger_initial_wizard"); conf_mount_ro(); + +include("head.inc"); + ?> -<?php include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <form> <?php @@ -150,7 +152,7 @@ include("head.inc"); <form> <?php include("fbegin.inc"); ?> <center><img src="logobig.jpg"></center> - <div id="nifty"> + <div id="niftyOutter" width="650"> <table bgcolor="#990000" width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td colspan="2" class="listtopic">System information</td> |