From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 2 Oct 2006 22:42:53 -0000
Subject: [Cluster-devel] conga/luci/cluster resource-form-macros
Message-ID: <20061002224253.14025.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-10-02 22:42:53

Modified files:
	luci/cluster   : resource-form-macros 

Log message:
	cleanups

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.18&r2=1.19

--- conga/luci/cluster/resource-form-macros	2006/10/02 20:21:47	1.18
+++ conga/luci/cluster/resource-form-macros	2006/10/02 22:42:53	1.19
@@ -232,23 +232,23 @@
 </div>
 
 <div metal:define-macro="resourceconfig-form">
-	<tal:block tal:condition="request/resourcename"
+	<script type="text/javascript"
+		src="/luci/homebase/homebase_common.js">
+	</script>
+	<script type="text/javascript"
+		src="/luci/cluster/resource_form_handlers.js">
+	</script>
+
+	<tal:block tal:define="global resourcename request/resourcename | request/form/resourceName | nothing" />
+	<tal:block tal:condition="resourcename"
 		tal:define="
 			global msg python: here.appendModel(request, modelb);
 			global res python: here.getResourceInfo(modelb, request);
 			global type python: 'tag_name' in res and res['tag_name'] or ''">
 
-		<script type="text/javascript"
-			src="/luci/homebase/homebase_common.js">
-		</script>
-		<script type="text/javascript"
-			src="/luci/cluster/resource_form_handlers.js">
-		</script>
-
-		<h2>Configure <span tal:replace="res/name | string: resource" /></h2>
-
-		<div class="reschoose">
+	<h2>Configure <span tal:replace="res/name | string: resource" /></h2>
 
+	<div class="reschoose">
 		<span tal:omit-tag="" tal:condition="python: type == 'ip'">
 			<div metal:use-macro="here/resource-form-macros/macros/ip_macro" />
 		</span>
@@ -280,7 +280,7 @@
 		<span tal:omit-tag="" tal:condition="python: type == 'script'">
 			<div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
 		</span>
-		</div>
+	</div>
 	</tal:block>
 </div>
 
@@ -290,11 +290,11 @@
 	<p class="reshdr">IP Address Resource Configuration</p>
 
 	<form method="post"
-		tal:define="editDisabled resourceIsRef | nothing"
-		tal:attributes="name res/parent_uuid | nothing">
+		tal:attributes="name res/parent_uuid | nothing"
+		tal:define="editDisabled resourceIsRef | nothing">
 
 	<input name="edit" type="hidden"
-		tal:attributes="value python: ptype == '33' and True or False" />
+		tal:condition="python: ptype == '33' and True or False" />
 
 	<input name="pagetype" type="hidden"
 		tal:attributes="value python: ptype" />
@@ -355,7 +355,7 @@
 		tal:define="editDisabled resourceIsRef | nothing">
 
 	<input name="edit" type="hidden"
-		tal:attributes="value python: ptype == '33' and True or False" />
+		tal:condition="python: ptype == '33' and True or False" />
 
 	<input name="pagetype" type="hidden"
 		tal:attributes="value python: ptype" />
@@ -494,7 +494,7 @@
 		tal:define="editDisabled resourceIsRef | nothing">
 
 	<input name="edit" type="hidden"
-		tal:attributes="value python: ptype == '33' and True or False" />
+		tal:condition="python: ptype == '33' and True or False" />
 
 	<input name="pagetype" type="hidden"
 		tal:attributes="value python: ptype" />
@@ -596,7 +596,7 @@
 		tal:define="editDisabled resourceIsRef | nothing">
 
 	<input name="edit" type="hidden"
-		tal:attributes="value python: ptype == '33' and True or False" />
+		tal:condition="python: ptype == '33' and True or False" />
 
 	<input name="pagetype" type="hidden"
 		tal:attributes="value python: ptype" />
@@ -716,7 +716,7 @@
 		tal:define="editDisabled resourceIsRef | nothing">
 
 	<input name="edit" type="hidden"
-		tal:attributes="value python: ptype == '33' and True or False" />
+		tal:condition="python: ptype == '33' and True or False" />
 
 	<input name="pagetype" type="hidden"
 		tal:attributes="value python: ptype" />
@@ -788,7 +788,7 @@
 		tal:define="editDisabled resourceIsRef | nothing">
 
 	<input name="edit" type="hidden"
-		tal:attributes="value python: ptype == '33' and True or False" />
+		tal:condition="python: ptype == '33' and True or False" />
 
 	<input name="pagetype" type="hidden"
 		tal:attributes="value python: ptype" />
@@ -836,11 +836,11 @@
 	<p class="reshdr">Script Resource Configuration</p>
 
 	<form method="post"
-		tal:define="editDisabled resourceIsRef | nothing"
-		tal:attributes="name res/parent_uuid | nothing">
+		tal:attributes="name res/parent_uuid | nothing"
+		tal:define="editDisabled resourceIsRef | nothing">
 
 	<input name="edit" type="hidden"
-		tal:attributes="value python: ptype == '33' and True or False" />
+		tal:condition="python: ptype == '33' and True or False" />
 
 	<input name="pagetype" type="hidden"
 		tal:attributes="value python: ptype" />
@@ -898,11 +898,11 @@
 	<p class="reshdr">Samba Server Configuration</p>
 
 	<form method="post"
-		tal:define="editDisabled resourceIsRef | nothing"
-		tal:attributes="name res/parent_uuid | nothing">
+		tal:attributes="name res/parent_uuid | nothing"
+		tal:define="editDisabled resourceIsRef | nothing">
 
 	<input name="edit" type="hidden"
-		tal:attributes="value python: ptype == '33' and True or False" />
+		tal:condition="python: ptype == '33' and True or False" />
 
 	<input name="pagetype" type="hidden"
 		tal:attributes="value python: ptype" />