diff options
| author | Bill Marquette <billm@pfsense.org> | 2005-07-13 04:15:35 +0000 |
|---|---|---|
| committer | Bill Marquette <billm@pfsense.org> | 2005-07-13 04:15:35 +0000 |
| commit | 49424ec009f38e21e2baff203678ab1c9fde6752 (patch) | |
| tree | ef36cbc0305bf7bf745f359626a9b26babe1dd23 | |
| parent | 4d4ec7e1cb8ebd54dd0db544d01a76cc32dfa924 (diff) | |
| download | pfsense-49424ec009f38e21e2baff203678ab1c9fde6752.zip pfsense-49424ec009f38e21e2baff203678ab1c9fde6752.tar.gz | |
Move CARP around - it's no longer a "service"
status shows under status menu and all settings are under virtual ips
| -rw-r--r-- | usr/local/pkg/carp_settings.xml | 4 | ||||
| -rwxr-xr-x | usr/local/www/carp_status.php | 8 | ||||
| -rwxr-xr-x | usr/local/www/fbegin.inc | 2 | ||||
| -rwxr-xr-x | usr/local/www/firewall_virtual_ip.php | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/usr/local/pkg/carp_settings.xml b/usr/local/pkg/carp_settings.xml index 9fb761d..e418d54 100644 --- a/usr/local/pkg/carp_settings.xml +++ b/usr/local/pkg/carp_settings.xml @@ -21,8 +21,8 @@ </tab> --> <tab> - <text>CARP Status</text> - <url>carp_status.php</url> + <text>Virtual IPs</text> + <url>firewall_virtual_ip.php</url> </tab> <tab> <text>CARP Settings</text> diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index f2ddbfc..7ba828c 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -70,14 +70,6 @@ include("fbegin.inc"); <div id="mainlevel"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> -<tr><td> -<?php - $tab_array = array(); - $tab_array[] = array("CARP Status", true, "carp_status.php"); - $tab_array[] = array("CARP Settings", false, "/pkg_edit.php?xml=carp_settings.xml&id=0"); - display_top_tabs($tab_array); -?> -</td></tr> <tr><td class="tabcont"> <?php diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 8f85ea4..4909390 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -118,7 +118,6 @@ function showhide_black(tspan, tri) { <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> - <a href="/carp_status.php" class="navlnk">CARP (failover)</a><br> <?php echo return_ext_menu("Services"); ?> <strong>VPN</strong><br> <a href="/vpn_ipsec.php" class="navlnk">IPsec</a><br> @@ -127,6 +126,7 @@ function showhide_black(tspan, tri) { <?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> diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index 0bfb207..136b495 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -100,7 +100,15 @@ include("head.inc"); <?php if (file_exists($d_vipconfdirty_path)): ?><p> <?php print_info_box_np("The VIP configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td class="tabnavtbl"> + <?php + /* active tabs */ + $tab_array = array(); + $tab_array[] = array("Virtual IPs", true, "firewall_virtual_ip.php"); + $tab_array[] = array("CARP Settings", false, "pkg_edit.php?xml=carp_settings.xml&id=0"); + display_top_tabs($tab_array); + ?> </td></tr> <tr> <td> |
