Add monitorip to correct location

2 files changed, 11 insertions, 7 deletions

diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php
index bffa70e..94de560 100755
--- a/usr/local/www/load_balancer_pool_edit.php
+++ b/usr/local/www/load_balancer_pool_edit.php
@@ -180,12 +180,6 @@ function type_change(enable_change) {
 			</td>
 		</tr>
 		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">Monitor IP</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input id="monitorip" name="monitorip" value="<?php echo $pconfig['monitorip']; ?>">
-			</td>
-		</tr>		
-		<tr align="left">
 			<td width="22%" valign="top" class="vncellreq">Monitor</td>
 			<td width="78%" class="vtable" colspan="2">
 				<select id="monitor" name="monitor">
@@ -194,7 +188,13 @@ function type_change(enable_change) {
 					<!-- billm - XXX: add HTTP/HTTPS here -->
 				</select>
 			</td>
-		</tr>		
+		</tr>
+		<tr align="left">
+			<td width="22%" valign="top" class="vncellreq">Monitor IP</td>
+			<td width="78%" class="vtable" colspan="2">
+				<input id="monitorip" name="monitorip" value="<?php echo $pconfig['monitorip']; ?>">
+			</td>
+		</tr>			
 		<tr align="left">
 			<td width="22%" valign="top" class="vncellreq">IP</td>
 			<td width="78%" class="vtable">
diff --git a/usr/local/www/pool.js b/usr/local/www/pool.js
index feb1492..c7c0740 100755
--- a/usr/local/www/pool.js
+++ b/usr/local/www/pool.js
@@ -1,5 +1,9 @@
 function AddServerToPool(form) {
 	var ServerPort=form.ipaddr.value;
+	if(form.type.selectedIndex == 2)
+		var ServerPort=form.ipaddr.value;
+	else
+		var ServerPort=form.ipaddr.value + "|" + form.monitorip.value;
 	form['servers[]'].options[form['servers[]'].options.length] = new Option(ServerPort,ServerPort);
 }