- - - - -

- - -

- + + + +</head> + +<body> + +<metal:choose-form metal:define-macro="main-form"> + +<tal:block tal:define="global waiting request/specialpagetype|nothing" /> + +<tal:block tal:condition="busywaiting"> + <div metal:use-macro="here/form-macros/macros/busywaitpage" /> +</tal:block> + +<tal:block tal:condition="not: busywaiting"> + <tal:block tal:define="global ptype request/pagetype |nothing" /> + + <tal:block tal:condition="python: not ptype or ptype == '0' or ptype == '1' or ptype == '2' or ptype == '3'"> + <div metal:use-macro="here/form-macros/macros/clusters-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '4'"> + <div metal:use-macro="here/form-macros/macros/clusters-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '5'"> + <div metal:use-macro="here/form-macros/macros/clusterconfig-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '6'"> + <div metal:use-macro="here/form-macros/macros/clusteradd-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '7'"> + <div metal:use-macro="here/form-macros/macros/clusterconfig-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '8'"> + <div metal:use-macro="here/form-macros/macros/clusterprocess-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '9'"> + <div metal:use-macro="here/form-macros/macros/node-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '10'"> + <div metal:use-macro="here/form-macros/macros/nodes-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '11'"> + <div metal:use-macro="here/form-macros/macros/nodelist-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '12'"> + <div metal:use-macro="here/form-macros/macros/nodegrid-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '14'"> + <div metal:use-macro="here/form-macros/macros/nodes-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '15'"> + <div metal:use-macro="here/form-macros/macros/nodeadd-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '16'"> + <div metal:use-macro="here/form-macros/macros/nodeprocess-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '17'"> + <div metal:use-macro="here/form-macros/macros/nodelogs-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '18'"> + <div metal:use-macro="here/form-macros/macros/vmadd-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '19'"> + <div metal:use-macro="here/form-macros/macros/vmconfig-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '20'"> + <div metal:use-macro="here/form-macros/macros/servicelist-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '21'"> + <div metal:use-macro="here/form-macros/macros/serviceadd-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '22'"> + <div metal:use-macro="here/form-macros/macros/servicelist-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '23'"> + <div metal:use-macro="here/form-macros/macros/servicelist-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '24'"> + <div metal:use-macro="here/form-macros/macros/serviceconfig-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '25'"> + <div metal:use-macro="here/form-macros/macros/serviceprocess-form" /> + </tal:block> + <tal:block tal:condition="python: ptype == '56'"> <div metal:use-macro="here/form-macros/macros/servicedelete-form" /> </tal:block> - <span tal:omit-tag="" tal:condition="python: ptype == '26'"> - <div metal:use-macro="here/form-macros/macros/servicestart"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '27'"> - <div metal:use-macro="here/form-macros/macros/servicestop"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '28'"> - <div metal:use-macro="here/form-macros/macros/servicerestart"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '59'"> - <div metal:use-macro="here/form-macros/macros/servicemigrate"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '30'"> - <div metal:use-macro="here/resource-form-macros/macros/resources-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '31'"> - <div metal:use-macro="here/resource-form-macros/macros/resourceadd-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '32'"> - <div metal:use-macro="here/resource-form-macros/macros/resourcelist-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '33'"> - <div metal:use-macro="here/resource-form-macros/macros/resourceconfig-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '34'"> - <div metal:use-macro="here/resource-form-macros/macros/resource-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '35'"> - <div metal:use-macro="here/resource-form-macros/macros/resourceprocess-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '36'"> - <div metal:use-macro="here/resource-form-macros/macros/resourceremove-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '40'"> - <div metal:use-macro="here/form-macros/macros/fdomlist-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '41'"> - <div metal:use-macro="here/form-macros/macros/fdomadd-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '42'"> - <div metal:use-macro="here/form-macros/macros/fdomlist-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '43'"> - <div metal:use-macro="here/form-macros/macros/fdomconfig-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '44'"> - <div metal:use-macro="here/form-macros/macros/fdom-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '45'"> - <div metal:use-macro="here/form-macros/macros/fdomprocess-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '50'"> - <div metal:use-macro="here/form-macros/macros/fencedevs-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '51'"> - <div metal:use-macro="here/form-macros/macros/fencedevadd-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '52'"> - <div metal:use-macro="here/form-macros/macros/fencedevlist-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '53'"> - <div metal:use-macro="here/form-macros/macros/fencedevconfig-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '54'"> - <div metal:use-macro="here/form-macros/macros/fencedev-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '55'"> - <div metal:use-macro="here/form-macros/macros/fencedevprocess-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '80'"> - <div metal:use-macro="here/form-macros/macros/conf_editor-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '90'"> - <div metal:use-macro="here/form-macros/macros/system-svc-form"/> - </span> - <span tal:omit-tag="" tal:condition="python: ptype == '91'"> - <div metal:use-macro="here/form-macros/macros/system-svc-update-form"/> - </span> - <tal:block tal:condition="python: ptype == '1000'"> - <div metal:use-macro="here/form-macros/macros/get-cluster-members-form"/> - </tal:block> - </span> - </metal:choose-form> - </body> + + <tal:block tal:condition="python: ptype == '26'"> + <div metal:use-macro="here/form-macros/macros/servicestart" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '27'"> + <div metal:use-macro="here/form-macros/macros/servicestop" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '28'"> + <div metal:use-macro="here/form-macros/macros/servicerestart" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '59'"> + <div metal:use-macro="here/form-macros/macros/servicemigrate" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '30'"> + <div metal:use-macro="here/resource-form-macros/macros/resources-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '31'"> + <div metal:use-macro="here/resource-form-macros/macros/resourceadd-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '32'"> + <div metal:use-macro="here/resource-form-macros/macros/resourcelist-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '33'"> + <div metal:use-macro="here/resource-form-macros/macros/resourceconfig-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '34'"> + <div metal:use-macro="here/resource-form-macros/macros/resource-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '35'"> + <div metal:use-macro="here/resource-form-macros/macros/resourceprocess-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '36'"> + <div metal:use-macro="here/resource-form-macros/macros/resourceremove-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '40'"> + <div metal:use-macro="here/form-macros/macros/fdomlist-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '41'"> + <div metal:use-macro="here/form-macros/macros/fdomadd-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '42'"> + <div metal:use-macro="here/form-macros/macros/fdomlist-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '43'"> + <div metal:use-macro="here/form-macros/macros/fdomconfig-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '44'"> + <div metal:use-macro="here/form-macros/macros/fdom-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '45'"> + <div metal:use-macro="here/form-macros/macros/fdomprocess-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '50'"> + <div metal:use-macro="here/form-macros/macros/fencedevs-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '51'"> + <div metal:use-macro="here/form-macros/macros/fencedevadd-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '52'"> + <div metal:use-macro="here/form-macros/macros/fencedevlist-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '53'"> + <div metal:use-macro="here/form-macros/macros/fencedevconfig-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '54'"> + <div metal:use-macro="here/form-macros/macros/fencedev-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '55'"> + <div metal:use-macro="here/form-macros/macros/fencedevprocess-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '80'"> + <div metal:use-macro="here/form-macros/macros/conf_editor-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '90'"> + <div metal:use-macro="here/form-macros/macros/system-svc-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '91'"> + <div metal:use-macro="here/form-macros/macros/system-svc-update-form" /> + </tal:block> + + <tal:block tal:condition="python: ptype == '1000'"> + <div metal:use-macro="here/form-macros/macros/get-cluster-members-form" /> + </tal:block> + +</tal:block> +</metal:choose-form> + +</body> </html> --- conga/luci/cluster/form-macros 2007/09/25 22:47:05 1.214 +++ conga/luci/cluster/form-macros 2007/09/27 21:42:15 1.215 @@ -23,48 +23,61 @@ <tr><td> <h2>Please be patient - this cluster's configuration is being modified.</h2> </td></tr> + <tr><td> - <img src="100wait.gif"/> + <img src="100wait.gif" /> + </td></tr> + + <span tal:define="global nodereports isBusy/nodereports" /> + + <tr tal:repeat="nodereport nodereports"><td> + <tal:block + tal:condition="python:nodereport.get('isnodecreation') != True"> + + <h2><span tal:replace="nodereport/desc" /></h2> + </tal:block> + + <tal:block + tal:condition="python:nodereport.get('isnodecreation') == True"> + + <tal:block + tal:condition="python:nodereport.get('iserror') == True"> + + <h2><span tal:content="nodereport/desc" /></h2> + + <span class="errmsg" + tal:content="nodereport/errormessage" /> + </tal:block> + + <tal:block + tal:condition="python:nodereport.get('iserror') != True"> + + <h2><span tal:content="nodereport/desc" /></h2> + <em tal:content="nodereport/statusmessage | nothing" /> + <br/> + + <tal:block tal:condition="python: nodereport['statusindex'] < 1"> + <img src="notstarted.png" /> + </tal:block> + + <tal:block tal:condition="python: nodereport['statusindex'] == 1 or nodereport['statusindex'] == 2"> + <img src="installed.png" alt="[cluster software installed]" /> + </tal:block> + + <tal:block tal:condition="python: nodereport['statusindex'] == 3"> + <img src="rebooted.png" alt="[cluster node rebooted]" /> + </tal:block> + + <tal:block tal:condition="python: nodereport['statusindex'] == 4 or nodereport['statusindex'] == 5"> + <img src="configured.png" alt="[cluster node configured]" /> + </tal:block> + + <tal:block tal:condition="python: nodereport['statusindex'] == 6"> + <img src="joined.png" alt="[cluster node joined cluster]" /> + </tal:block> + </tal:block> + </tal:block> </td></tr> - <span tal:define="global nodereports isBusy/nodereports"/> - <span tal:repeat="nodereport nodereports"> - <tr><td> - <span tal:condition="python: not 'isnodecreation' in nodereport or nodereport['isnodecreation'] == False"> - <h2><span tal:content="nodereport/desc" /></h2> - </span> - <span tal:condition="python: 'isnodecreation' in nodereport and nodereport['isnodecreation'] == True"> - <span tal:condition="python: nodereport['iserror'] == True"> - <h2><span tal:content="nodereport/desc" /></h2> - <span class="errmsg" tal:content="nodereport/errormessage"/> - </span> - - <span tal:condition="python: nodereport['iserror'] == False"> - <h2><span tal:content="nodereport/desc" /></h2> - <em tal:content="nodereport/statusmessage | nothing"/><br/> - <span tal:condition="python: nodereport['statusindex'] < 1"> - <img src="notstarted.png" /> - </span> - - <span tal:condition=" - python: nodereport['statusindex'] == 1 or nodereport['statusindex'] == 2"> - <img src="installed.png" alt="[cluster software installed]" /> - </span> - - <span tal:condition="python: nodereport['statusindex'] == 3"> - <img src="rebooted.png" alt="[cluster node rebooted]" /> - </span> - - <span tal:condition="python: nodereport['statusindex'] == 4 or nodereport['statusindex'] == 5"> - <img src="configured.png" alt="[cluster node configured]" /> - </span> - - <span tal:condition="python: nodereport['statusindex'] == 6"> - <img src="joined.png" alt="[cluster node joined cluster]" /> - </span> - </span> - </span> - </td></tr> - </span> </table> </div> --- conga/luci/cluster/portlet_cluconfig 2007/01/02 20:12:22 1.4 +++ conga/luci/cluster/portlet_cluconfig 2007/09/27 21:42:15 1.5 @@ -1,61 +1,59 @@ <html xmlns:tal="http://xml.zope.org/namespaces/tal" - xmlns:metal="http://xml.zope.org/namespaces/metal"> + xmlns:metal="http://xml.zope.org/namespaces/metal"> <body> - <div metal:define-macro="cluchooseportlet" - tal:omit-tag="" - tal:define="global data python:here.createCluChooser(request, clusystems)"> + tal:omit-tag="" + tal:define="global data python:here.createCluChooser(request, clusystems)"> <dl class="portlet" id="portlet-cluconfig-tree"> - <dt class="portletHeader"> - <a href="/luci/cluster/index_html?pagetype=3"> - Clusters - </a> - </dt> - - <dd class="portletItemSingle"> - <ul class="portletCluConfigTree cluConfigTreeLevel0"> - - <tal:clucfgtree define=" level python:1; - children python:data.get('children',[]); - show_children python:True; - isNaviTree python:False;"> - <metal:main metal:use-macro="here/portlet_cluconfig_macro/macros/cluconfig_main" /> - </tal:clucfgtree> - </ul> - </dd> + <dt class="portletHeader"> + <a href="/luci/cluster/index_html?pagetype=3">Clusters</a> + </dt> + + <dd class="portletItemSingle"> + <ul class="portletCluConfigTree cluConfigTreeLevel0"> + <tal:clucfgtree define=" + level python:1; + children python:data.get('children',[]); + show_children python:True; + isNaviTree python:False;"> + + <metal:main metal:use-macro="here/portlet_cluconfig_macro/macros/cluconfig_main" /> + </tal:clucfgtree> + </ul> + </dd> </dl> </div> <div metal:define-macro="cluconfigportlet" - tal:omit-tag="" - tal:define="global data python:here.createCluConfigTree(request, modelb)"> - -<dl class="portlet" id="portlet-cluconfig-tree" - tal:condition="data"> - <dt class="portletHeader"> - <a href="/luci/cluster/index_html?pagetype=3" - tal:attributes="href python:here.getClusterURL(request,modelb)"> - <div tal:omit-tag="" tal:content="python: here.getClusterAlias(modelb)" /> - </a> - </dt> - - <dd class="portletItemSingle"> - <ul class="portletCluConfigTree cluConfigTreeLevel0"> - - <tal:clucfgtree define=" level python:1; - children python:data.get('children',[]); - show_children python:True; - isNaviTree python:False;"> - <metal:main metal:use-macro="here/portlet_cluconfig_macro/macros/cluconfig_main" /> - </tal:clucfgtree> - </ul> - </dd> -</dl> + tal:omit-tag="" + tal:define="global data python:here.createCluConfigTree(request, modelb)"> + <dl class="portlet" id="portlet-cluconfig-tree" tal:condition="data"> + <dt class="portletHeader"> + <a href="/luci/cluster/index_html?pagetype=3" + tal:attributes="href python:here.getClusterURL(request,modelb)"> + <div tal:omit-tag="" tal:content="python: here.getClusterAlias(modelb)" /> + </a> + </dt> + + <dd class="portletItemSingle"> + <ul class="portletCluConfigTree cluConfigTreeLevel0"> + + <tal:clucfgtree define=" + level python:1; + children python:data.get('children',[]); + show_children python:True; + isNaviTree python:False;"> + + <metal:main metal:use-macro="here/portlet_cluconfig_macro/macros/cluconfig_main" /> + </tal:clucfgtree> + </ul> + </dd> + </dl> </div> </body> --- conga/luci/cluster/portlet_cluconfig_macro 2006/09/27 22:24:11 1.2 +++ conga/luci/cluster/portlet_cluconfig_macro 2007/09/27 21:42:15 1.3 @@ -3,39 +3,44 @@ <metal:main define-macro="cluconfig_main"> <tal:cfgitem repeat="item children"> <li class="cluConfigTreeItem visualNoMarker" - tal:define="parent_shows_children show_children|nothing; - children item/children|nothing; - cur_item item/currentItem;" - tal:condition="python: (cur_item or parent_shows_children or children)"> + tal:define=" + parent_shows_children show_children|nothing; + children item/children|nothing; + cur_item item/currentItem;" + tal:condition="python: (cur_item or parent_shows_children or children)"> - <tal:level define="item_type_class python: 'type-' + item['cfg_type'];"> - <div tal:attributes="class item_type_class"> - <a tal:condition="cur_item" - tal:attributes="href item/absolute_url; - title item/Description|nothing; - class string: cluConfigTreeCurrentItem visualIconPadding" - tal:content="item/Title|nothing"> - Selected Item Title</a> - <tal:children condition="python: parent_shows_children or children"> - <a tal:condition="not: cur_item" - tal:attributes="href item/absolute_url; - title item/Description|nothing; - class string: visualIconPadding;" - tal:content="item/Title|nothing"> - Unselected Item Title</a> - </tal:children> - </div> + <tal:level define="item_type_class python: 'type-' + item['cfg_type'];"> + <div tal:attributes="class item_type_class"> + <a tal:condition="cur_item" + tal:attributes=" + href item/absolute_url; + title item/Description|nothing; + class string: cluConfigTreeCurrentItem visualIconPadding" + tal:content="item/Title|nothing"> + Selected Item Title</a> + <tal:children condition="python: parent_shows_children or children"> + <a tal:condition="not: cur_item" + tal:attributes=" + href item/absolute_url; + title item/Description|nothing; + class string: visualIconPadding;" + tal:content="item/Title|nothing"> + Unselected Item Title</a> + </tal:children> + </div> - <ul tal:attributes="class python:'cluConfigTree cluConfigTreeLevel'+str(level)" - tal:define="show_children item/show_children| python:True; - level python:level+1;" - tal:condition="python: (show_children or isNaviTree) and children"> - <metal:recurse use-macro="here/portlet_cluconfig_macro/macros/cluconfig_main"/> - </ul> - </tal:level> + <ul tal:attributes=" + class python:'cluConfigTree cluConfigTreeLevel'+str(level)" + tal:define=" + show_children item/show_children| python:True; + level python:level+1;" + tal:condition="python: (show_children or isNaviTree) and children"> + + <metal:recurse use-macro="here/portlet_cluconfig_macro/macros/cluconfig_main" /> + </ul> + </tal:level> </li> </tal:cfgitem> </metal:main> </body> </html> - --- conga/luci/cluster/validate_xvm_key.js 2007/08/09 04:37:20 1.2 +++ conga/luci/cluster/validate_xvm_key.js 2007/09/27 21:42:15 1.3 @@ -25,7 +25,7 @@ if (!node_num) { alert('No node names were entered'); } else { - initiate_async_get(url, cluster_member_callback); + initiate_async_get(url, cluster_member_callback); } }