From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 25 Jul 2006 02:27:09 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros form-chooser
Message-ID: <20060725022709.14160.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:	jparsons at sourceware.org	2006-07-25 02:27:08

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

Log message:
	Improvements to cluster configuration

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-chooser.diff?cvsroot=cluster&r1=1.2&r2=1.3

--- conga/luci/cluster/form-macros	2006/07/24 20:10:13	1.10
+++ conga/luci/cluster/form-macros	2006/07/25 02:27:08	1.11
@@ -228,20 +228,108 @@
 	</form>
   </div>
   <div metal:define-macro="clusterconfig-form">
-   <h2>Cluster Configuration Form</h2>
   <!-- <span tal:define="global ricci_agent python:here.getRicciAgentForCluster(request)"/> -->
   <span tal:define="global clusterinfo python:here.getClusterInfo(modelb, request)"/> 
    <form name="basecluster" action="" method="get" tal:attributes="action clusterinfo/basecluster_url">
-    <h4><b>Cluster Name:</b></h4><input type="text" name="cluname" value="" tal:attributes="value clusterinfo/clustername"/>
-    <h4><b>Configuration Version</b></h4><input type="text" name="cfgver" value="" tal:attributes="value clusterinfo/config_version"/>
-    <input type="submit" value="Apply"/>
+    <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+     <thead class="systemsTable"> 
+      <tr class="systemsTable"><td class="systemsTable" colspan="1">
+         <div class="systemsTableTop">
+           <strong>General Properties</strong>
+         </div>
+       </td></tr>
+      </thead>
+      <tbody class="systemsTable">
+       <tr class="systemsTable">
+        <td class="systemsTable">Cluster Name</td>
+        <td class="systemsTable">
+         <input type="text"  name="cluname" value="" 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"/>
+        </td>
+       </tr>
+      </tbody>
+      <tfoot class="systemsTable">
+       <tr class="systemsTable">
+        <td class="systemsTable" colspan="2">
+         <div class="systemsTableEnd">
+          <input type="submit" value="Apply"/>
+         </div>
+        </td>
+       </tr>
+      </tfoot>
+    </table>
   </form>
   <hr/>
    <form name="fencedaemon" action="" method="get" tal:attributes="action clusterinfo/fencedaemon_url">
-    <h4><b>Fence Daemon Properties</b></h4>
-    <h4><b>Post Fail Delay:</h4></b><input type="text" name="post_fail_delay" value="" tal:attributes="value clusterinfo/pfd"/>
-    <h4><b>Post Join Delay:</h4></b><input type="text" name="post_join_delay" value="" tal:attributes="value clusterinfo/pjd"/>
-    <input type="submit" value="Apply"/>
+    <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+     <thead class="systemsTable"> 
+      <tr class="systemsTable"><td class="systemsTable" colspan="1">
+         <div class="systemsTableTop">
+           <strong>Fence Daemon Properties</strong>
+         </div>
+       </td></tr>
+      </thead>
+      <tbody class="systemsTable">
+       <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"/>
+        </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"/>
+        </td>
+       </tr>
+      </tbody>
+      <tfoot class="systemsTable">
+        <tr class="systemsTable">
+         <td class="systemsTable" colspan="2">
+          <div class="systemsTableEnd">
+           <input type="submit" value="Apply"/>
+          </div>
+         </td></tr>
+      </tfoot>
+     </table>
+  </form>
+  <hr/>
+   <form name="multicast" action="" method="get" tal:attributes="action clusterinfo/multicast_url">
+    <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+     <thead class="systemsTable"> 
+      <tr class="systemsTable"><td class="systemsTable" colspan="1">
+         <div class="systemsTableTop">
+           <strong>Multicast Configuration</strong>
+         </div>
+       </td></tr>
+      </thead>
+      <tbody class="systemsTable">
+        <tr class="systemsTable">
+         <td class="systemsTable"><input type="radio" name="mcast" value="False" checked="" tal:attributes="checked python:clusterinfo['is_mcast'] == 'False'"/><b> Let cluster choose the multicast address</b>
+         </td>
+        </tr>
+        <tr class="systemsTable">
+         <td class="systemsTable"><input type="radio" name="mcast" value="True"/> <b> I prefer to choose the multicast address</b>
+         </td>
+        </tr>
+       <tr class="systemsTable">
+        <td class="systemsTable" colspan="2"><input type="text" name="mcast_address" value="" tal:attributes="value clusterinfo/mcast_addr"/>
+        </td>
+       </tr>
+      </tbody>
+      <tfoot class="systemsTable">
+       <tr class="systemsTable"><td class="systemsTable" colspan="2">
+         <div class="systemsTableEnd">
+          <input type="submit" value="Apply"/>
+         </div>
+       </td></tr>
+      </tfoot>
+     </table>
   </form>
   </div>
   <div metal:define-macro="clusterprocess-form">
@@ -251,7 +339,7 @@
      <span tal:define="global ricci_agent python:here.getRicciAgentForCluster(request)"/>
      <span tal:define="global nodestatus python:here.getClusterStatus(ricci_agent)"/>
        <span tal:define="global nodeinfo python:here.getNodeInfo(modelb, nodestatus, request)"/>
-    <!-- First table row is status icon, name, and dropdown -->
+    <!-- First table row is status icon, name, and dropdown -->>
     <table>
      <span tal:condition="python:nodeinfo['nodestate'] == '0'">
       <tr>
--- conga/luci/cluster/form-chooser	2006/07/24 19:01:50	1.2
+++ conga/luci/cluster/form-chooser	2006/07/25 02:27:08	1.3
@@ -17,17 +17,20 @@
     <span tal:omit-tag="" tal:condition="python: ptype == '0'">
      <div metal:use-macro="here/form-macros/macros/entry-form"/>
     </span>
+    <span tal:omit-tag="" tal:condition="python: ptype == '3'">
+     <div metal:use-macro="here/form-macros/macros/clusters-form"/>
+    </span>
     <span tal:omit-tag="" tal:condition="python: ptype == '4'">
      <div metal:use-macro="here/form-macros/macros/clusters-form"/>
     </span>
     <span tal:omit-tag="" tal:condition="python: ptype == '5'">
-     <div metal:use-macro="here/form-macros/macros/cluster-form"/>
+     <div metal:use-macro="here/form-macros/macros/clusterconfig-form"/>
     </span>
     <span tal:omit-tag="" tal:condition="python: ptype == '6'">
      <div metal:use-macro="here/form-macros/macros/clusteradd-form"/>
     </span>
     <span tal:omit-tag="" tal:condition="python: ptype == '7'">
-     <div metal:use-macro="here/form-macros/macros/clusters-form"/>
+     <div metal:use-macro="here/form-macros/macros/clusterconfig-form"/>
     </span>
     <span tal:omit-tag="" tal:condition="python: ptype == '8'">
      <div metal:use-macro="here/form-macros/macros/clusterprocess-form"/>