* [Cluster-devel] conga/luci/cluster resource-form-macros resour ...
@ 2006-08-10 19:46 shuennek
0 siblings, 0 replies; 7+ messages in thread
From: shuennek @ 2006-08-10 19:46 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: shuennek at sourceware.org 2006-08-10 19:46:09
Modified files:
luci/cluster : resource-form-macros resource_form_handlers.js
Log message:
Finally got committs working, two updates weren't there in resource form stuff.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.1&r2=1.2
--- conga/luci/cluster/resource-form-macros 2006/08/02 17:18:40 1.2
+++ conga/luci/cluster/resource-form-macros 2006/08/10 19:46:09 1.3
@@ -145,7 +145,7 @@
<span tal:omit-tag="" tal:condition="python:type == 'smb'">
<div metal:use-macro="here/resource-form-macros/macros/smb_macro" />
</span>
- <span tal:omit-tag="" tal:condition="python:type == 'src'">
+ <span tal:omit-tag="" tal:condition="python:type == 'script'">
<div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
</span>
</span>
@@ -160,7 +160,7 @@
global ip2 python:address[1];
global ip3 python:address[2];
global ip4 python:address[3];
- global monitor_link res/monitor_link;
+ global monitor_link res/attrs/monitor_link;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname+'&edit=1'"/>
@@ -204,20 +204,20 @@
</tr>
</table>
</form>
- <input type="button" value="Submit" onClick="validate(ip_form);" />
+ <input name="submitButton" type="button" value="Submit" onClick="validate(ip_form);" />
</div>
<div id="FS" metal:define-macro="fs_macro">
<span tal:condition="python:ptype == '33'">
<span tal:define="
global resName res/name;
- global mountPoint res/mountpoint;
- global device res/device;
- global fstype res/fstype;
- global opt res/options;
- global fsid res/fsid;
- global force_unmount res/force_unmount;
- global reboot_fail res/self_fence;
- global fscheck res/force_fsck;
+ global mountPoint res/attrs/mountpoint;
+ global device res/attrs/device;
+ global fstype res/attrs/fstype;
+ global opt res/attrs/options;
+ global fsid res/attrs/fsid;
+ global force_unmount res/attrs/force_unmount;
+ global reboot_fail res/attrs/self_fence;
+ global fscheck res/attrs/force_fsck;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname+'&edit=1'"/>
@@ -226,6 +226,7 @@
<span tal:define="
global force_unmount string:0;
global reboot_fail string:0;
+ global fstype string:0;
global fscheck string:0;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
@@ -252,11 +253,11 @@
<div>
<strong>File System Type:</strong>
<select id="fstype" name="fstype">
- <span tal:condition="python: fstype == 'ext2'">
+ <span tal:condition="python: ptype != '33' or fstype == 'ext2'">
<option name="ext2" value="ext2">ext2</option>
<option name="ext3" value="ext3" selected>ext3</option>
</span>
- <span tal:condition="python: fstype != 'ext3'">
+ <span tal:condition="python: ptype == '33' and fstype != 'ext3'">
<option name="ext2" value="ext2" selected>ext2</option>
<option name="ext3" value="ext3">ext3</option>
</span>
@@ -322,12 +323,12 @@
<span tal:condition="python:ptype == '33'">
<span tal:define="
global resName res/name;
- global mountPoint res/mountpoint;
- global device res/device;
- global fstype res/fstype;
- global opt res/options;
- global fsid res/fsid;
- global force_unmount res/force_unmount;
+ global mountPoint res/attrs/mountpoint;
+ global device res/attrs/device;
+ global fstype res/attrs/fstype;
+ global opt res/attrs/options;
+ global fsid res/attrs/fsid;
+ global force_unmount res/attrs/force_unmount;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname+'&edit=1'"/>
@@ -403,12 +404,12 @@
<span tal:condition="python:ptype == '33'">
<span tal:define="
global resName res/name;
- global mountpoint res/mountpoint;
- global opt res/options;
- global expath res/export;
- global nfstype res/fstype;
- global hostname res/host;
- global force_unmount res/force_unmount;
+ global mountpoint res/attrs/mountpoint;
+ global opt res/attrs/options;
+ global expath res/attrs/export;
+ global nfstype res/attrs/fstype;
+ global hostname res/attrs/host;
+ global force_unmount res/attrs/force_unmount;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname+'&edit=1'"/>
@@ -462,11 +463,11 @@
</tr>
<tr>
<div>
- <span tal:condition="python: nfstype == 'nfs'">
+ <span tal:condition="python: ptype != '33' or nfstype == 'nfs'">
<input type="radio" name="nfstype" value="nfs" checked>NFS
<input type="radio" name="nfstype" value="nfs4">NFS4
</span>
- <span tal:condition="python: nfstype != 'nfs4'">
+ <span tal:condition="python: ptype == '33' and nfstype != 'nfs4'">
<input type="radio" name="nfstype" value="nfs">NFS
<input type="radio" name="nfstype" value="nfs4" checked>NFS4
</span>
@@ -497,9 +498,9 @@
<span tal:condition="python:ptype == '33'">
<span tal:define="
global resName res/name;
- global target res/target;
- global opt res/options;
- global expath res/readOnly|nothing;
+ global target res/attrs/target;
+ global opt res/attrs/options;
+ global expath res/attrs/readOnly|nothing;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname+'&edit=1'"/>
@@ -588,7 +589,7 @@
<span tal:condition="python:ptype == '33'">
<span tal:define="
global resName res/name;
- global filename res/file;
+ global filename res/attrs/file;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname+'&edit=1'"/>
@@ -633,7 +634,7 @@
<span tal:condition="python:ptype == '33'">
<span tal:define="
global resName res/name;
- global workgroup res/workgroup;
+ global workgroup res/attrs/workgroup;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname+'&edit=1'"/>
--- conga/luci/cluster/resource_form_handlers.js 2006/07/27 16:32:46 1.1
+++ conga/luci/cluster/resource_form_handlers.js 2006/08/10 19:46:09 1.2
@@ -35,14 +35,15 @@
*down within actual cluster code.*/
function validate(form){
- if(form.resourceName.value.length == 0){
- alert("Please enter a name for this resource. \n");
- return;
+ if(form.type.value != 'ip'){
+ if(form.resourceName.value.length == 0){
+ alert("Please enter a name for this resource. \n");
+ return;
+ }
}
- name = form.getAttribute("name");
/*Get the type of form from the first
*part of the name string*/
- type = name.split("_")[0];
+ type = form.type.value;
/*use eval to access proper resource
*valer function as defined below*/
eval("val"+(type.toUpperCase())+"(form);");
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros resour ...
@ 2006-09-22 19:21 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2006-09-22 19:21 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-09-22 19:21:42
Modified files:
luci/cluster : resource-form-macros resource_form_handlers.js
Log message:
fix for a javascript bug that shows up when inserting global resources into a service
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.9&r2=1.10
--- conga/luci/cluster/resource-form-macros 2006/09/22 18:21:59 1.13
+++ conga/luci/cluster/resource-form-macros 2006/09/22 19:21:41 1.14
@@ -153,11 +153,11 @@
<br/>
<form>
<input type="hidden" name="parent_uuid" value="" />
+ <input type="hidden" name="uuid" value="" />
<input type="hidden" name="tree_level" value="" />
- <select name="gres_chooser"
- onChange="swap_in_global_res('global_resources_block',
- this.options[this.selectedIndex].value,
- this.form.parentNode.parentNode, this.form);">
+ <select id="gres_chooser"
+ onChange="swap_in_global_res('global_resources_block', this,
+ this.form.parentNode, this.form);">
<option checked="checked">Select a resource name</option>
<tal:block
tal:repeat="gres global_resources">
--- conga/luci/cluster/resource_form_handlers.js 2006/09/22 18:21:59 1.9
+++ conga/luci/cluster/resource_form_handlers.js 2006/09/22 19:21:41 1.10
@@ -1,21 +1,18 @@
-function swap_in_global_res(container_id, res_id, replace, form) {
+function swap_in_global_res(container_id, sel, replace, form) {
+ sel.id = null;
var container = document.getElementById(container_id);
if (!container)
return (-1);
+ var res_id = sel.options[sel.selectedIndex].value;
var res = document.getElementById(res_id);
- if (!res)
+ if (!res || !replace)
return (-1);
- if (!replace)
- return (-1);
- var new_uuid = update_resource_form_uuid(res, form.parent_uuid.value, form.tree_level.value);
+ var new_uuid = update_resource_form_uuid(res, form.parent_uuid.value, form.tree_level.value, form.uuid.value);
res.id = new_uuid;
- if (form.gres_chooser && form.gres_chooser.options) {
- var o = form.gres_chooser.options;
- for (var i = 0 ; i < o.length ; i++) {
- if (o[i].value == res_id)
- o[i] = null;
- }
- }
+
+ var sopt = document.getElementById('gres_chooser');
+ if (sopt)
+ sopt.options[sel.selectedIndex].className = 'invisible';
return (replace.parentNode.replaceChild(res, replace));
}
@@ -211,14 +208,19 @@
}
}
-function update_resource_form_uuid(node, parent_uuid, indent_level) {
+function update_resource_form_uuid(node, parent_uuid, indent_level, uuid) {
var forms = node.getElementsByTagName('form');
for (var i = 0 ; i < forms.length ; i++)
forms.name = parent_uuid;
var ielem = node.getElementsByTagName('input');
if (!ielem)
return (null);
- var new_uuid = uuid_list.pop();
+
+ var new_uuid = null;
+ if (!uuid)
+ new_uuid = uuid_list.pop();
+ else
+ new_uuid = uuid;
var used_new_uuid = 0;
for (var i = 0 ; i < ielem.length ; i++) {
if (ielem[i].getAttribute('name') == 'tree_level')
@@ -235,7 +237,7 @@
}
}
- if (!used_new_uuid) {
+ if (!used_new_uuid && !uuid) {
uuid_list.push(new_uuid);
return (null);
}
@@ -276,7 +278,7 @@
node.id = null;
node.className = null;
- var new_uuid = update_resource_form_uuid(node, form.uuid.value, ilevel);
+ var new_uuid = update_resource_form_uuid(node, form.uuid.value, ilevel, null);
if (!new_uuid)
return (-1);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros resour ...
@ 2007-01-17 20:50 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-01-17 20:50 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-01-17 20:50:39
Modified files:
luci/cluster : resource-form-macros resource_form_handlers.js
Log message:
Support for the new resources in RHEL4.5
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.25&r2=1.26
--- conga/luci/cluster/resource-form-macros 2006/12/05 06:44:09 1.25
+++ conga/luci/cluster/resource-form-macros 2007/01/17 20:50:38 1.26
@@ -129,6 +129,18 @@
<div metal:use-macro="here/resource-form-macros/macros/nfsc_macro" />
<div metal:use-macro="here/resource-form-macros/macros/smb_macro" />
<div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
+
+ <tal:block tal:condition="python: os_version and os_version == 'rhel5'">
+ <div metal:use-macro="here/resource-form-macros/macros/vm_macro" />
+ </tal:block>
+
+ <tal:block tal:condition="python: os_version and os_version == 'rhel4'">
+ <div metal:use-macro="here/resource-form-macros/macros/apache_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/mysql_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/openldap_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/postgres-8_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/tomcat-5_macro" />
+ </tal:block>
</div>
</div>
@@ -353,7 +365,7 @@
<input type="checkbox" name="monitorLink"
tal:attributes="
disabled python: editDisabled;
- checked res/attrs/monitor_link | string: 1" />
+ checked res/attrs/monitor_link | string: checked" />
</td>
</tr>
</table>
@@ -796,11 +808,660 @@
<input type="text" size="20" name="options"
tal:attributes="
disabled python: editDisabled;
- value res/attrs/options | nothing"/>
+ value res/attrs/options | nothing" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="systemsTable">Allow Recover</td>
+ <td class="systemsTable">
+ <input type="checkbox" name="allow_recover"
+ tal:attributes="
+ disabled python: editDisabled;
+ checked res/attrs/allow_recover | nothing" />
+ </td>
+ </tr>
+ </table>
+
+ <div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+ </form>
+</div>
+
+<div class="rescfg" name="POSTGRES-8"
+ tal:attributes="id res/name | nothing" metal:define-macro="postgres-8_macro">
+ <p class="reshdr">PostgreSQL 8 Configuration</p>
+
+ <form method="post"
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
+
+ <input name="immutable" type="hidden" value="true"
+ tal:condition="editDisabled" />
+
+ <input name="edit" type="hidden" value="true"
+ tal:condition="python: ptype == '33' and True or False" />
+
+ <input name="pagetype" type="hidden"
+ tal:attributes="value python: ptype" />
+
+ <input name="global" type="hidden"
+ tal:attributes="value resourceIsRef | nothing" />
+
+ <input name="parent_uuid" type="hidden"
+ tal:attributes="value res/parent_uuid | nothing" />
+
+ <input name="uuid" type="hidden"
+ tal:attributes="value res/uuid | nothing" />
+
+ <input name="tree_level" type="hidden"
+ tal:attributes="value res/indent_ctr | string:0" />
+
+ <input name="clustername" type="hidden"
+ tal:attributes="
+ value request/clustername | request/form/clustername | nothing" />
+
+ <input name="oldname" type="hidden"
+ tal:attributes="value res/name | nothing" />
+
+ <input name="type" type="hidden" value="postgres-8" />
+
+ <table class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Name</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="resourceName"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/name | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Config File</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="config_file"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/config_file | string:/var/lib/pgsql/data/postgresql.conf" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Postmaster User</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="postmaster_user"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/postmaster_user | string:postgres" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Postmaster Options</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="postmaster_options"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/postmaster_options | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Shutdown Wait (seconds)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="shutdown_wait"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/shutdown_wait | string:0" />
+ </td>
+ </tr>
+ </table>
+ <div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+ </form>
+</div>
+
+<div class="rescfg" name="APACHE"
+ tal:attributes="id res/name | nothing" metal:define-macro="apache_macro">
+ <p class="reshdr">Apache Configuration</p>
+
+ <form method="post"
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
+
+ <input name="immutable" type="hidden" value="true"
+ tal:condition="editDisabled" />
+
+ <input name="edit" type="hidden" value="true"
+ tal:condition="python: ptype == '33' and True or False" />
+
+ <input name="pagetype" type="hidden"
+ tal:attributes="value python: ptype" />
+
+ <input name="global" type="hidden"
+ tal:attributes="value resourceIsRef | nothing" />
+
+ <input name="parent_uuid" type="hidden"
+ tal:attributes="value res/parent_uuid | nothing" />
+
+ <input name="uuid" type="hidden"
+ tal:attributes="value res/uuid | nothing" />
+
+ <input name="tree_level" type="hidden"
+ tal:attributes="value res/indent_ctr | string:0" />
+
+ <input name="clustername" type="hidden"
+ tal:attributes="
+ value request/clustername | request/form/clustername | nothing" />
+
+ <input name="oldname" type="hidden"
+ tal:attributes="value res/name | nothing" />
+
+ <input name="type" type="hidden" value="apache" />
+
+ <table class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Name</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="resourceName"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/name | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Server Root</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="server_root"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/server_root | string:/etc/httpd" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Config File</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="config_file"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/config_file | string:conf/httpd.conf" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">httpd Options</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="httpd_options"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/httpd_options | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Shutdown Wait (seconds)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="shutdown_wait"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/shutdown_wait | string:0" />
+ </td>
+ </tr>
+ </table>
+ <div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+ </form>
+</div>
+
+<div class="rescfg" name="OPENLDAP"
+ tal:attributes="id res/name | nothing" metal:define-macro="openldap_macro">
+ <p class="reshdr">Open LDAP Configuration</p>
+
+ <form method="post"
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
+
+ <input name="immutable" type="hidden" value="true"
+ tal:condition="editDisabled" />
+
+ <input name="edit" type="hidden" value="true"
+ tal:condition="python: ptype == '33' and True or False" />
+
+ <input name="pagetype" type="hidden"
+ tal:attributes="value python: ptype" />
+
+ <input name="global" type="hidden"
+ tal:attributes="value resourceIsRef | nothing" />
+
+ <input name="parent_uuid" type="hidden"
+ tal:attributes="value res/parent_uuid | nothing" />
+
+ <input name="uuid" type="hidden"
+ tal:attributes="value res/uuid | nothing" />
+
+ <input name="tree_level" type="hidden"
+ tal:attributes="value res/indent_ctr | string:0" />
+
+ <input name="clustername" type="hidden"
+ tal:attributes="
+ value request/clustername | request/form/clustername | nothing" />
+
+ <input name="oldname" type="hidden"
+ tal:attributes="value res/name | nothing" />
+
+ <input name="type" type="hidden" value="openldap" />
+
+ <table class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Name</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="resourceName"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/name | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Config File</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="config_file"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/config_file | string:/etc/openldap/slapd.conf" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">URL List</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="url_list"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/url_list | string:ldap:///" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">slapd Options</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="slapd_options"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/slapd_options | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Shutdown Wait (seconds)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="shutdown_wait"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/shutdown_wait | string:0" />
</td>
</tr>
</table>
+ <div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+ </form>
+</div>
+
+<div class="rescfg" name="MYSQL"
+ tal:attributes="id res/name | nothing" metal:define-macro="mysql_macro">
+ <p class="reshdr">MySQL Configuration</p>
+
+ <form method="post"
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
+
+ <input name="immutable" type="hidden" value="true"
+ tal:condition="editDisabled" />
+ <input name="edit" type="hidden" value="true"
+ tal:condition="python: ptype == '33' and True or False" />
+
+ <input name="pagetype" type="hidden"
+ tal:attributes="value python: ptype" />
+
+ <input name="global" type="hidden"
+ tal:attributes="value resourceIsRef | nothing" />
+
+ <input name="parent_uuid" type="hidden"
+ tal:attributes="value res/parent_uuid | nothing" />
+
+ <input name="uuid" type="hidden"
+ tal:attributes="value res/uuid | nothing" />
+
+ <input name="tree_level" type="hidden"
+ tal:attributes="value res/indent_ctr | string:0" />
+
+ <input name="clustername" type="hidden"
+ tal:attributes="
+ value request/clustername | request/form/clustername | nothing" />
+
+ <input name="oldname" type="hidden"
+ tal:attributes="value res/name | nothing" />
+
+ <input name="type" type="hidden" value="mysql" />
+
+ <table class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Name</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="resourceName"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/name | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Config File</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="config_file"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/config_file | string:/etc/my.cnf" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Listen Address</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="listen_address"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/listen_address | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">mysqld Options</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="mysqld_options"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/mysqld_options | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Shutdown Wait (seconds)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="shutdown_wait"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/shutdown_wait | string:0" />
+ </td>
+ </tr>
+ </table>
+ <div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+ </form>
+</div>
+
+<div class="rescfg" name="VM"
+ tal:attributes="id res/name | nothing" metal:define-macro="vm_macro">
+ <p class="reshdr">Virtual Machine Configuration</p>
+
+ <form method="post"
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
+
+ <input name="immutable" type="hidden" value="true"
+ tal:condition="editDisabled" />
+
+ <input name="edit" type="hidden" value="true"
+ tal:condition="python: ptype == '33' and True or False" />
+
+ <input name="pagetype" type="hidden"
+ tal:attributes="value python: ptype" />
+
+ <input name="global" type="hidden"
+ tal:attributes="value resourceIsRef | nothing" />
+
+ <input name="parent_uuid" type="hidden"
+ tal:attributes="value res/parent_uuid | nothing" />
+
+ <input name="uuid" type="hidden"
+ tal:attributes="value res/uuid | nothing" />
+
+ <input name="tree_level" type="hidden"
+ tal:attributes="value res/indent_ctr | string:0" />
+
+ <input name="clustername" type="hidden"
+ tal:attributes="
+ value request/clustername | request/form/clustername | nothing" />
+
+ <input name="oldname" type="hidden"
+ tal:attributes="value res/name | nothing" />
+
+ <input name="type" type="hidden" value="vm" />
+
+ <table class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Name</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="resourceName"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/name | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Domain</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="domain"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/domain | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Recovery Options</td>
+ <td class="systemsTable">
+ <select name="recovery">
+ tal:attributes="disabled python: editDisabled"
+ tal:define="recovery_opt res/recovery | string:relocate">
+ <option name="relocate"
+ tal:attributes="
+ content string:Relocate
+ selected python: recovery_opt == 'relocate' and 'selected' or ''" />
+ <option name="restart"
+ tal:attributes="
+ content string:Restart
+ selected python: recovery_opt == 'restart' and 'selected' or ''" />
+ <option name="disable"
+ tal:attributes="
+ content string:Disable
+ selected python: recovery_opt == 'disable' and 'selected' or ''" />
+ </select>
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Memory Size</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="memory"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/memory | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Bootloader</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="bootloader"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/bootloader | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Config File</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="path"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/path | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Root disk for the VM (physical, on the host)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="rootdisk_physical"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/rootdisk_physical | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Root disk for the VM (as presented to the VM)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="rootdisk_virtual"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/rootdisk_virtual | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Swap disk for the VM (physical, on the host)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="swapdisk_physical"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/swapdisk_physical | nothing" />
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">Swap disk for the VM (as presented to the VM)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="swapdisk_virtual"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/swapdisk_virtual | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Virtual interface MAC address</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="vif"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/vif | nothing" />
+ </td>
+ </tr>
+ </table>
+ <div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+ </form>
+</div>
+
+<div class="rescfg" name="tomcat-5"
+ tal:attributes="id res/name | nothing" metal:define-macro="tomcat-5_macro">
+ <p class="reshdr">Tomcat 5 Configuration</p>
+
+ <form method="post"
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
+
+ <input name="immutable" type="hidden" value="true"
+ tal:condition="editDisabled" />
+
+ <input name="edit" type="hidden" value="true"
+ tal:condition="python: ptype == '33' and True or False" />
+
+ <input name="pagetype" type="hidden"
+ tal:attributes="value python: ptype" />
+
+ <input name="global" type="hidden"
+ tal:attributes="value resourceIsRef | nothing" />
+
+ <input name="parent_uuid" type="hidden"
+ tal:attributes="value res/parent_uuid | nothing" />
+
+ <input name="uuid" type="hidden"
+ tal:attributes="value res/uuid | nothing" />
+
+ <input name="tree_level" type="hidden"
+ tal:attributes="value res/indent_ctr | string:0" />
+
+ <input name="clustername" type="hidden"
+ tal:attributes="
+ value request/clustername | request/form/clustername | nothing" />
+
+ <input name="oldname" type="hidden"
+ tal:attributes="value res/name | nothing" />
+
+ <input name="type" type="hidden" value="tomcat-5" />
+
+ <table class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Name</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="resourceName"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/name | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Config File</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="config_file"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/config_file | string:/etc/tomcat5/tomcat5.conf" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Tomcat User</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="tomcat_user"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/tomcat_user | string:tomcat" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Catalina Options</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="catalina_options"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/catalina_options | nothing" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Catalina Base</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="catalina_base"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/catalina_base | string:/usr/share/tomcat5" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Shutdown Wait (seconds)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="shutdown_wait"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/shutdown_wait | string:30" />
+ </td>
+ </tr>
+ </table>
<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
</form>
</div>
--- conga/luci/cluster/resource_form_handlers.js 2006/12/06 22:44:18 1.25
+++ conga/luci/cluster/resource_form_handlers.js 2007/01/17 20:50:38 1.26
@@ -98,6 +98,25 @@
return (errors);
}
+function validate_apache(form) {
+}
+
+function validate_tomcat5(form) {
+}
+
+function validate_postgres8(form) {
+}
+
+function validate_mysql(form) {
+}
+
+function validate_openldap(form) {
+}
+
+function validate_vm(form) {
+}
+
+
function validate_nfs_mount(form) {
var errors = new Array();
@@ -211,6 +230,14 @@
return (errors);
}
+var required_children = new Array();
+var required_children['nfsx'] = [ 'nfsc' ];
+
+var forbidden_children = new Array();
+var forbidden_children['ip'] = [ 'nfsc', 'nfsx' ];
+var forbidden_children['netfs'] = [ 'nfsc', 'nfsx' ];
+var forbidden_children['nfsx'] = [ 'nfsx' ];
+
var form_validators = new Array();
form_validators['ip'] = validate_ip;
form_validators['nfsm'] = validate_nfs_mount;
@@ -220,6 +247,12 @@
form_validators['gfs'] = validate_gfs;
form_validators['scr'] = validate_script;
form_validators['smb'] = validate_samba;
+form_validators['vm'] = validate_vm;
+form_validators['apache'] = validate_apache;
+form_validators['tomcat-5'] validate_tomcat5;
+form_validators['postgres-8'] validate_postgres8;
+form_validators['openldap'] = validate_openldap;
+form_validators['mysql'] = validate_mysql;
function check_form(form) {
var valfn = form_validators[form.type.value];
@@ -415,11 +448,12 @@
{
temp += '<input type="' + res_type + '" name="' + input_elem[j].name + '" value="' + input_elem[j].value + '" />';
} else if (res_type == 'checkbox' || res_type == 'radio') {
- if (input_elem[j].checked)
+ if (input_elem[j].checked) {
temp += '<input type="' + res_type + '" name="' + input_elem[j].name + '" checked="checked"';
- if (res_type == 'radio')
- temp += ' value="' + input_elem[j].value + '"';
- temp += ' />';
+ if (res_type == 'radio')
+ temp += ' value="' + input_elem[j].value + '"';
+ temp += ' />';
+ }
}
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros resour ...
@ 2007-01-22 17:06 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-01-22 17:06 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-01-22 17:06:00
Modified files:
luci/cluster : resource-form-macros resource_form_handlers.js
Log message:
vm resources need special handling. to fix later.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.27&r2=1.28
--- conga/luci/cluster/resource-form-macros 2007/01/20 04:50:19 1.28
+++ conga/luci/cluster/resource-form-macros 2007/01/22 17:05:59 1.29
@@ -149,10 +149,6 @@
<div metal:use-macro="here/resource-form-macros/macros/smb_macro" />
<div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
- <tal:block tal:condition="python: os_version and os_version == 'rhel5'">
- <div metal:use-macro="here/resource-form-macros/macros/vm_macro" />
- </tal:block>
-
<tal:block tal:condition="python: os_version and os_version == 'rhel4'">
<div metal:use-macro="here/resource-form-macros/macros/apache_macro" />
<div metal:use-macro="here/resource-form-macros/macros/mysql_macro" />
@@ -325,10 +321,6 @@
<div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
</tal:block>
- <tal:block tal:condition="python: type == 'vm'">
- <div metal:use-macro="here/resource-form-macros/macros/vm_macro" />
- </tal:block>
-
<tal:block tal:condition="python: type == 'apache'">
<div metal:use-macro="here/resource-form-macros/macros/apache_macro" />
</tal:block>
@@ -1241,171 +1233,6 @@
</form>
</div>
-<div class="rescfg" name="VM"
- tal:attributes="id res/name | nothing" metal:define-macro="vm_macro">
- <p class="reshdr">Virtual Machine Configuration</p>
-
- <form method="post"
- tal:attributes="name res/parent_uuid | nothing"
- tal:define="editDisabled resourceIsRef | nothing">
-
- <input name="immutable" type="hidden" value="true"
- tal:condition="editDisabled" />
-
- <input name="edit" type="hidden" value="true"
- tal:condition="python: ptype == '33' and True or False" />
-
- <input name="pagetype" type="hidden"
- tal:attributes="value python: ptype" />
-
- <input name="global" type="hidden"
- tal:attributes="value resourceIsRef | nothing" />
-
- <input name="parent_uuid" type="hidden"
- tal:attributes="value res/parent_uuid | nothing" />
-
- <input name="uuid" type="hidden"
- tal:attributes="value res/uuid | nothing" />
-
- <input name="tree_level" type="hidden"
- tal:attributes="value res/indent_ctr | string:0" />
-
- <input name="clustername" type="hidden"
- tal:attributes="
- value request/clustername | request/form/clustername | nothing" />
-
- <input name="oldname" type="hidden"
- tal:attributes="value res/name | nothing" />
-
- <input name="type" type="hidden" value="vm" />
-
- <table class="systemsTable">
- <tr class="systemsTable">
- <td class="systemsTable">Name</td>
- <td class="systemsTable">
- <input type="text" size="20" name="resourceName"
- tal:attributes="
- disabled python: editDisabled;
- value res/name | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Domain</td>
- <td class="systemsTable">
- <input type="text" size="20" name="domain"
- tal:attributes="
- disabled python: editDisabled;
- value res/domain | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Recovery Options</td>
- <td class="systemsTable">
- <select name="recovery"
- tal:attributes="disabled python: editDisabled"
- tal:define="recovery_opt res/recovery | string:relocate">
-
- <option name="relocate" value="relocate"
- tal:content="string:Relocate"
- tal:attributes="
- selected python: recovery_opt == 'relocate' and 'selected' or ''" />
- <option name="restart" value="restart"
- tal:content="string:Restart"
- tal:attributes="
- selected python: recovery_opt == 'restart' and 'selected' or ''" />
- <option name="disable" value="disable"
- tal:content="string:Disable"
- tal:attributes="
- selected python: recovery_opt == 'disable' and 'selected' or ''" />
- </select>
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Memory Size</td>
- <td class="systemsTable">
- <input type="text" size="20" name="memory"
- tal:attributes="
- disabled python: editDisabled;
- value res/memory | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Bootloader</td>
- <td class="systemsTable">
- <input type="text" size="20" name="bootloader"
- tal:attributes="
- disabled python: editDisabled;
- value res/bootloader | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Config File</td>
- <td class="systemsTable">
- <input type="text" size="20" name="path"
- tal:attributes="
- disabled python: editDisabled;
- value res/path | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Root disk for the VM (physical, on the host)</td>
- <td class="systemsTable">
- <input type="text" size="20" name="rootdisk_physical"
- tal:attributes="
- disabled python: editDisabled;
- value res/rootdisk_physical | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Root disk for the VM (as presented to the VM)</td>
- <td class="systemsTable">
- <input type="text" size="20" name="rootdisk_virtual"
- tal:attributes="
- disabled python: editDisabled;
- value res/rootdisk_virtual | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Swap disk for the VM (physical, on the host)</td>
- <td class="systemsTable">
- <input type="text" size="20" name="swapdisk_physical"
- tal:attributes="
- disabled python: editDisabled;
- value res/swapdisk_physical | nothing" />
- </td>
- </tr>
- <tr class="systemsTable">
- <td class="systemsTable">Swap disk for the VM (as presented to the VM)</td>
- <td class="systemsTable">
- <input type="text" size="20" name="swapdisk_virtual"
- tal:attributes="
- disabled python: editDisabled;
- value res/swapdisk_virtual | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Virtual interface MAC address</td>
- <td class="systemsTable">
- <input type="text" size="20" name="vif"
- tal:attributes="
- disabled python: editDisabled;
- value res/vif | nothing" />
- </td>
- </tr>
- </table>
- <div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
- </form>
-</div>
-
<div class="rescfg" name="tomcat-5"
tal:attributes="id res/name | nothing" metal:define-macro="tomcat-5_macro">
<p class="reshdr">Tomcat 5 Configuration</p>
--- conga/luci/cluster/resource_form_handlers.js 2007/01/20 04:50:19 1.27
+++ conga/luci/cluster/resource_form_handlers.js 2007/01/22 17:06:00 1.28
@@ -123,11 +123,6 @@
return (errors);
}
-function validate_vm(form) {
- var errors = new Array();
- return (errors);
-}
-
function validate_nfs_export(form) {
var errors = new Array();
return (errors);
@@ -258,7 +253,6 @@
form_validators['gfs'] = validate_gfs;
form_validators['scr'] = validate_script;
form_validators['smb'] = validate_samba;
-form_validators['vm'] = validate_vm;
form_validators['apache'] = validate_apache;
form_validators['tomcat-5'] = validate_tomcat5;
form_validators['postgres-8'] = validate_postgres8;
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros resour ...
@ 2007-03-07 18:02 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-03-07 18:02 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-03-07 18:02:55
Modified files:
luci/cluster : resource-form-macros resource_form_handlers.js
Log message:
fix a bug that caused the tomcat-5 resource form to not be displayed
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.4&r2=1.21.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20.2.4&r2=1.20.2.5
--- conga/luci/cluster/resource-form-macros 2007/03/01 00:31:08 1.21.2.4
+++ conga/luci/cluster/resource-form-macros 2007/03/07 18:02:54 1.21.2.5
@@ -1263,7 +1263,7 @@
</form>
</div>
-<div class="rescfg" name="tomcat-5"
+<div class="rescfg" name="TOMCAT-5"
tal:attributes="id res/name | nothing" metal:define-macro="tomcat-5_macro">
<p class="reshdr">Tomcat 5 Configuration</p>
--- conga/luci/cluster/resource_form_handlers.js 2007/03/01 00:31:08 1.20.2.4
+++ conga/luci/cluster/resource_form_handlers.js 2007/03/07 18:02:55 1.20.2.5
@@ -69,8 +69,10 @@
var divs = container.getElementsByTagName('div');
for (var i = 0 ; i < divs.length ; i++) {
- if (!swap_in_elem && divs[i].getAttribute('name') == swap_in_name)
+ if (!swap_in_elem && divs[i].getAttribute('name') == swap_in_name) {
swap_in_elem = divs[i];
+ break;
+ }
}
if (!swap_in_elem)
return (-1);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros resour ...
@ 2007-03-07 18:03 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-03-07 18:03 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-03-07 18:03:52
Modified files:
luci/cluster : resource-form-macros resource_form_handlers.js
Log message:
fix a bug that caused the tomcat-5 resource form to not be displayed
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.31.2.4&r2=1.31.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.29.2.2&r2=1.29.2.3
--- conga/luci/cluster/resource-form-macros 2007/02/22 20:52:06 1.31.2.4
+++ conga/luci/cluster/resource-form-macros 2007/03/07 18:03:52 1.31.2.5
@@ -1263,7 +1263,7 @@
</form>
</div>
-<div class="rescfg" name="tomcat-5"
+<div class="rescfg" name="TOMCAT-5"
tal:attributes="id res/name | nothing" metal:define-macro="tomcat-5_macro">
<p class="reshdr">Tomcat 5 Configuration</p>
--- conga/luci/cluster/resource_form_handlers.js 2007/02/16 02:12:46 1.29.2.2
+++ conga/luci/cluster/resource_form_handlers.js 2007/03/07 18:03:52 1.29.2.3
@@ -69,8 +69,10 @@
var divs = container.getElementsByTagName('div');
for (var i = 0 ; i < divs.length ; i++) {
- if (!swap_in_elem && divs[i].getAttribute('name') == swap_in_name)
+ if (!swap_in_elem && divs[i].getAttribute('name') == swap_in_name) {
swap_in_elem = divs[i];
+ break;
+ }
}
if (!swap_in_elem)
return (-1);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros resour ...
@ 2007-03-07 18:04 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-03-07 18:04 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-03-07 18:04:05
Modified files:
luci/cluster : resource-form-macros resource_form_handlers.js
Log message:
fix a bug that caused the tomcat-5 resource form to not be displayed
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.35&r2=1.36
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.32&r2=1.33
--- conga/luci/cluster/resource-form-macros 2007/02/22 20:52:50 1.35
+++ conga/luci/cluster/resource-form-macros 2007/03/07 18:04:05 1.36
@@ -1263,7 +1263,7 @@
</form>
</div>
-<div class="rescfg" name="tomcat-5"
+<div class="rescfg" name="TOMCAT-5"
tal:attributes="id res/name | nothing" metal:define-macro="tomcat-5_macro">
<p class="reshdr">Tomcat 5 Configuration</p>
--- conga/luci/cluster/resource_form_handlers.js 2007/02/16 02:06:08 1.32
+++ conga/luci/cluster/resource_form_handlers.js 2007/03/07 18:04:05 1.33
@@ -69,8 +69,10 @@
var divs = container.getElementsByTagName('div');
for (var i = 0 ; i < divs.length ; i++) {
- if (!swap_in_elem && divs[i].getAttribute('name') == swap_in_name)
+ if (!swap_in_elem && divs[i].getAttribute('name') == swap_in_name) {
swap_in_elem = divs[i];
+ break;
+ }
}
if (!swap_in_elem)
return (-1);
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-03-07 18:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-17 20:50 [Cluster-devel] conga/luci/cluster resource-form-macros resour rmccabe
-- strict thread matches above, loose matches on Subject: below --
2007-03-07 18:04 rmccabe
2007-03-07 18:03 rmccabe
2007-03-07 18:02 rmccabe
2007-01-22 17:06 rmccabe
2006-09-22 19:21 rmccabe
2006-08-10 19:46 shuennek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).