From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 19 Nov 2007 18:25:02 -0000
Subject: [Cluster-devel] conga/luci/cluster form-chooser resource-form- ...
Message-ID: <20071119182502.11683.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-11-19 18:25:02

Modified files:
	luci/cluster   : form-chooser resource-form-macros 
	                 validate_sys_svc.js 

Log message:
	The rest of the work needed for the split of 'form-macros'

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-chooser.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.45&r2=1.46
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_sys_svc.js.diff?cvsroot=cluster&r1=1.3&r2=1.4

--- conga/luci/cluster/form-chooser	2007/09/27 21:42:15	1.21
+++ conga/luci/cluster/form-chooser	2007/11/19 18:25:02	1.22
@@ -20,7 +20,7 @@
 <tal:block tal:define="global waiting request/specialpagetype|nothing" />
 
 <tal:block tal:condition="busywaiting">
-	<div metal:use-macro="here/form-macros/macros/busywaitpage" />
+	<div metal:use-macro="here/busy_wait-macro/macros/busywaitpage" />
 </tal:block>
 
 <tal:block tal:condition="not: busywaiting">
@@ -35,7 +35,7 @@
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '5'">
-		<div metal:use-macro="here/form-macros/macros/clusterconfig-form" />
+		<div metal:use-macro="here/cluster_config-macros/macros/clusterconfig-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '6'">
@@ -43,7 +43,7 @@
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '7'">
-		<div metal:use-macro="here/form-macros/macros/clusterconfig-form" />
+		<div metal:use-macro="here/cluster_config-macros/macros/clusterconfig-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '8'">
@@ -83,55 +83,55 @@
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '18'">
-		<div metal:use-macro="here/form-macros/macros/vmadd-form" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/vmadd-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '19'">
-		<div metal:use-macro="here/form-macros/macros/vmconfig-form" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/vmconfig-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '20'">
-		<div metal:use-macro="here/form-macros/macros/servicelist-form" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/servicelist-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '21'">
-		<div metal:use-macro="here/form-macros/macros/serviceadd-form" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/serviceadd-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '22'">
-		<div metal:use-macro="here/form-macros/macros/servicelist-form" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/servicelist-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '23'">
-		<div metal:use-macro="here/form-macros/macros/servicelist-form" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/servicelist-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '24'">
-		<div metal:use-macro="here/form-macros/macros/serviceconfig-form" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/serviceconfig-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '25'">
-		<div metal:use-macro="here/form-macros/macros/serviceprocess-form" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/serviceprocess-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '56'">
-		<div metal:use-macro="here/form-macros/macros/servicedelete-form" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/servicedelete-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '26'">
-		<div metal:use-macro="here/form-macros/macros/servicestart" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/servicestart" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '27'">
-		<div metal:use-macro="here/form-macros/macros/servicestop" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/servicestop" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '28'">
-		<div metal:use-macro="here/form-macros/macros/servicerestart" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/servicerestart" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '59'">
-		<div metal:use-macro="here/form-macros/macros/servicemigrate" />
+		<div metal:use-macro="here/cluster_svc-macros/macros/servicemigrate" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '30'">
@@ -163,51 +163,51 @@
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '40'">
-		<div metal:use-macro="here/form-macros/macros/fdomlist-form" />
+		<div metal:use-macro="here/fdom-macros/macros/fdomlist-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '41'">
-		<div metal:use-macro="here/form-macros/macros/fdomadd-form" />
+		<div metal:use-macro="here/fdom-macros/macros/fdomadd-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '42'">
-		<div metal:use-macro="here/form-macros/macros/fdomlist-form" />
+		<div metal:use-macro="here/fdom-macros/macros/fdomlist-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '43'">
-		<div metal:use-macro="here/form-macros/macros/fdomconfig-form" />
+		<div metal:use-macro="here/fdom-macros/macros/fdomconfig-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '44'">
-		<div metal:use-macro="here/form-macros/macros/fdom-form" />
+		<div metal:use-macro="here/fdom-macros/macros/fdom-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '45'">
-		<div metal:use-macro="here/form-macros/macros/fdomprocess-form" />
+		<div metal:use-macro="here/fdom-macros/macros/fdomprocess-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '50'">
-		<div metal:use-macro="here/form-macros/macros/fencedevs-form" />
+		<div metal:use-macro="here/fence-macros/macros/fencedevs-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '51'">
-		<div metal:use-macro="here/form-macros/macros/fencedevadd-form" />
+		<div metal:use-macro="here/fence-macros/macros/fencedevadd-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '52'">
-		<div metal:use-macro="here/form-macros/macros/fencedevlist-form" />
+		<div metal:use-macro="here/fence-macros/macros/fencedevlist-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '53'">
-		<div metal:use-macro="here/form-macros/macros/fencedevconfig-form" />
+		<div metal:use-macro="here/fence-macros/macros/fencedevconfig-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '54'">
-		<div metal:use-macro="here/form-macros/macros/fencedev-form" />
+		<div metal:use-macro="here/fence-macros/macros/fencedev-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '55'">
-		<div metal:use-macro="here/form-macros/macros/fencedevprocess-form" />
+		<div metal:use-macro="here/fence-macros/macros/fencedevprocess-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '80'">
@@ -215,17 +215,16 @@
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '90'">
-		<div metal:use-macro="here/form-macros/macros/system-svc-form" />
+		<div metal:use-macro="here/system_svc-macros/macros/system-svc-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '91'">
-		<div metal:use-macro="here/form-macros/macros/system-svc-update-form" />
+		<div metal:use-macro="here/system_svc-macros/macros/system-svc-update-form" />
 	</tal:block>
 
 	<tal:block tal:condition="python: ptype == '1000'">
 		<div metal:use-macro="here/form-macros/macros/get-cluster-members-form" />
 	</tal:block>
-
 </tal:block>
 </metal:choose-form>
 
--- conga/luci/cluster/resource-form-macros	2007/11/06 23:05:06	1.45
+++ conga/luci/cluster/resource-form-macros	2007/11/19 18:25:02	1.46
@@ -13,6 +13,10 @@
 </head>
 <body>
 
+<div metal:define-macro="resourcelist-form">
+	<h2>Resource List Form</h2>
+</div>
+
 <div metal:define-macro="res_form_footer" tal:omit-tag="">
 	<tal:block tal:condition="not:sinfo">
 		<p class="hbSubmit">
@@ -319,7 +323,7 @@
 	<br/>
 
 	<div class="reschoose">
-		<tal:block metal:use-macro="here/form-macros/macros/serviceconfig-type-macro" />
+		<tal:block metal:use-macro="here/cluster_svc-macros/macros/serviceconfig-type-macro" />
 	</div>
 	</tal:block>
 </div>
--- conga/luci/cluster/validate_sys_svc.js	2007/08/08 21:00:06	1.3
+++ conga/luci/cluster/validate_sys_svc.js	2007/11/19 18:25:02	1.4
@@ -8,7 +8,7 @@
 */
 
 function svc_callback() {
-	return check_ajax_xml(xmlHttp_object, svc_callback_check));
+	return check_ajax_xml(xmlHttp_object, svc_callback_check);
 }
 
 function svc_callback_check(ret_status, obj) {