[Cluster-devel] conga/luci/cluster form-chooser form-macros
rmccabe at sourceware.org
rmccabe at sourceware.org
Thu Feb 1 20:27:35 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-02-01 20:27:33
Modified files:
luci/cluster : form-chooser form-macros
Log message:
get rid of xen prefix in the VM service area
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-chooser.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.169&r2=1.170
--- conga/luci/cluster/form-chooser 2006/12/21 21:26:20 1.15
+++ conga/luci/cluster/form-chooser 2007/02/01 20:27:33 1.16
@@ -57,10 +57,10 @@
<div metal:use-macro="here/form-macros/macros/nodelogs-form"/>
</span>
<span tal:omit-tag="" tal:condition="python: ptype == '18'">
- <div metal:use-macro="here/form-macros/macros/xenvmadd-form"/>
+ <div metal:use-macro="here/form-macros/macros/vmadd-form"/>
</span>
<span tal:omit-tag="" tal:condition="python: ptype == '19'">
- <div metal:use-macro="here/form-macros/macros/xenvmconfig-form"/>
+ <div metal:use-macro="here/form-macros/macros/vmconfig-form"/>
</span>
<span tal:omit-tag="" tal:condition="python: ptype == '20'">
<div metal:use-macro="here/form-macros/macros/servicelist-form"/>
@@ -92,9 +92,6 @@
<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 == '29'">
- <div metal:use-macro="here/form-macros/macros/xenvmprocess"/>
- </span>
<span tal:omit-tag="" tal:condition="python: ptype == '30'">
<div metal:use-macro="here/resource-form-macros/macros/resources-form"/>
</span>
--- conga/luci/cluster/form-macros 2007/01/31 23:36:26 1.169
+++ conga/luci/cluster/form-macros 2007/02/01 20:27:33 1.170
@@ -3464,21 +3464,24 @@
</thead>
<tfoot class="systemsTable">
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ <div class="systemsTableEnd">
+ <input type="button" value="Add another node"
+ onClick="addSystem(this.form)" />
+ </div>
+ </td></tr>
<tr class="systemsTable"><td colspan="2" class="systemsTable">
<input type="hidden" name="trust_shown" value="1"
tal:condition="add_cluster" />
<ul class="vanilla deploy">
<li class="vanilla">
<input type="radio" name="download_pkgs" value="1"
- tal:attributes="
- checked add_cluster/download_pkgs | string:checked" />
+ tal:attributes="checked python: (not add_cluster or not 'download_pkgs' in add_cluster or add_cluster['download_pkgs'] != 0) and 'checked' or ''" />
Download packages
</li>
<li class="vanilla">
<input type="radio" name="download_pkgs" value="0"
- tal:attributes="
- checked not: add_cluster/download_pkgs | nothing" />
-
+ tal:attributes="checked python: (add_cluster and 'download_pkgs' in add_cluster and add_cluster['download_pkgs'] == 0) and 'checked' or ''" />
Use locally installed packages.
</li>
</ul>
@@ -3507,12 +3510,6 @@
</li>
</ul>
</td></tr>
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- <div class="systemsTableEnd">
- <input type="button" value="Add another entry"
- onClick="addSystem(this.form)" />
- </div>
- </td></tr>
</tfoot>
<tal:block tal:define="global cur_sysnum python:0" />
@@ -3734,7 +3731,7 @@
</tal:block>
</div>
-<div metal:define-macro="xenvmadd-form">
+<div metal:define-macro="vmadd-form">
<form method="post" action="">
<input type="hidden" name="clustername"
tal:attributes="value request/clustername | nothing" />
@@ -3770,9 +3767,9 @@
</form>
</div>
-<div metal:define-macro="xenvmconfig-form">
+<div metal:define-macro="vmconfig-form">
<form method="post" action=""
- tal:define="vminfo python:here.getXenVMInfo(modelb, request)">
+ tal:define="vminfo python:here.getVMInfo(modelb, request)">
<input type="hidden" name="clustername"
tal:attributes="value request/clustername | nothing" />
@@ -3818,10 +3815,6 @@
</form>
</div>
-<div metal:define-macro="xenvmprocess">
- <span tal:define="retrn python:here.processXenVM(request)"/>
-</div>
-
<div metal:define-macro="serviceadd-form">
<script type="text/javascript">
set_page_title('Luci â cluster â services â Add a new service');
More information about the Cluster-devel
mailing list