From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 10 Jan 2007 20:02:19 -0000
Subject: [Cluster-devel] conga/luci/cluster fence_device.js form-macros
Message-ID: <20070110200219.25267.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-01-10 20:02:16

Modified files:
	luci/cluster   : fence_device.js form-macros 

Log message:
	more node fencing

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence_device.js.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.148&r2=1.149

--- conga/luci/cluster/fence_device.js	2007/01/09 23:28:02	1.7
+++ conga/luci/cluster/fence_device.js	2007/01/10 20:02:16	1.8
@@ -27,14 +27,17 @@
 		form_elem.appendChild(cloned_iform);
 		var ielem = cloned_iform.getElementsByTagName('input');
 		for (var i = 0 ; i < ielem.length ; i++) {
-			if (ielem[i].type == 'button' && ielem[i].name == 'remove_fence') {
+			if (ielem[i].name == 'parent_fencedev') {
+				ielem[i].value = fi_cont_id;
+			} else if (	ielem[i].type == 'button' &&
+						ielem[i].name == 'remove_fence')
+			{
 				ielem[i].setAttribute('onclick',
 					'del_fence_instance(\'' + cloned_iform.id + '\')');
-				break;
 			}
 		}
 
-		instance_div.appendChild(cloned_iform);
+		instance_div.appendChild(form_elem);
 	}
 }
 
@@ -107,10 +110,13 @@
 		form_elem.appendChild(cloned_iform);
 		var ielem = cloned_iform.getElementsByTagName('input');
 		for (var i = 0 ; i < ielem.length ; i++) {
-			if (ielem[i].type == 'button' && ielem[i].name == 'remove_fence') {
+			if (ielem[i].name == 'parent_fencedev') {
+				ielem[i].value = container_id;
+			} else if (	ielem[i].type == 'button'
+						&& ielem[i].name == 'remove_fence')
+			{
 				ielem[i].setAttribute('onclick',
 					'del_fence_instance(\'' + cloned_iform.id + '\')');
-				break;
 			}
 		}
 		idiv.appendChild(form_elem);
--- conga/luci/cluster/form-macros	2007/01/09 23:28:02	1.148
+++ conga/luci/cluster/form-macros	2007/01/10 20:02:16	1.149
@@ -1250,7 +1250,7 @@
 			<tr>
 				<td>IP Address</td>
 				<td>
-					<input name="ip_addr" type="text"
+					<input name="ipaddr" type="text"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/ipaddr | nothing" />
@@ -1268,7 +1268,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/passwd | nothing" />
@@ -1308,7 +1308,7 @@
 			<tr>
 				<td>IP Address</td>
 				<td>
-					<input name="ip_addr" type="text"
+					<input name="ipaddr" type="text"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fendev/ipaddr | nothing" />
@@ -1326,7 +1326,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/passwd | nothing" />
@@ -1366,7 +1366,7 @@
 			<tr>
 				<td>IP Address</td>
 				<td>
-					<input name="ip_addr" type="text"
+					<input name="ipaddr" type="text"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/ipaddr | nothing" />
@@ -1375,7 +1375,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/passwd | nothing" />
@@ -1427,7 +1427,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
@@ -1462,7 +1462,7 @@
 			<tr>
 				<td>IP Address</td>
 				<td>
-					<input name="ip_addr" type="text"
+					<input name="ipaddr" type="text"
 						tal:attributes="value cur_fencedev/ipaddr | nothing" />
 				</td>
 			</tr>
@@ -1476,7 +1476,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 		</table>
@@ -1524,7 +1524,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
@@ -1561,7 +1561,7 @@
 			<tr>
 				<td>IP Address</td>
 				<td>
-					<input name="ip_addr" type="text"
+					<input name="ipaddr" type="text"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/ipaddr | nothing" />
@@ -1579,7 +1579,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/passwd | nothing" />
@@ -1618,7 +1618,12 @@
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="hostname" type="text"/></td>
+				<td>
+					<input name="hostname" type="text"
+						tal:attributes="
+							disabled cur_fencedev/isShared | nothing;
+							value cur_fencedev/hostname | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
@@ -1632,7 +1637,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/passwd | nothing" />
@@ -1672,7 +1677,7 @@
 			<tr>
 				<td>IP Address</td>
 				<td>
-					<input name="ip_addr" type="text"
+					<input name="ipaddr" type="text"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/ipaddr | nothing" />
@@ -1681,7 +1686,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/passwd | nothing" />
@@ -1808,7 +1813,7 @@
 			<tr>
 				<td>IP Address</td>
 				<td>
-					<input name="ip_addr" type="text"
+					<input name="ipaddr" type="text"
 						tal:attributes="value cur_fencedev/ipaddr | nothing" />
 				</td>
 			</tr>
@@ -1822,7 +1827,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
@@ -1860,7 +1865,7 @@
 			<tr>
 				<td>IP Address</td>
 				<td>
-					<input name="ip_addr" type="text"
+					<input name="ipaddr" type="text"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/ipaddr | nothing" />
@@ -1878,7 +1883,7 @@
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"
+					<input name="passwd" type="password" autocomplete="off"
 						tal:attributes="
 							disabled cur_fencedev/isShared | nothing;
 							value cur_fencedev/passwd | nothing" />
@@ -2020,7 +2025,7 @@
 			<tr>
 				<td>IP Address</td>
 				<td>
-					<input name="ip_addr" type="text"
+					<input name="ipaddr" type="text"
 						tal:attributes="value cur_fencedev/ipaddr | nothing" />
 				</td>
 			</tr>
@@ -2468,8 +2473,8 @@
 			<tr>
 				<td>Blade</td>
 				<td>
-					<input name="ipaddress" type="text"
-						tal:attributes="value cur_instance/ipaddress | nothing" />
+					<input name="blade" type="text"
+						tal:attributes="value cur_instance/blade | nothing" />
 				</td>
 			</tr>
 			<tr><td colspan="2">