From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 26 Sep 2006 20:57:11 -0000
Subject: [Cluster-devel] conga/luci cluster/form-macros homebase/luci_h ...
Message-ID: <20060926205711.4515.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	2006-09-26 20:57:10

Modified files:
	luci/cluster   : form-macros 
	luci/homebase  : luci_homebase.css 

Log message:
	more fence device bits

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.71&r2=1.72
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.24&r2=1.25

--- conga/luci/cluster/form-macros	2006/09/26 19:47:32	1.71
+++ conga/luci/cluster/form-macros	2006/09/26 20:57:09	1.72
@@ -698,61 +698,147 @@
 </div>
 
 <div metal:define-macro="fence-form-list">
-	<div id="fence_apc">
+	<div id="fence_apc" class="fencedev">
 		<table>
-           <tr><td>Name: </td><td><input name="name"></td></tr>
-           <tr><td>IP Address: </td><td><input name="ip_addr"></td></tr>
-           <tr><td>Login: </td><td><input name="login"></td></tr>
-           <tr><td>Password: </td><td><input name="password"></td></tr>
-           <input type="submit"/>
-           </table> 
-	</div>
-	<div id="fence_wti">
-           <table>
-           <tr><td>Name: </td><td><input name="name"></td></tr>
-           <tr><td>IP Address: </td><td><input name="ip_addr"></td></tr>
-           <tr><td>Password: </td><td><input name="password"></td></tr>
-           <input type="submit"/>
-           </table> 
-	</div>
-	<div id="fence_ilo">
-           <table>
-           <tr><td>Name: </td><td><input name="name"></td></tr>
-           <tr><td>Login: </td><td><input name="login"></td></tr>
-           <tr><td>Password: </td><td><input name="password"></td></tr>
-           <tr><td>Hostname: </td><td><input name="hostname"></td></tr>
-           <input type="submit"/>
-           </table> 
-	</div>
-	<div id="fence_drac">
-           <table>
-           <tr><td>Name: </td><td><input name="name"></td></tr>
-           <tr><td>IP Address: </td><td><input name="ip_addr"></td></tr>
-           <tr><td>Login: </td><td><input name="login"></td></tr>
-           <tr><td>Password: </td><td><input name="password"></td></tr>
-           <input type="submit"/>
-           </table> 
-	</div>
-	<div id="fence_rsa">
-           <table>
-           <tr><td>Name: </td><td><input name="name"></td></tr>
-           <tr><td>Login: </td><td><input name="login"></td></tr>
-           <tr><td>Password: </td><td><input name="password"></td></tr>
-           <tr><td>Hostname: </td><td><input name="hostname"></td></tr>
-           <input type="submit"/>
-           </table> 
-	</div>
-	<div id="fence_ipmilan">
-           <form name="fence_ipmilan">
-           <table>
-           <tr><td>Name: </td><td><input name="name"></td></tr>
-           <tr><td>IP Address: </td><td><input name="ip_addr"></td></tr>
-           <tr><td>Login: </td><td><input name="login"></td></tr>
-           <tr><td>Password: </td><td><input name="password"></td></tr>
-           <tr><td>Auth Type: </td><td><input name="auth_type"></td></tr>
-           <input type="submit"/>
-           </table> 
-           </form>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"></td>
+			</tr>
+			<tr>
+				<td>IP Address</td>
+				<td><input name="ip_addr" type="text"></td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td><input name="login" type="text"></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" autocomplete="off" type="password">
+				</td>
+			</tr>
+		</table>
+		<input type="hidden" name="fence_type" value="apc" />
+	</div>
+
+	<div id="fence_wti" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"></td>
+			</tr>
+			<tr>
+				<td>IP Address</td>
+				<td><input name="ip_addr" type="text"></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off">
+				</td>
+			</tr>
+		</table> 
+		<input type="hidden" name="fence_type" value="wti" />
+	</div>
+
+	<div id="fence_ilo" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"></td>
+			</tr>
+			<tr>
+				<td>Hostname</td>
+				<td><input name="hostname" type="text"></td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td><input name="login" type="text"></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off">
+				</td>
+			</tr>
+		</table> 
+		<input type="hidden" name="fence_type" value="ilo" />
+	</div>
+
+	<div id="fence_drac" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"></td>
+			</tr>
+			<tr>
+				<td>IP Address</td>
+				<td><input name="ip_addr" type="text"></td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td><input name="login" type="text"></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off">
+				</td>
+		</table> 
+		<input type="hidden" name="fence_type" value="drac" />
+	</div>
+
+	<div id="fence_rsa" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"></td>
+			</tr>
+			<tr>
+				<td>Hostname</td>
+				<td><input name="hostname" type="text"></td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td><input name="login" type="text"></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off">
+				</td>
+			</tr>
+		</table> 
+		<input type="hidden" name="fence_type" value="rsa" />
+	</div>
+
+	<div id="fence_ipmilan" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"></td>
+			</tr>
+			<tr>
+				<td>IP Address</td>
+				<td><input name="ip_addr" type="text"></td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td><input name="login" type="text"></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off">
+				</td>
+			</tr>
+			<tr>
+				<td>Auth Type</td>
+				<td><input name="auth_type" type="text"></td>
+			</tr>
+		</table> 
+		<input type="hidden" name="fence_type" value="ipmilan" />
 	</div>
 </div>
 
@@ -896,10 +982,28 @@
 	</div>
 
 	<h3>Fencing</h3>
-	<table class="cluster node" width="100%">
-		<tr class="cluster node info_top">
-			<td class="cluster node fence_main">
-				<strong class="cluster node">Main Fencing Method</strong>
+	<table id="fence_devices" class="cluster node fencedev">
+		<tfoot class="fencedev">
+		<tr class="cluster node fencedev"><td class="cluster node fencedev">
+			<input type="button" value="Update fence properties"
+				onClick="validate_fence_properties('fence_devices')" />
+		</td></tr>
+		</tfoot>
+		<tbody class="fencedev">
+		<tr class="cluster node info_top fencedev">
+			<td class="cluster node fencedev">
+				<span class="fencedev">
+					<strong class="cluster node">Main Fencing Method</strong>
+				</span>
+			</td>
+			<td class="cluster node fence_backup">
+				<span class="fencedev">
+					<strong class="cluster node">Backup Fencing Method</strong>
+				</span>
+			</td>
+		</tr>
+		<tr class="cluster node info_top fencedev">
+			<td class="cluster node fence_main fencedev">
 				<form name="main_fence_form">
 				<select name="select_div"
 					onChange="swap_fence_div('fence_container',
@@ -910,9 +1014,7 @@
 				<div id="fence_container">
 				</div>
 			</td>
-
-			<td class="cluster node fence_backup">
-				<strong class="cluster node">Backup Fencing Method</strong>
+			<td class="cluster node fence_main fencedev">
 				<form name="backup_fence_form">
 				<select name="select_div"
 					onChange="swap_fence_div('fence_container_backup',
@@ -924,7 +1026,14 @@
 				</div>
 			</td>
 		</tr>
+		</tbody>
 	</table>
+	<script type="text/javascript">
+		swap_fence_div('fence_container',
+			document.main_fence_form.select_div.options[document.main_fence_form.select_div.selectedIndex].value);
+		swap_fence_div('fence_container_backup',
+			document.backup_fence_form.select_div.options[document.backup_fence_form.select_div.selectedIndex].value);
+	</script>
 </div>
 
 <div metal:define-macro="nodes-form">
--- conga/luci/homebase/luci_homebase.css	2006/09/25 17:36:02	1.24
+++ conga/luci/homebase/luci_homebase.css	2006/09/26 20:57:10	1.25
@@ -14,6 +14,25 @@
 	background: #dee7ec;
 }
 
+*.fencedev {
+	background: #dee7ec;
+}
+
+table.fencedev {
+	padding: .618em;
+	width: 700px;
+}
+
+div.fencedev,
+td.fencedev {
+	padding-top: .309em;
+	padding-bottom: .309em;
+}
+
+td.fencedev {
+	width: 50%;
+}
+
 ul.configTab {
 	color: #436976 !important;
 	margin: 20px 0px 0px 0px !important;
@@ -67,7 +86,7 @@
 	padding: 20px !important;
 	border: 1px solid #8cacbb !important;
 	z-index: 2 !important;
-	max-width: 600px;
+	max-width: 700px;
 }
 
 a.configTab, a.configTabActive {
@@ -129,7 +148,7 @@
 	border-width: 2px;
 	border-color: red;
 	margin-top: 2em;
-	max-width: 600px;
+	max-width: 700px;
 }
 
 div.retmsgs {
@@ -138,7 +157,7 @@
 	border-style: dotted;
 	border-width: 2px;
 	border-color: green;
-	max-width: 600px;
+	max-width: 700px;
 }
 
 div.hbCSystems {
@@ -405,7 +424,7 @@
 
 div.service_comp {
 	background: #dee7ec;
-	padding: .66em;
+	padding: .618em;
 	margin-top: .5em;
 	border-left: thin solid #c9c9c9;
 	border-bottom: thin solid #c9c9c9;