[Cluster-devel] conga/luci/cluster form-macros
jparsons at sourceware.org
jparsons at sourceware.org
Wed Aug 16 23:40:05 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: jparsons at sourceware.org 2006-08-16 23:40:04
Modified files:
luci/cluster : form-macros
Log message:
various small nits
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.48&r2=1.49
--- conga/luci/cluster/form-macros 2006/08/16 23:02:27 1.48
+++ conga/luci/cluster/form-macros 2006/08/16 23:40:03 1.49
@@ -1221,30 +1221,31 @@
</div>
<div metal:define-macro="fdomlist-form">
- <span tal:define="ragent python:here.getRicciAgent(request/clustername);
+ <span tal:define="ragent python:here.getRicciAgentForCluster(request);
global sta python:here.getClusterStatus(ragent);
global fdominfo python:here.getFdomsInfo(modelb, request, sta);">
<span tal:repeat="fdom fdominfo">
<div class="fdomname">
- <h2>Failover Domain Name: <font color="blue"><a href="" tal:attributes="href fdom/cfgurl"><span tal:content="fdom/name"/></a></font></h2>
+ <img src="fDom.png"/><h2>Failover Domain Name: <font color="blue"><a href="" tal:attributes="href fdom/cfgurl"><span tal:content="fdom/name"/></a></font></h2>
</div>
<div class="fdomordered">
<span tal:condition="python:fdom['ordered'] == True">
- <h2>This Failover Domain is <i>Ordered</i></h2>
+ <h4>This Failover Domain is <i>Ordered</i></h4>
</span>
<span tal:condition="python:fdom['ordered'] == False">
- <h2>This Failover Domain is <i>Unordered</i></h2>
+ <h4>This Failover Domain is <i>Unordered</i></h4>
</span>
</div>
<div class="fdomrestricted">
<span tal:condition="python:fdom['restricted'] == True">
- <h2>This Failover Domain is <i>Restricted</i></h2>
+ <h4>This Failover Domain is <i>Restricted</i></h4>
</span>
<span tal:condition="python:fdom['restricted'] == False">
- <h2>This Failover Domain is <i>Unrestricted</i></h2>
+ <h4>This Failover Domain is <i>Unrestricted</i></h4>
</span>
</div>
<div class="fdommembers">
+ <h3>Members of this Failover Domain</h3>
<ul>
<span tal:repeat="node fdom/nodeslist">
<li style="list-style-image: url(small_node_active.png);" tal:condition="python:node['status'] == '0'">
@@ -1262,16 +1263,16 @@
<div class="fdomservice">
<h2>Services employing this Failover Domain: </h2>
<ul>
- <span tal:condition="python:len(cstatus['currentservices']) < 1">
+ <span tal:condition="python:len(fdom['svclist']) < 1">
<li><i>No Services Defined</i></li>
</span>
<span tal:repeat="svc fdom/svclist">
- <span tal:condition="python:svc['srunning'] == 'true'">
+ <span tal:condition="python:svc['status'] == 'true'">
<li style="list-style-image:url(small_svc.png);">
<a href="" tal:attributes="href svc/svcurl"><font color="green"><span tal:content="svc/name"/></font></a> Running On Node <span tal:content="svc/location"/>
</li>
</span>
- <span tal:condition="python:svc['srunning'] != 'true'">
+ <span tal:condition="python:svc['status'] != 'true'">
<li style="list-style-image:url(small_svc_stopped.png);">
<a href="" tal:attributes="href svc/svcurl"><font color="red"><span tal:content="svc/name"/></font></a> Not Running
</li>
@@ -1280,6 +1281,7 @@
</ul>
</div>
</span>
+ <hr/>
</span>
</div>
More information about the Cluster-devel
mailing list