* [Cluster-devel] conga/luci/homebase form-macros
@ 2006-07-25 17:46 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2006-07-25 17:46 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-07-25 17:46:32
Modified files:
luci/homebase : form-macros
Log message:
refactored system / cluster delete
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.29&r2=1.30
--- conga/luci/homebase/form-macros 2006/07/19 20:20:53 1.29
+++ conga/luci/homebase/form-macros 2006/07/25 17:46:31 1.30
@@ -1,7 +1,7 @@
<html>
<tal:comment replace="nothing">
- $Id: form-macros,v 1.29 2006/07/19 20:20:53 rmccabe Exp $
+ $Id: form-macros,v 1.30 2006/07/25 17:46:31 rmccabe Exp $
</tal:comment>
<head>
@@ -220,7 +220,7 @@
<tal:block tal:repeat="cs python:systems[0][c]">
<div class="hbcheckdiv">
- <input type="checkbox" class="hombase"
+ <input type="checkbox" class="homebase"
tal:define="global num_systems python:num_systems + 1"
tal:attributes="
checked python:perms[curUser]['storage'][cs] and 'checked' or None;
@@ -239,7 +239,7 @@
<tal:block tal:repeat="s python: systems[1]">
<div class="hbcheckdiv">
- <input type="checkbox" class="hombase"
+ <input type="checkbox" class="homebase"
tal:define="global num_systems python:num_systems + 1"
tal:attributes="
checked python:perms[curUser]['storage'][s] and 'checked' or None;
@@ -325,7 +325,6 @@
tal:attributes="
name python:'__CLUSTER:' + cfname;
id python:'__CLUSTER' + str(num_clusters);
- onChange python: 'checkChildren(\'' + cfname + '\', this)';
value python: c"
/>
<input type="hidden" value=""
@@ -333,24 +332,6 @@
name python:'__CLUSTER:' + cfname"
/>
<span tal:omit-tag="" tal:content="python:c" />
-
- <tal:block tal:repeat="cs python:systems[0][c]">
- <div class="hbcheckdiv"
- tal:define="csfname python: here.strFilter('[^0-9A-Za-z_-]', '_', cs)">
-
- <input type="checkbox" class="hombase"
- tal:define="global num_systems python:num_systems + 1"
- tal:attributes="
- name python:'__SYSTEM:' + csfname;
- id python:'__SYSTEM' + str(num_systems);
- value python:cs"
- />
-
- <input type="hidden" value=""
- tal:attributes="name python:'__SYSTEM:' + csfname" />
- <span class="hbText" tal:omit-tag="" tal:content="python:cs" />
- </div>
- </tal:block>
</div>
</tal:block>
@@ -360,8 +341,7 @@
<tal:block tal:repeat="s python: systems[1]">
<div class="hbcheckdiv"
tal:define="sfname python: here.strFilter('[^0-9A-Za-z_-]', '_', s)">
-
- <input type="checkbox" class="hombase"
+ <input type="checkbox" class="homebase"
tal:define="global num_systems python:num_systems + 1"
tal:attributes="
name python:'__SYSTEM:' + sfname;
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros
@ 2006-07-25 17:47 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2006-07-25 17:47 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-07-25 17:47:36
Modified files:
luci/homebase : form-macros
Log message:
wording change
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.30&r2=1.31
--- conga/luci/homebase/form-macros 2006/07/25 17:46:31 1.30
+++ conga/luci/homebase/form-macros 2006/07/25 17:47:36 1.31
@@ -1,7 +1,7 @@
<html>
<tal:comment replace="nothing">
- $Id: form-macros,v 1.30 2006/07/25 17:46:31 rmccabe Exp $
+ $Id: form-macros,v 1.31 2006/07/25 17:47:36 rmccabe Exp $
</tal:comment>
<head>
@@ -235,7 +235,7 @@
</tal:block>
<div tal:omit-tag="" tal:condition="python: systems[1] and len(systems[1]) > 0">
- <h3 class="homebase">Unclustered Systems</h3>
+ <h3 class="homebase">Storage Systems</h3>
<tal:block tal:repeat="s python: systems[1]">
<div class="hbcheckdiv">
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros
@ 2006-10-16 15:30 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2006-10-16 15:30 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-10-16 15:30:26
Modified files:
luci/homebase : form-macros
Log message:
fix comment
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.40&r2=1.41
--- conga/luci/homebase/form-macros 2006/10/13 17:04:09 1.40
+++ conga/luci/homebase/form-macros 2006/10/16 15:30:26 1.41
@@ -1,7 +1,7 @@
<html>
<tal:comment replace="nothing">
- $Id: form-macros,v 1.40 2006/10/13 17:04:09 rmccabe Exp $
+ $Id: form-macros,v 1.41 2006/10/16 15:30:26 rmccabe Exp $
</tal:comment>
<head>
@@ -458,7 +458,7 @@
</div>
-<tal:comment>
+<tal:comment replace="nothing">
!############################
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros
@ 2006-10-16 15:32 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2006-10-16 15:32 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-10-16 15:32:24
Modified files:
luci/homebase : form-macros
Log message:
more comment fixes
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.41&r2=1.42
--- conga/luci/homebase/form-macros 2006/10/16 15:30:26 1.41
+++ conga/luci/homebase/form-macros 2006/10/16 15:32:24 1.42
@@ -1,7 +1,7 @@
<html>
<tal:comment replace="nothing">
- $Id: form-macros,v 1.41 2006/10/16 15:30:26 rmccabe Exp $
+ $Id: form-macros,v 1.42 2006/10/16 15:32:24 rmccabe Exp $
</tal:comment>
<head>
@@ -575,7 +575,7 @@
</div>
-<tal:comment>
+<tal:comment tal:replace="nothing">
!###########################
@@ -586,7 +586,7 @@
</tal:comment>
<div metal:define-macro="cluster-add-initial-form">
- <tal:comment replace="nothing">
+ <tal:comment tal:replace="nothing">
Things to validate
- At least one node name/password are given and are valid
</tal:comment>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros
@ 2006-10-16 15:35 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2006-10-16 15:35 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-10-16 15:35:27
Modified files:
luci/homebase : form-macros
Log message:
..and more comment fixes
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.42&r2=1.43
--- conga/luci/homebase/form-macros 2006/10/16 15:32:24 1.42
+++ conga/luci/homebase/form-macros 2006/10/16 15:35:27 1.43
@@ -1,7 +1,7 @@
<html>
-<tal:comment replace="nothing">
- $Id: form-macros,v 1.42 2006/10/16 15:32:24 rmccabe Exp $
+<tal:comment tal:replace="nothing">
+ $Id: form-macros,v 1.43 2006/10/16 15:35:27 rmccabe Exp $
</tal:comment>
<head>
@@ -10,7 +10,7 @@
<body>
-<tal:comment replace="nothing">
+<tal:comment tal:replace="nothing">
!############################
@@ -28,14 +28,14 @@
</div>
</div>
-<tal:comment replace="nothing">
+<tal:comment tal:replace="nothing">
!############################
# USER DELETE FORM #
#############################
</tal:comment>
<div metal:define-macro="user-del-form">
- <tal:comment replace="nothing">
+ <tal:comment tal:replace="nothing">
: to validate:
- user was selected,
- selected index is valid
@@ -85,7 +85,7 @@
</div>
-<tal:comment replace="nothing">
+<tal:comment tal:replace="nothing">
!############################
@@ -96,7 +96,7 @@
</tal:comment>
<div metal:define-macro="user-add-form">
- <tal:comment replace="nothing">
+ <tal:comment tal:replace="nothing">
Things to validate:
- user/passwd exist and are not blank
- user doesn't contain invalid characters.
@@ -151,7 +151,7 @@
-<tal:comment replace="nothing">
+<tal:comment tal:replace="nothing">
!############################
@@ -162,7 +162,7 @@
</tal:comment>
<div metal:define-macro="perm-manage-form">
- <tal:comment replace="nothing">
+ <tal:comment tal:replace="nothing">
Things to validate:
- user is selected and valid index
- The rest is checked by the python form submit validator.
@@ -264,7 +264,7 @@
</div>
-<tal:comment replace="nothing">
+<tal:comment tal:replace="nothing">
!############################
@@ -276,7 +276,7 @@
<div metal:define-macro="system-del-form">
- <tal:comment replace="nothing">
+ <tal:comment tal:replace="nothing">
To validate:
- confirm removal
- if it's a cluster, ask if they also want to remove
@@ -375,7 +375,7 @@
-<tal:comment replace="nothing">
+<tal:comment tal:replace="nothing">
!############################
@@ -388,7 +388,7 @@
<div metal:define-macro="system-add-form">
- <tal:comment replace="nothing">
+ <tal:comment tal:replace="nothing">
To validate for each storage system:
- Hostname and Password are given. (skip if both are blank)
- If IP, IP is valid.
@@ -458,7 +458,7 @@
</div>
-<tal:comment replace="nothing">
+<tal:comment tal:replace="nothing">
!############################
@@ -469,7 +469,7 @@
</tal:comment>
<div metal:define-macro="cluster-add-form">
- <tal:comment replace="nothing">
+ <tal:comment tal:replace="nothing">
Things to validate
- Cluster name is specified and contains only valid chars
- At least one node name/password are given and are valid
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros
@ 2006-11-01 21:29 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2006-11-01 21:29 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-11-01 21:29:49
Modified files:
luci/homebase : form-macros
Log message:
show the 'check if all node passwords are identical...' box on the cluster add page if the initial submission has errors
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.47&r2=1.48
--- conga/luci/homebase/form-macros 2006/11/01 20:43:39 1.47
+++ conga/luci/homebase/form-macros 2006/11/01 21:29:49 1.48
@@ -1,7 +1,7 @@
<html>
<tal:comment tal:replace="nothing">
- $Id: form-macros,v 1.47 2006/11/01 20:43:39 rmccabe Exp $
+ $Id: form-macros,v 1.48 2006/11/01 21:29:49 rmccabe Exp $
</tal:comment>
<head>
@@ -583,8 +583,8 @@
<tfoot class="systemsTable">
<tr class="systemsTable"><td colspan="2" class="systemsTable">
- <div tal:condition="python: not 'isComplete' in sessionObj['requestResults'] or not sessionObj['requestResults']['isComplete']">
- <input type="checkbox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if storage system passwords are identical.
+ <div tal:condition="python: not 'isComplete' in sessionObj['requestResults'] or not sessionObj['requestResults']['isComplete'] or ('errors' in sessionObj and len(sessionObj['errors']) > 0)">
+ <input type="checkbox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if cluster node passwords are identical.
</div>
<div class="systemsTable"
tal:condition="python: 'isComplete' in sessionObj['requestResults'] and sessionObj['requestResults']['isComplete']"> </div>
@@ -606,9 +606,9 @@
tal:attributes="
id python: '__SYSTEM' + str(sysNum) + ':Addr';
name python: '__SYSTEM' + str(sysNum) + ':Addr';
- value python: node['ricci_host'];
+ value python: node['host'];
class python: 'hbInputSys' + ('errors' in node and ' error' or '');
- disabled python: nodeAuth and 1 or 0"
+ disabled python: (nodeAuth and node['host'].count('.') > 0) and 1 or 0"
/>
</td>
<td class="systemsTable">
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros
@ 2007-01-24 19:59 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2007-01-24 19:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-01-24 19:59:52
Modified files:
luci/homebase : form-macros
Log message:
address remaining bz213083 issues
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.52&r2=1.53
--- conga/luci/homebase/form-macros 2007/01/04 00:19:48 1.52
+++ conga/luci/homebase/form-macros 2007/01/24 19:59:52 1.53
@@ -199,13 +199,15 @@
<span tal:condition="python:perms" tal:content="string:Select a User" /><br/>
<select tal:omit-tag="python: not perms" class="homebase" name="userList" onChange="document.location = this.form.baseURL.value + '&user=' + this.form.userList.options[this.form.userList.selectedIndex].text">
- <tal:block tal:repeat="user python:perms">
+ <tal:block tal:define="userlist python: perms.keys().sort()">
+ <tal:block tal:repeat="user userlist">
<option class="homebase"
tal:content="python:user"
tal:attributes="value python:user;
selected python:user == curUser"
/>
</tal:block>
+ </tal:block>
</select>
<h3 class="homebase" tal:condition="python:systems[0] and len(systems[0]) > 0">
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros
@ 2007-01-29 20:43 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2007-01-29 20:43 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-01-29 20:43:29
Modified files:
luci/homebase : form-macros
Log message:
bz225206
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.54&r2=1.55
--- conga/luci/homebase/form-macros 2007/01/24 20:21:32 1.54
+++ conga/luci/homebase/form-macros 2007/01/29 20:43:29 1.55
@@ -223,7 +223,7 @@
tal:define="global num_clusters python:num_clusters + 1"
tal:attributes="
checked python:perms[curUser]['cluster'][c] and 'checked' or None;
- name python:'__CLUSTER:' + cfname;
+ name python:'__CLUSTER:X___' + cfname;
id python:'__CLUSTER' + str(num_clusters);
value python: c"
/>
@@ -239,7 +239,7 @@
tal:define="global num_systems python:num_systems + 1"
tal:attributes="
checked python:perms[curUser]['storage'][s] and 'checked' or None;
- name python:'__SYSTEM:' + here.strFilter('[^0-9A-Za-z_-]', '_', s);
+ name python:'__SYSTEM:X___' + here.strFilter('[^0-9A-Za-z_-]', '_', s);
id python:'__SYSTEM' + str(num_systems);
value python:s"
/>
@@ -504,13 +504,13 @@
<input type="checkbox" class="homebase"
tal:define="global num_clusters python:num_clusters + 1"
tal:attributes="
- name python:'__CLUSTER:' + cfname;
+ name python:'__CLUSTER:X___' + cfname;
id python:'__CLUSTER' + str(num_clusters);
value python: c"
/>
<input type="hidden" value=""
tal:attributes="
- name python:'__CLUSTER:' + cfname"
+ name python:'__CLUSTER:X___' + cfname"
/>
<span tal:omit-tag="" tal:content="python:c" />
</div>
@@ -525,13 +525,13 @@
<input type="checkbox" class="homebase"
tal:define="global num_systems python:num_systems + 1"
tal:attributes="
- name python:'__SYSTEM:' + sfname;
+ name python:'__SYSTEM:X___' + sfname;
id python:'__SYSTEM' + str(num_systems);
value python:s"
/>
<input type="hidden" value=""
- tal:attributes="name python:'__SYSTEM:' + sfname" />
+ tal:attributes="name python:'__SYSTEM:X___' + sfname" />
<span class="hbText" tal:omit-tag="" tal:content="python:s"/>
</div>
</tal:block>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros
@ 2007-06-05 17:59 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2007-06-05 17:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-06-05 17:59:03
Modified files:
luci/homebase : form-macros
Log message:
Fix for users not showing up on the user permissions page
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.55.2.1&r2=1.55.2.2
--- conga/luci/homebase/form-macros 2007/02/09 18:32:03 1.55.2.1
+++ conga/luci/homebase/form-macros 2007/06/05 17:59:03 1.55.2.2
@@ -199,7 +199,7 @@
<span tal:condition="python:perms" tal:content="string:Select a User" /><br/>
<select tal:omit-tag="python: not perms" class="homebase" name="userList" onChange="document.location = this.form.baseURL.value + '&user=' + this.form.userList.options[this.form.userList.selectedIndex].text">
- <tal:block tal:define="userlist python: perms.keys().sort()">
+ <tal:block tal:define="userlist python: perms">
<tal:block tal:repeat="user userlist">
<option class="homebase"
tal:content="python:user"
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2007-06-05 17:59 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-29 20:43 [Cluster-devel] conga/luci/homebase form-macros rmccabe
-- strict thread matches above, loose matches on Subject: below --
2007-06-05 17:59 rmccabe
2007-01-24 19:59 rmccabe
2006-11-01 21:29 rmccabe
2006-10-16 15:35 rmccabe
2006-10-16 15:32 rmccabe
2006-10-16 15:30 rmccabe
2006-07-25 17:47 rmccabe
2006-07-25 17:46 rmccabe
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).