[Cluster-devel] conga/luci/cluster form-macros
rmccabe at sourceware.org
rmccabe at sourceware.org
Wed Aug 30 22:57:43 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-08-30 22:57:43
Modified files:
luci/cluster : form-macros
Log message:
more ui stuff
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.52&r2=1.53
--- conga/luci/cluster/form-macros 2006/08/29 23:22:59 1.52
+++ conga/luci/cluster/form-macros 2006/08/30 22:57:42 1.53
@@ -1065,6 +1065,8 @@
</div>
<div metal:define-macro="serviceconfig-form">
+ <script type="text/javascript" src="/luci/homebase/homebase_common.js">
+ </script>
<tal:block tal:define="
global ricci_agent python: here.getRicciAgentForCluster(request);
global sstat python: here.getClusterStatus(ricci_agent);
@@ -1074,7 +1076,10 @@
<table class="cluster service" width="100%">
<tr class="cluster service info_top">
<td class="cluster service service_name">
- <strong class="service_name">Service Name:</strong> <span tal:replace="sinfo/name"/>
+ <strong class="service_name">Service Name:</strong>
+ <span
+ tal:content="sinfo/name"
+ tal:attributes="class python: running and 'running' or 'stopped'" />
</td>
<td class="cluster service service_action">
<form method="post" onSubmit="return dropdown(this.gourl)">
@@ -1107,52 +1112,59 @@
<tr class="cluster service info_middle">
<td class="cluster service service_status">
<strong>Service Status:</strong>
- <span tal:content="python: running and 'Running' or 'Stopped'"
- tal:attributes="class python: running and 'running' or 'stopped'" />
+ <span tal:replace="python: running and 'Running' or 'Stopped'" />
</td>
</tr>
</table>
<br/>
<h2>Service Composition</h2>
- <ul tal:define="global svc_rcs sinfo/resource_list">
- <li tal:repeat="res svc_rcs">
- <ul tal:define="
- global type res/type;
- global ref res/ref_object | nothing">
-
- <tal:block omit-tag="" tal:condition="ref">
- <span tal:omit-tag="" tal:define="global shared string:true"/>
- </tal:block>
-
- <div class="" tal:attributes="class python: 'rc_indent' + str(res['indent_ctr'])">
- <span tal:omit-tag="" tal:condition="python: type == 'IP Address: '">
- <li metal:use-macro="here/resource-form-macros/macros/ip_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python: type == 'fs'">
- <li metal:use-macro="here/resource-form-macros/macros/fs_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python: type == 'gfs'">
- <li metal:use-macro="here/resource-form-macros/macros/gfs_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python: type == 'nfsm'">
- <li metal:use-macro="here/resource-form-macros/macros/nfsm_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python: type == 'nfsx'">
- <li metal:use-macro="here/resource-form-macros/macros/nfsx_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python: type == 'nfsc'">
- <li metal:use-macro="here/resource-form-macros/macros/nfsc_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python: type == 'smb'">
- <li metal:use-macro="here/resource-form-macros/macros/smb_macro" />
- </span>
- <span tal:omit-tag="" tal:condition="python: type == 'Script: '">
- <li metal:use-macro="here/resource-form-macros/macros/scr_macro" />
- </span>
- </div>
- </ul>
- </li>
- </ul>
+
+ <div tal:repeat="res sinfo/resource_list"
+ tal:attributes="class python: 'service_comp rc_indent' + str(res['indent_ctr'])">
+
+ <tal:block
+ tal:condition="python: res['max_depth'] > 0"
+ tal:replace="structure string:<div>" />
+
+ <tal:block tal:define="
+ global type res/type;
+ global ref res/ref_object | nothing" />
+
+ <span tal:omit-tag="" tal:condition="python: type == 'IP Address: '">
+ <tal:block metal:use-macro="here/resource-form-macros/macros/ip_macro" />
+ </span>
+
+ <span tal:omit-tag="" tal:condition="python: type == 'fs'">
+ <tal:block metal:use-macro="here/resource-form-macros/macros/fs_macro" />
+ </span>
+
+ <span tal:omit-tag="" tal:condition="python: type == 'gfs'">
+ <tal:block metal:use-macro="here/resource-form-macros/macros/gfs_macro" />
+ </span>
+
+ <span tal:omit-tag="" tal:condition="python: type == 'nfsm'">
+ <tal:block metal:use-macro="here/resource-form-macros/macros/nfsm_macro" />
+ </span>
+
+ <span tal:omit-tag="" tal:condition="python: type == 'nfsx'">
+ <tal:block metal:use-macro="here/resource-form-macros/macros/nfsx_macro" />
+ </span>
+
+ <span tal:omit-tag="" tal:condition="python: type == 'nfsc'">
+ <tal:block metal:use-macro="here/resource-form-macros/macros/nfsc_macro" />
+ </span>
+
+ <span tal:omit-tag="" tal:condition="python: type == 'smb'">
+ <tal:block metal:use-macro="here/resource-form-macros/macros/smb_macro" />
+ </span>
+
+ <span tal:omit-tag="" tal:condition="python: type == 'Script: '">
+ <tal:block metal:use-macro="here/resource-form-macros/macros/scr_macro" />
+ </span>
+
+ <tal:block
+ tal:replace="structure python: '</div>' * (res['indent_ctr'] - res['max_depth'])" />
+ </div>
</div>
<div metal:define-macro="service-form">
@@ -1227,7 +1239,7 @@
<li tal:attributes="class python: nodeclass">
<a tal:content="node/nodename"
tal:attributes="
- href node/configurl;
+ href node/nodecfgurl;
class python: nodeclass;" />
</li>
</tal:block>
More information about the Cluster-devel
mailing list