diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-05-28 20:27:35 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-05-28 20:27:35 +0000 |
| commit | 5e4a316d9eafa5df369621fac39c5ece992e930d (patch) | |
| tree | 955fcf26aab7246f761d012c1a097d9b3f97d987 /usr | |
| parent | ec6cb6bd8592f6686d4a97577fa76c09f45bc7fb (diff) | |
| download | pfsense-5e4a316d9eafa5df369621fac39c5ece992e930d.zip pfsense-5e4a316d9eafa5df369621fac39c5ece992e930d.tar.gz | |
Reorder items, clean up code
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/fbegin.inc | 126 |
1 files changed, 61 insertions, 65 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 1e68777..a8f56cd 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -66,54 +66,58 @@ function showhide(tspan, tri) { <tr> <td><span class="navlnk"><font color="#FFFFFF"> <strong>System</strong> <br> - <a href="/system.php" class="navlnk">General - setup</a><br> - <a href="/system_routes.php" class="navlnk">Static - routes</a><br> - <a href="/system_firmware_check.php" class="navlnk">Firmware</a><br> - <a href="/system_advanced.php" class="navlnk">Advanced</a><br> - <a href="/pkg_mgr.php" class="navlnk">Packages</a><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> - <a href="/interfaces_wan.php" class="navlnk">WAN</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; ?> + <?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_rules.php" class="navlnk">Rules</a><br> - <a href="/firewall_nat.php" class="navlnk">NAT</a><br> - <a href="/firewall_aliases.php" class="navlnk">Aliases</a><br> - <a href="/firewall_shaper.php" class="navlnk">Traffic Shaper</a><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> <?php echo return_ext_menu("Firewall"); ?> <strong>Services</strong><br> - <a href="/services_dnsmasq.php" class="navlnk">DNS forwarder</a><br> - <a href="/services_dyndns.php" class="navlnk">Dynamic - DNS</a><br> - <a href="/services_dhcp.php" class="navlnk">DHCP server</a><br> - <a href="/services_dhcp_relay.php" class="navlnk">DHCP relay</a><br> - <a href="/services_snmp.php" class="navlnk">SNMP</a><br> - <a href="/services_proxyarp.php" class="navlnk">Proxy ARP</a><br> - <a href="/services_captiveportal.php" class="navlnk">Captive portal</a><br> - <a href="/services_wol.php" class="navlnk">Wake on LAN</a><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_proxyarp.php" class="navlnk">Proxy ARP</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> + <a href="/vpn_ipsec.php" class="navlnk">IPsec</a><br> + <a href="/vpn_pptp.php" class="navlnk">PPTP</a><br> <!-- - <a href="/vpn_openvpn.php" class="navlnk">OpenVPN</a><br> + <a href="/vpn_openvpn.php" class="navlnk">OpenVPN</a><br> --> <strong>Status</strong><br> - <a href="/index.php" class="navlnk">System</a><br> - <a href="/status_interfaces.php" class="navlnk">Interfaces</a><br> - <a href="/status_queues.php" class="navlnk">Queues</a><br> - <a href="/status_graph.php" class="navlnk">Traffic graph</a><br> - <?php $i = 0; $ifdescrs = array(); + <?php if (isset($config['captiveportal']['enable'])): ?> + <a href="/status_captiveportal.php" class="navlnk">Captive portal</a><br> + <?php endif; ?> + <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="/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'; @@ -128,34 +132,26 @@ function showhide(tspan, tri) { (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; ?> - <a href="/diag_logs.php" class="navlnk">System logs</a><br> - <a href="/diag_pkglogs.php" class="navlnk">Package logs</a><br> - <a href="/diag_dhcp_leases.php" class="navlnk">DHCP leases</a><br> - <a href="/diag_ipsec_sad.php" class="navlnk">IPsec</a><br> - <?php if (isset($config['captiveportal']['enable'])): ?> - <a href="/status_captiveportal.php" class="navlnk">Captive portal</a><br> - <?php endif; ?> - <?php echo return_ext_menu("Status"); ?> - <?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_ping.php" class="navlnk">Ping</a><br> - <a href="/diag_resetstate.php" class="navlnk">Reset state</a><br> - <a href="/diag_backup.php" class="navlnk">Backup/Restore</a><br> - <a href="/diag_defaults.php" class="navlnk">Factory defaults </a><br> - <a href="/edit.php" class="navlnk">Edit File</a><br> - <a href="/exec.php" class="navlnk">Command Prompt</a><br> - <a href="/reboot.php" class="navlnk">Reboot system</a><br> - <a href="/halt.php" class="navlnk">Halt system</a><br> - <?php echo return_ext_menu("Diagnostics"); ?> + 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']['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_resetstate.php" class="navlnk">Reset state</a><br + <?php echo return_ext_menu("Diagnostics"); ?> </span> </font></span> </td> |
