diff options
| -rwxr-xr-x | usr/local/www/fbegin.inc | 269 | ||||
| -rwxr-xr-x | usr/local/www/fend.inc | 34 | ||||
| -rwxr-xr-x | usr/local/www/head.inc | 16 |
3 files changed, 174 insertions, 145 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 4909390..878f312 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -12,13 +12,11 @@ require_once("notices.inc"); } else { $description = '/pkg.php?xml=' . $menuitem['configfile']; } - $htmltext .= ' <a href="' . $description . ' "class="navlnk">' . $menuitem['name'] . '</a><br>' . "\n"; + $htmltext .= '<li><a href="' . $description . ' "class="navlnk">' . $menuitem['name'] . '</a></li>' . "\n"; } } return $htmltext; } - - ?> <script language="javascript"> @@ -62,128 +60,151 @@ function showhide_black(tspan, tri) { } --> </script> -<table width="750" border="0" cellspacing="1" cellpadding="1"> - <tr valign="bottom" height="65"> - <td width="150" height="100%" align="center" valign="middle"> - <strong><a href="/"><img src="/logo.gif" border="0"></a></strong> - </td> - <td height="100%"> - <div style="height:100%" id="topbox" name="topbox"> - <table bgcolor="#990000" background="top_background.gif" border="0" cellspacing="0" cellpadding="0" width="100%" height="85%"> - <tr><td align="left" valign="bottom"><span class="tfrtitle"> webConfigurator</span></td> - <td align="right" valign="bottom"> - <span class="hostname"><?=$config['system']['hostname'] . "." . $config['system']['domain'];?> </span> - </td> - </tr> - </table> - </div> - </td> - </tr> - <tr valign="top"> - <td valign="top" height="100%" width="150"> - <div id="niftyMenu" style="height:100%"> - <table height="100%" width="100%" class="menu" bgcolor="#000000"> - <tr valign="top"> - <td nowrap><span class="navlnk"><font color="#FFFFFF"> <strong>System</strong> - <br> - <a href="/system_advanced.php" class="navlnk">Advanced</a><br> - <a href="/system_firmware_check.php" class="navlnk">Firmware</a><br> - <a href="/system.php" class="navlnk">General setup</a><br> - <a href="/pkg_mgr.php" class="navlnk">Packages</a><br> - <a href="/system_routes.php" class="navlnk">Static routes</a><br> - <?php echo return_ext_menu("System"); ?> - <strong>Interfaces</strong> - <?php if (!isset($config['system']['webgui']['noassigninterfaces'])): ?> - <a href="/interfaces_assign.php" class="navlnks">(assign)</a> - <?php endif; ?> - <br> - <a href="/interfaces_lan.php" class="navlnk">LAN</a><br> - <?php for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++): if (!isset($config['interfaces']['opt' . $i]['ovpn'])): ?> - <a href="/interfaces_opt.php?index=<?=$i;?>" class="navlnk"><?=htmlspecialchars($config['interfaces']['opt' . $i]['descr']);?></a><br> - <?php endif; endfor; ?> - <a href="/interfaces_wan.php" class="navlnk">WAN</a><br> - <?php echo return_ext_menu("Interfaces"); ?> - <strong>Firewall</strong><br> - <a href="/firewall_aliases.php" class="navlnk">Aliases</a><br> - <a href="/firewall_nat.php" class="navlnk">NAT</a><br> - <a href="/firewall_rules.php" class="navlnk">Rules</a><br> - <a href="/firewall_shaper.php" class="navlnk">Traffic Shaper</a><br> - <a href="/firewall_virtual_ip.php" class="navlnk">Virtual IPs</a><br> - <?php echo return_ext_menu("Firewall"); ?> - <strong>Services</strong><br> - <a href="/services_captiveportal.php" class="navlnk">Captive portal</a><br> - <a href="/services_dnsmasq.php" class="navlnk">DNS forwarder</a><br> - <a href="/services_dhcp_relay.php" class="navlnk">DHCP relay</a><br> - <a href="/services_dhcp.php" class="navlnk">DHCP server</a><br> - <a href="/services_dyndns.php" class="navlnk">Dynamic DNS</a><br> - <a href="/services_snmp.php" class="navlnk">SNMP</a><br> - <a href="/services_wol.php" class="navlnk">Wake on LAN</a><br> - <?php echo return_ext_menu("Services"); ?> - <strong>VPN</strong><br> - <a href="/vpn_ipsec.php" class="navlnk">IPsec</a><br> - <a href="/vpn_pptp.php" class="navlnk">PPTP</a><br> - <strong>Status</strong><br> - <?php if (isset($config['captiveportal']['enable'])): ?> - <a href="/status_captiveportal.php" class="navlnk">Captive portal</a><br> - <?php endif; ?> - <a href="/carp_status.php" class="navlnk">CARP (failover)</a><br> - <a href="/diag_dhcp_leases.php" class="navlnk">DHCP leases</a><br> - <a href="/status_interfaces.php" class="navlnk">Interfaces</a><br> - <a href="/diag_ipsec_sad.php" class="navlnk">IPsec</a><br> - <a href="/diag_pkglogs.php" class="navlnk">Package logs</a><br> - <a href="/status_queues.php" class="navlnk">Queues</a><br> - <a href="/status_services.php" class="navlnk">Services</a><br> - <a href="/index.php" class="navlnk">System</a><br> - <a href="/diag_logs.php" class="navlnk">System logs</a><br> - <a href="/status_graph.php" class="navlnk">Traffic graph</a><br> - <?php $i = 0; $ifdescrs = array(); - if (is_array($config['interfaces']['wan']['wireless']) && - (strstr($config['interfaces']['wan']['if'], "wi") || strstr($config['interfaces']['wan']['if'], "ath"))) - $ifdescrs['wan'] = 'WAN'; - - if (is_array($config['interfaces']['lan']['wireless']) && - (strstr($config['interfaces']['lan']['if'], "wi") || strstr($config['interfaces']['lan']['if'], "ath"))) - $ifdescrs['lan'] = 'LAN'; + +<div id="wrapper"> + + <div id="header"> + <div id="header-left"></div> + <div id="header-right"> + <span class="alert"> + Alert Alert Alert Alert Alert Alert Alert Alert Alert + </span> + <span class="normal"> + <span class="left">webConfigurator</span> + <span class="right">localhost.local</span> + </span> + </div> + </div> <!-- Header DIV --> + <div id="content"> + <div id="left"> + <div id="navigation"> + <ul> + <li> + <div>System</div> + <ul> + <li><a href="/system_advanced.php" class="navlnk">Advanced</a></li> + <li><a href="/system_firmware_check.php" class="navlnk">Firmware</a></li> + <li><a href="/system.php" class="navlnk">General setup</a></li> + <li><a href="/pkg_mgr.php" class="navlnk">Packages</a></li> + <li><a href="/system_routes.php" class="navlnk">Static routes</a></li> + </ul> + </li> + <li> + <div>Interfaces + <?php if (!isset($config['system']['webgui']['noassigninterfaces'])): ?> + <a href="/interfaces_assign.php" class="navlnks">(assign)</a> + <?php endif; ?></div> + <ul> + <a href="/interfaces_lan.php" class="navlnk">LAN</a></li> + <li><a href="/interfaces_opt.php?index=1" class="navlnk">DMZ</a></li> + <li><a href="/interfaces_wan.php" class="navlnk">WAN</a></li> + <li><a href="/interfaces_lan.php" class="navlnk">LAN</a></li> + <?php for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++): if (!isset($config['interfaces']['opt' . $i]['ovpn'])): ?> + <li><a href="/interfaces_opt.php?index=<?=$i;?>" class="navlnk"><?=htmlspecialchars($config['interfaces']['opt' . $i]['descr']);?></a></li> + <?php endif; endfor; ?> + <?php echo return_ext_menu("Interfaces"); ?> + </ul> + </li> + <li> + <div>Firewall</div> + <ul> + <li><a href="/firewall_aliases.php" class="navlnk">Aliases</a></li> + <li><a href="/firewall_nat.php" class="navlnk">NAT</a></li> + <li><a href="/firewall_rules.php" class="navlnk">Rules</a></li> + <li><a href="/firewall_shaper.php" class="navlnk">Traffic Shaper</a></li> + <li><a href="/firewall_virtual_ip.php" class="navlnk">Virtual IPs</a></li> + <?php echo return_ext_menu("Firewall"); ?> + </ul> + </li> + <li> + <div>Services</div> + <ul> + <?php if (isset($config['captiveportal']['enable'])): ?> + <li><a href="/services_captiveportal.php" class="navlnk">Captive portal</a></li> + <?php endif; ?> + <li><a href="/services_dnsmasq.php" class="navlnk">DNS forwarder</a></li> + <li><a href="/services_dhcp_relay.php" class="navlnk">DHCP relay</a></li> + <li><a href="/services_dhcp.php" class="navlnk">DHCP server</a></li> + <li><a href="/services_dyndns.php" class="navlnk">Dynamic DNS</a></li> + <li><a href="/services_snmp.php" class="navlnk">SNMP</a></li> + <li><a href="/services_wol.php" class="navlnk">Wake on LAN</a></li> + <?php echo return_ext_menu("Services"); ?> + </ul> + </li> + <li> + <div>VPN</div> + <ul> + <li><a href="/vpn_ipsec.php" class="navlnk">IPsec</a></li> + <li><a href="/vpn_pptp.php" class="navlnk">PPTP</a></li> + <?php echo return_ext_menu("VPN"); ?> + </ul> + </li> + <li> + <div>Status</div> + <ul> + <?php if (isset($config['captiveportal']['enable'])): ?> + <li><a href="/status_captiveportal.php" class="navlnk">Captive portal</a></li> + <?php endif; ?> + <li><a href="/carp_status.php" class="navlnk">CARP (failover)</a></li> + <li><a href="/diag_dhcp_leases.php" class="navlnk">DHCP leases</a></li> + <li><a href="/status_interfaces.php" class="navlnk">Interfaces</a></li> + <li><a href="/diag_ipsec_sad.php" class="navlnk">IPsec</a></li> + <li><a href="/diag_pkglogs.php" class="navlnk">Package logs</a></li> + <li><a href="/status_queues.php" class="navlnk">Queues</a></li> + <li><a href="/status_services.php" class="navlnk">Services</a></li> + <li><a href="/index.php" class="navlnk">System</a></li> + <li><a href="/diag_logs.php" class="navlnk">System logs</a></li> + <li><a href="/status_graph.php" class="navlnk">Traffic graph</a></li> + <?php $i = 0; $ifdescrs = array(); + if (is_array($config['interfaces']['wan']['wireless']) && + (strstr($config['interfaces']['wan']['if'], "wi") || strstr($config['interfaces']['wan']['if'], "ath"))) + $ifdescrs['wan'] = 'WAN'; + + if (is_array($config['interfaces']['lan']['wireless']) && + (strstr($config['interfaces']['lan']['if'], "wi") || strstr($config['interfaces']['lan']['if'], "ath"))) + $ifdescrs['lan'] = 'LAN'; + + for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) { + if (is_array($config['interfaces']['opt' . $j]['wireless']) && + isset($config['interfaces']['opt' . $j]['enable']) && + (strstr($config['interfaces']['opt' . $j]['if'], "wi") || strstr($config['interfaces']['opt' . $j]['if'], "ath"))) + $ifdescrs['opt' . $j] = $config['interfaces']['opt' . $j]['descr']; + } + if (count($ifdescrs) > 0): ?> + <li><a href="/status_wireless.php" class="navlnk">Wireless</a></li> + <?php endif; ?> + <?php echo return_ext_menu("Status"); ?> + </ul> + </li> + <?php isset($config['developers']): ?> + <li> + <div>Developers</div> + <ul> + <li><a href="/restart_httpd.php" class="navlnk">Restart HTTPD</a></li> + </ul> + </li> + <? php endif ?> + <li> + <div>Diagnostics</div> + <ul id="diag"> + <li><a href="/diag_backup.php" class="navlnk">Backup/Restore</a></li> + <li><a href="/exec.php" class="navlnk">Command Prompt</a></li> + <li><a href="/edit.php" class="navlnk">Edit File</a></li> + <li><a href="/diag_defaults.php" class="navlnk">Factory defaults </a></li> + <li><a href="/halt.php" class="navlnk">Halt system</a></li> + <li><a href="/diag_ping.php" class="navlnk">Ping</a></li> + <li><a href="/reboot.php" class="navlnk">Reboot system</a></li> + <li><a href="/diag_dump_states.php" class="navlnk">States</a></li> + <?php echo return_ext_menu("Diagnostics"); ?> + </ul> + </li> + </ul> + </div> - for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) { - if (is_array($config['interfaces']['opt' . $j]['wireless']) && - isset($config['interfaces']['opt' . $j]['enable']) && - (strstr($config['interfaces']['opt' . $j]['if'], "wi") || strstr($config['interfaces']['opt' . $j]['if'], "ath"))) - $ifdescrs['opt' . $j] = $config['interfaces']['opt' . $j]['descr']; - } - if (count($ifdescrs) > 0): ?> - <a href="/status_wireless.php" class="navlnk">Wireless</a><br> - <?php endif; ?> - <?php echo return_ext_menu("Status"); ?> -<?php if (isset($config['system']['developer'])) { ?> - <strong>Developers</strong><br> - <a href="/restart_httpd.php" class="navlnk">Restart HTTPD</a><br> -<?php } ?> - <?php if (isset($config['system']['webgui']['expanddiags']) || strstr($_SERVER['SCRIPT_FILENAME'], "diag_") || strstr($_SERVER['SCRIPT_FILENAME'], "reboot")): ?> - <a href="javascript:showhide('diag','tri_diag')"><img src="/tri_o.gif" id="tri_diag" width="14" height="10" border="0"></a><strong><a href="javascript:showhide('diag','tri_diag')" class="navlnk">Diagnostics</a></strong><br> - <span id="diag"> - <?php else: ?> - <a href="javascript:showhide('diag','tri_diag')"><img src="/tri_c.gif" id="tri_diag" width="14" height="10" border="0"></a><strong><a href="javascript:showhide('diag','tri_diag')" class="navlnk">Diagnostics</a></strong><br> - <span id="diag" style="display: none"> - <?php endif; ?> - <a href="/diag_backup.php" class="navlnk">Backup/Restore</a><br> - <a href="/exec.php" class="navlnk">Command Prompt</a><br> - <a href="/edit.php" class="navlnk">Edit File</a><br> - <a href="/diag_defaults.php" class="navlnk">Factory defaults </a><br> - <a href="/halt.php" class="navlnk">Halt system</a><br> - <a href="/diag_ping.php" class="navlnk">Ping</a><br> - <a href="/reboot.php" class="navlnk">Reboot system</a><br> - <a href="/diag_dump_states.php" class="navlnk">States</a><br> - <?php echo return_ext_menu("Diagnostics"); ?> - </span> - </font></span> - </td> - </tr> - </table> - </div> - </td> - <td width="600"><table width="100%" border="0" cellpadding="10" cellspacing="0"> - <tr><td> + </div> <!-- Left DIV --> + + <div id="right"> + <?php /* display a top alert bar if need be */ diff --git a/usr/local/www/fend.inc b/usr/local/www/fend.inc index 33cf7e5..41255d0 100755 --- a/usr/local/www/fend.inc +++ b/usr/local/www/fend.inc @@ -1,28 +1,22 @@ -</td></tr></table></td> - </tr> - <tr> - <td> </td> - </tr> - <tr align="center" valign="top"> - <td id="fend" colspan="2" class="cpline" bgcolor="#990000"><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. - All rights reserved. [<a href="/license.php" class="tblnk">view license</a>]</td> - </tr> -</table> + </div> <!-- Right DIV --> + + </div> <!-- Content DIV --> + + <div id="footer"> + <p><a target="_blank" href="http://www.pfSense.com">pfSense</a> is © 2004-2005 by Scott Ullrich. All Rights Reserved.</p> + <p>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>]</p> + </div> <!-- Footer DIV --> + +<div> <!-- Wrapper Div --> + <script type="text/javascript"> NiftyCheck(); Rounded("div#niftyMenu","top bottom","#FFFFFF","#000000","smooth"); Rounded("div#mainarea","bl br tr","#FFF","#eeeeee","smooth"); Rounded("div#boxarea","bl br tl tr","#FFF","#eeeeee","smooth"); Rounded("tr#fend","bl br tl tr","#FFF","#990000","smooth"); -<?php - /* if we displayed an alert earlier, round the bottom edges */ - if($need_alert_display == true) { - echo "Rounded(\"div#roundalert\",\"all\",\"#FFF\",\"#000000\",\"smooth\");\n"; - echo "Rounded(\"div#topbox\",\"all\",\"#FFF\",\"#990000\",\"smooth\");\n"; - } else { - echo "Rounded(\"div#topbox\",\"all\",\"#FFF\",\"#990000\",\"smooth\");\n"; - } -?> +Rounded("div#topbox","all","#FFF","#990000","smooth"); +Rounded("div#navigation","top bottom","#FFFFFF","#000000","smooth"); +Rounded("div#footer","bl br tl tr]","#FFF","#990000","smooth"); </script> diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc index 20d672a..a0fe623 100755 --- a/usr/local/www/head.inc +++ b/usr/local/www/head.inc @@ -1,8 +1,22 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<?php +/* + * if user has selected a custom template, use it. + * otherwise default to pfsense tempalte + */ +if($config['template'] <> "") + $g['tempalte'] = $config['template']; +else + $g['tempalte'] = "pfsense"; +?> + <html> <head> <title><?=gentitle($pgtitle);?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <link rel="stylesheet" href="/templates/{$g['template']}/pfsense-screen.css" media="all" /> <link rel="stylesheet" type="text/css" href="/niftycssCode.css"> <link rel="stylesheet" type="text/css" href="/niftycssprintCode.css" media="print"> <link href="gui.css" rel="stylesheet" type="text/css"> |
