From 791a5dbe40a2bc0afae4faadca73ae51e602d1ee Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Fri, 16 Oct 2009 15:10:01 -0400
Subject: Reorder tabs again.  Protocols should be the last tab.   Cleanup the
 Relay protocols form adding a listtopic item seperating the page.  Misc
 centers

---
 usr/local/www/load_balancer_monitor.php            |  2 +-
 usr/local/www/load_balancer_pool.php               |  2 +-
 usr/local/www/load_balancer_relay_action.php       |  2 +-
 usr/local/www/load_balancer_relay_protocol.php     |  2 +-
 .../www/load_balancer_relay_protocol_edit.php      | 32 +++++++++++++++-------
 usr/local/www/load_balancer_virtual_server.php     |  2 +-
 6 files changed, 27 insertions(+), 15 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/load_balancer_monitor.php b/usr/local/www/load_balancer_monitor.php
index 4efe2e9..fab7308 100755
--- a/usr/local/www/load_balancer_monitor.php
+++ b/usr/local/www/load_balancer_monitor.php
@@ -105,8 +105,8 @@ $a_monitor = msort($a_monitor, "name");
         $tab_array[] = array("Monitors", true, "load_balancer_monitor.php");
         $tab_array[] = array("Pools", false, "load_balancer_pool.php");
         $tab_array[] = array("Virtual Servers", false, "load_balancer_virtual_server.php");
-        $tab_array[] = array("Relay Protocols", false, "load_balancer_relay_protocol.php");
         $tab_array[] = array("Relay Actions", false, "load_balancer_relay_action.php");
+        $tab_array[] = array("Relay Protocols", false, "load_balancer_relay_protocol.php");
         display_top_tabs($tab_array);
   ?>
   </td></tr>
diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php
index 6b4b6a4..c83f14b 100755
--- a/usr/local/www/load_balancer_pool.php
+++ b/usr/local/www/load_balancer_pool.php
@@ -114,8 +114,8 @@ include("head.inc");
         $tab_array[] = array("Monitors", false, "load_balancer_monitor.php");
         $tab_array[] = array("Pools", true, "load_balancer_pool.php");
         $tab_array[] = array("Virtual Servers", false, "load_balancer_virtual_server.php");
-        $tab_array[] = array("Relay Protocols", false, "load_balancer_relay_protocol.php");
         $tab_array[] = array("Relay Actions", false, "load_balancer_relay_action.php");
+        $tab_array[] = array("Relay Protocols", false, "load_balancer_relay_protocol.php");
         display_top_tabs($tab_array);
   ?>
   </td></tr>
diff --git a/usr/local/www/load_balancer_relay_action.php b/usr/local/www/load_balancer_relay_action.php
index 580dca9..acda8b1 100755
--- a/usr/local/www/load_balancer_relay_action.php
+++ b/usr/local/www/load_balancer_relay_action.php
@@ -121,8 +121,8 @@ $a_vs = msort($a_action, "name");
         $tab_array[] = array("Monitors", false, "load_balancer_monitor.php");
         $tab_array[] = array("Pools", false, "load_balancer_pool.php");
         $tab_array[] = array("Virtual Servers", false, "load_balancer_virtual_server.php");
-        $tab_array[] = array("Relay Protocols", false, "load_balancer_relay_protocol.php");
         $tab_array[] = array("Relay Actions", true, "load_balancer_relay_action.php");
+        $tab_array[] = array("Relay Protocols", false, "load_balancer_relay_protocol.php");
         display_top_tabs($tab_array);
   ?>
   </td></tr>
diff --git a/usr/local/www/load_balancer_relay_protocol.php b/usr/local/www/load_balancer_relay_protocol.php
index abd019d..b289237 100755
--- a/usr/local/www/load_balancer_relay_protocol.php
+++ b/usr/local/www/load_balancer_relay_protocol.php
@@ -117,8 +117,8 @@ $a_vs = msort($a_protocol, "name");
         $tab_array[] = array("Monitors", false, "load_balancer_monitor.php");
         $tab_array[] = array("Pools", false, "load_balancer_pool.php");
         $tab_array[] = array("Virtual Servers", false, "load_balancer_virtual_server.php");
-        $tab_array[] = array("Relay Protocols", true, "load_balancer_relay_protocol.php");
         $tab_array[] = array("Relay Actions", false, "load_balancer_relay_action.php");
+        $tab_array[] = array("Relay Protocols", true, "load_balancer_relay_protocol.php");
         display_top_tabs($tab_array);
   ?>
   </td></tr>
diff --git a/usr/local/www/load_balancer_relay_protocol_edit.php b/usr/local/www/load_balancer_relay_protocol_edit.php
index 556cd44..eac04c1 100755
--- a/usr/local/www/load_balancer_relay_protocol_edit.php
+++ b/usr/local/www/load_balancer_relay_protocol_edit.php
@@ -207,6 +207,18 @@ document.observe('dom:loaded', function(){
 				</select>
 			</td>
 		</tr>
+		<tr align="left">
+			<td width="22%" valign="top" class="vncellreq">Description</td>
+			<td width="78%" class="vtable" colspan="2">
+				<input name="desc" type="text" <?if(isset($pconfig['desc'])) echo "value=\"{$pconfig['desc']}\"";?>size="64">
+			</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td colspan="2" valign="top" class="listtopic">Add / remove available actions</td>
+		</tr>
 		<tr align="left" id="actions">
 			<td width="22%" valign="top" class="vncellreq">Actions</td>
 			<td width="78%" class="vtable" colspan="2">
@@ -214,7 +226,9 @@ document.observe('dom:loaded', function(){
 					<tbody>
 					<tr>
 						<td>
-							Available Actions<br/>
+							<center>
+							<b>Available Actions</b>
+							<br/>
 							<select id="available_action" name="available_action[]" multiple="true" size="5">
 <?php
 if (is_array($config['load_balancer']['lbaction'])) {
@@ -227,12 +241,16 @@ echo "</select>";
 							<br/>
 						</td>
 						<td valign="middle">
-							<input class="formbtn" type="button" name="copyToEnabled" value=">" onclick="copyOption($('available_action'), $('lbaction'));" /><br/>
-							<input class="formbtn" type="button" name="removeFromEnabled" value="X" onclick="deleteOption($('lbaction'));" />
+							<center>
+								<input class="formbtn" type="button" name="copyToEnabled" value="Add" onclick="copyOption($('available_action'), $('lbaction'));" /><br/>
+								<input class="formbtn" type="button" name="removeFromEnabled" value="Remove" onclick="deleteOption($('lbaction'));" />
+							</center>
 						</td>
 
 						<td>
-							Enabled Actions<br/>
+							<center>
+							<b>Enabled Actions</b>
+							<br/>
 							<select id="lbaction" name="lbaction[]" multiple="true" size="5">
 <?php
 if (is_array($pconfig['lbaction'])) {
@@ -250,12 +268,6 @@ echo "</select>";
 			</td>
 		</tr>
 		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">Description</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="desc" type="text" <?if(isset($pconfig['desc'])) echo "value=\"{$pconfig['desc']}\"";?>size="64">
-			</td>
-		</tr>
-		<tr align="left">
 			<td width="22%" valign="top">&nbsp;</td>
 			<td width="78%">
 				<input name="Submit" type="submit" class="formbtn" value="Save" onClick="AllOptions($('lbaction'), true); AllOptions($('available_action'), false);"><input type="button" class="formbtn" value="Cancel" onclick="history.back()">
diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php
index e9ace52..8f9ed50 100755
--- a/usr/local/www/load_balancer_virtual_server.php
+++ b/usr/local/www/load_balancer_virtual_server.php
@@ -109,8 +109,8 @@ include("head.inc");
         $tab_array[] = array("Monitors", false, "load_balancer_monitor.php");
         $tab_array[] = array("Pools", false, "load_balancer_pool.php");
         $tab_array[] = array("Virtual Servers", true, "load_balancer_virtual_server.php");
-        $tab_array[] = array("Relay Protocols", false, "load_balancer_relay_protocol.php");
         $tab_array[] = array("Relay Actions", false, "load_balancer_relay_action.php");
+        $tab_array[] = array("Relay Protocols", false, "load_balancer_relay_protocol.php");
         display_top_tabs($tab_array);
   ?>
   </td></tr>
-- 
cgit v1.1