[Cluster-devel] conga/luci/cluster form-macros
rmccabe at sourceware.org
rmccabe at sourceware.org
Sun Jan 7 17:36:18 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-01-07 17:36:17
Modified files:
luci/cluster : form-macros
Log message:
more node-specific fence updates
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.143&r2=1.144
--- conga/luci/cluster/form-macros 2007/01/06 03:29:16 1.143
+++ conga/luci/cluster/form-macros 2007/01/07 17:36:17 1.144
@@ -2901,18 +2901,54 @@
<td class="cluster node fence_main fence">
<div class="fence_container">
+
<div id="fence_list_level2" tal:define="global cur_fence_num python: 0">
<tal:block tal:condition="exists: fenceinfo/level2">
- <tal:block tal:repeat="cur_fencedev fenceinfo/level2">
- <tal:block tal:define="cur_fence_type cur_fencedev/agent | nothing">
- <div tal:attributes="id python: 'fence2_' + str(cur_fence_num)">
- <tal:block
- metal:use-macro="here/form-macros/macros/fencedev-cond-ladder" />
+
+ <div tal:repeat="cur_fencedev fenceinfo/level2"
+ tal:attributes="id python: 'fence2_' + str(cur_fence_num)">
+
+ <tal:block tal:define="
+ cur_fence_dev_id python: 'fence2_' + str(cur_fence_num);
+ cur_fence_type cur_fencedev/agent | nothing;
+ cur_fence_level python: 2">
+
+ <form tal:attributes="name cur_fence_dev_id | string:[unknown]">
+ <tal:block metal:use-macro="here/form-macros/macros/fencedev-cond-ladder" />
+ </form>
+
+ <tal:block
+ tal:define="global cur_instance_num python:0" />
+
+ <div tal:attributes="id python: cur_fence_dev_id + '_instances'">
+ <tal:block tal:condition="exists: cur_fencedev/instance_list">
+ <tal:block tal:repeat="cur_instance cur_fencedev/instance_list">
+ <tal:block
+ tal:define="global cur_fence_instance_id python: cur_fence_dev_id + '_' + str(cur_instance_num)" />
+
+ <div tal:attributes="
+ name cur_fence_instance_id | nothing;
+ id cur_fence_instance_id | nothing">
+
+ <form
+ tal:attributes="name cur_fence_instance_id | nothing">
+ <tal:block metal:use-macro="here/form-macros/macros/fencedev-instance-cond-ladder" />
+ </form>
+ <tal:block
+ tal:define="global cur_instance_num python:cur_instance_num + 1" />
+ </div>
+ </tal:block>
+ </tal:block>
+ </div>
+ <div class="hbSubmit">
+ <input type="button" name="remove_fence"
+ value="Remove this fence device" />
</div>
+ <tal:block tal:define="global cur_fence_num python: cur_fence_num + 1" />
</tal:block>
- <tal:block tal:define="global cur_fence_num python: cur_fence_num + 1" />
- </tal:block>
+ </div>
</tal:block>
+
<tal:block
tal:replace="structure python: '<script type='+chr(0x22)+'text/javascript'+chr(0x22)+'>num_fences_level[1] = ' + str(cur_fence_num) + ';</script>'" />
</div>
@@ -2921,6 +2957,15 @@
<input type="button" value="Add a fence to this level"
onclick="add_node_fence_device(2)" />
</div>
+ <div class="hbSubmit">
+ <form name="fence2_master" method="post" action="">
+ <input type="hidden" name="fence_level" value="2" />
+ <input type="hidden" name="fence_xml" value="" />
+ <input type="hidden" name="pagetype" value="58" />
+ <input type="button"
+ value="Update fence properties"
+ onclick="validate_fence(this.form, 'fence_list_level2')" />
+ </form>
</div>
</td>
</tr>
More information about the Cluster-devel
mailing list