From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 30 Nov 2006 22:21:53 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros
Message-ID: <20061130222153.17806.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
Branch: 	RHEL5
Changes by:	jparsons at sourceware.org	2006-11-30 22:21:52

Modified files:
	luci/cluster   : form-macros 

Log message:
	fix form pre-fill for fencedevs...part of bz212021, make cfg link visible,finished scsi fence form

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.90.2.4&r2=1.90.2.5

--- conga/luci/cluster/form-macros	2006/11/30 20:10:17	1.90.2.4
+++ conga/luci/cluster/form-macros	2006/11/30 22:21:52	1.90.2.5
@@ -1702,7 +1702,19 @@
 	tal:attributes="id cur_fencedev/name | nothing">
 
 	<div id="fence_scsi" class="fencedev">
-		-
+	<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>SCSI Reservation Fencing</td>
+			</tr>
+			<tr>
+				<td>Name</td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="value cur_fencedev/name | nothing" />
+				</td>
+			</tr>
+  </table>	
 	</div>
 </div>
 
@@ -3000,7 +3012,7 @@
 <tal:block tal:define="global fencedevs python: fencedevinfo['fencedevs']"/>
   <span tal:repeat="fencedev fencedevs">
    <h3>Agent type: <span tal:content="fencedev/pretty_name"/></h3>
-   <h3>Name: <span tal:content="fencedev/name"/></h3>
+   <h3>Name: <font color="green"><a tal:attributes="href fencedev/cfgurl"><span tal:content="fencedev/name"/></a></font></h3>
    <h3>Nodes using this device for fencing:</h3>
    <ul>
      <tal:block tal:define="global usednodes python:fencedev['nodesused']"/>
@@ -3113,10 +3125,16 @@
 <div metal:define-macro="fencedev-form">
 	<h2>Fence Device Form</h2>
 
-	<div class="cluster fencedev" tal:define="
-		global cur_fence_type python: 'fence_apc';
+	<div class="cluster fencedev">
+  <tal:block tal:define="
 		global cur_fencename request/fencename | nothing;
-		global cur_cluster request/clustername | nothing" >
+		global cur_cluster request/clustername | nothing;
+		global cur_fence_type python: 'fence_apc'"/>
+
+  <span tal:condition="cur_fencename">
+    <span tal:define="global cur_fencedev python:here.getFence(modelb,request);
+                      global cur_fence_type cur_fencedev/agent"/>
+  </span>
 	
 	<tal:block tal:condition="python: cur_fence_type == 'fence_apc'">
 		<tal:block metal:use-macro="here/form-macros/macros/fence-form-apc" />