[Cluster-devel] conga/luci/cluster form-macros

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-09-28 20:20:12

Modified files:
	luci/cluster   : form-macros 

Log message:
	small cleanups

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

--- conga/luci/cluster/form-macros	2006/09/27 22:24:11	1.73
+++ conga/luci/cluster/form-macros	2006/09/28 20:20:12	1.74
@@ -328,7 +328,12 @@
 	<div id="configTabContent" tal:condition="python: configTabNum == 1">
 		<script type="text/javascript" src="/luci/homebase/homebase_common.js"></script>
 		<script type="text/javascript" src="/luci/cluster/validate_config_general.js"></script>
+
 		<form name="basecluster" action="" method="post">
+			<input type="hidden" name="pagetype"
+				tal:attributes="value request/pagetype | request/form/pagetype"
+			/>
+			<input type="hidden" name="configtype" value="general" />
 		<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
 			<thead class="systemsTable">
 				<tr class="systemsTable"><td class="systemsTable" colspan="1">
@@ -342,13 +347,15 @@
 				<tr class="systemsTable">
 					<td class="systemsTable">Cluster Name</td>
 					<td class="systemsTable">
-						<input type="text" name="cluname" value="" tal:attributes="value clusterinfo/clustername"/>
+						<input type="text" name="cluname"
+							tal:attributes="value clusterinfo/clustername"/>
 					</td>
 				</tr>
 				<tr class="systemsTable">
 					<td class="systemsTable">Configuration Version</td>
 					<td class="systemsTable">
-						<input type="text" name="cfgver" size="5" value="" tal:attributes="value clusterinfo/config_version"/>
+						<input type="text" name="cfgver" size="5"
+							tal:attributes="value clusterinfo/config_version"/>
 					</td>
 				</tr>
 			</tbody>
@@ -357,7 +364,8 @@
 				<tr class="systemsTable">
 					<td class="systemsTable" colspan="2">
 						<div class="systemsTableEnd">
-							<input type="button" value="Apply" onClick="validate_form(this.form);"/>
+							<input type="button" value="Apply"
+								onClick="validate_form(this.form);"/>
 						</div>
 					</td>
 				</tr>
@@ -367,9 +375,16 @@
 	</div>
 
 	<div id="configTabContent" tal:condition="python: configTabNum == 2">
-		<form name="fencedaemon" action="" method="get" tal:attributes="action clusterinfo/fencedaemon_url">
-		<script type="text/javascript" src="/luci/homebase/homebase_common.js"></script>
-		<script type="text/javascript" src="/luci/cluster/validate_config_fence.js"></script>
+		<form name="fencedaemon" method="post">
+			<input type="hidden" name="configtype" value="fence" />
+			<input type="hidden" name="pagetype"
+				tal:attributes="value request/pagetype | request/form/pagetype"
+			/>
+		<script type="text/javascript" src="/luci/homebase/homebase_common.js">
+		</script>
+		<script type="text/javascript" src="/luci/cluster/validate_config_fence.js">
+		</script>
+
 		<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
 			<thead class="systemsTable">
 				<tr class="systemsTable"><td class="systemsTable" colspan="1">
@@ -383,13 +398,15 @@
 				<tr class="systemsTable">
 					<td class="systemsTable">Post Fail Delay</td>
 					<td class="systemsTable">
-						<input type="text" name="post_fail_delay" value="" tal:attributes="value clusterinfo/pfd"/>
+						<input type="text" name="post_fail_delay"
+							tal:attributes="value clusterinfo/pfd" />
 					</td>
 				</tr>
 				<tr class="systemsTable">
 					<td class="systemsTable">Post Join Delay</td>
 					<td class="systemsTable">
-						<input type="text" name="post_join_delay" value="" tal:attributes="value clusterinfo/pjd"/>
+						<input type="text" name="post_join_delay"
+							tal:attributes="value clusterinfo/pjd" />
 					</td>
 				</tr>
 			</tbody>
@@ -398,7 +415,8 @@
 				<tr class="systemsTable">
 					<td class="systemsTable" colspan="2">
 						<div class="systemsTableEnd">
-							<input type="button" value="Apply" onClick="validate_form(this.form);" />
+							<input type="button" value="Apply"
+								onClick="validate_form(this.form);" />
 						</div>
 					</td>
 				</tr>
@@ -408,10 +426,16 @@
 	</div>
 
 	<div id="configTabContent" tal:condition="python: configTabNum == 3">
-		<script type="text/javascript" src="/luci/homebase/homebase_common.js"></script>
-		<script type="text/javascript" src="/luci/cluster/validate_config_multicast.js"></script>
+		<script type="text/javascript" src="/luci/homebase/homebase_common.js">
+		</script>
+		<script type="text/javascript" src="/luci/cluster/validate_config_multicast.js">
+		</script>
 
 		<form name="multicast" action="" method="post">
+			<input type="hidden" name="configtype" value="mcast" />
+			<input type="hidden" name="pagetype"
+				tal:attributes="value request/pagetype | request/form/pagetype"
+			/>
 		<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
 			<thead class="systemsTable">
 				<tr class="systemsTable"><td class="systemsTable" colspan="1">
@@ -457,7 +481,8 @@
 			<tfoot class="systemsTable">
 				<tr class="systemsTable"><td class="systemsTable" colspan="2">
 					<div class="systemsTableEnd">
-						<input type="button" value="Apply" onClick="validate_form(this.form);"/>
+						<input type="button" value="Apply"
+							onClick="validate_form(this.form);"/>
 					</div>
 				</td></tr>
 			</tfoot>
@@ -472,6 +497,7 @@
 			<input type="hidden" name="pagetype"
 				tal:attributes="value request/pagetype | request/form/pagetype"
 			/>
+			<input type="hidden" name="configtype" value="qdisk" />
 		<div class="configTabContent">
 		<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
 			<thead class="systemsTable">