From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci cluster/form-macros cluster/resourc ...
Date: 5 Sep 2006 21:25:45 -0000 [thread overview]
Message-ID: <20060905212545.7720.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-09-05 21:25:45
Modified files:
luci/cluster : form-macros resource-form-macros
luci/homebase : form-macros homebase_common.js
luci_homebase.css
Added files:
luci/cluster : arrow_down.png arrow_right.png
Log message:
more ui work
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/arrow_down.png.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/arrow_right.png.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.54&r2=1.55
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.34&r2=1.35
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/homebase_common.js.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.17&r2=1.18
/cvs/cluster/conga/luci/cluster/arrow_down.png,v --> standard output
revision 1.1
Binary files /cvs/cluster/conga/luci/cluster/arrow_down.png and - differ
/cvs/cluster/conga/luci/cluster/arrow_right.png,v --> standard output
revision 1.1
Binary files /cvs/cluster/conga/luci/cluster/arrow_right.png and - differ
--- conga/luci/cluster/form-macros 2006/08/30 23:40:13 1.54
+++ conga/luci/cluster/form-macros 2006/09/05 21:25:44 1.55
@@ -114,7 +114,7 @@
</div>
-<div metal:define-macro="clusteradd-form" style="margin-left: 1em">
+<div metal:define-macro="clusteradd-form">
<script type="text/javascript" src="/luci/homebase/homebase_common.js">
</script>
<script type="text/javascript" src="/luci/homebase/validate_cluster_add.js">
@@ -1124,10 +1124,12 @@
<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" />
@@ -1164,6 +1166,16 @@
<tal:block metal:use-macro="here/resource-form-macros/macros/scr_macro" />
</span>
+ <div
+ tal:condition="python: res['max_depth'] != 0"
+ tal:attributes="
+ class python: 'service_tree rc_indent' + str(res['indent_ctr'] - 1)">
+ <img class="service_tree" name="arrow_down"
+ src="/luci/cluster/arrow_down.png"
+ onClick="collapse_div(this)">
+ <span class="service_tree">Hide Children</span>
+ </div>
+
<tal:block
tal:replace="structure python: '</div>' * (res['indent_ctr'] - res['max_depth'])" />
</div>
--- conga/luci/cluster/resource-form-macros 2006/08/29 23:22:59 1.5
+++ conga/luci/cluster/resource-form-macros 2006/09/05 21:25:44 1.6
@@ -71,12 +71,12 @@
</script>
<h2>Add a Resource</h2>
- <strong>Select Resource Type</strong><br/>
+ <strong>Select Resource Type</strong>
+ <br/>
- <form name="filler">
+ <form>
<select name="select_div"
- onChange="swap_div('container', filler.select_div.options[filler.select_div.selectedIndex].value);">
-
+ onChange="swap_div('container', this.form.select_div.options[this.form.select_div.selectedIndex].value);">
<option name="blank" value="blank">Select a resource type</option>
<option name="IP" value="IP">IP Resource</option>
<option name="FS" value="FS">FS Resource</option>
@@ -96,16 +96,16 @@
</td></tr>
</table>
- <div id="invisible" style="display: none">
+ <div id="invisible">
<div id="blank"> </div>
- <div metal:use-macro="here/resource-form-macros/macros/ip_macro"/>
- <div metal:use-macro="here/resource-form-macros/macros/fs_macro"/>
- <div metal:use-macro="here/resource-form-macros/macros/gfs_macro"/>
- <div metal:use-macro="here/resource-form-macros/macros/nfsm_macro"/>
- <div metal:use-macro="here/resource-form-macros/macros/nfsx_macro"/>
- <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"/>
+ <div metal:use-macro="here/resource-form-macros/macros/ip_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/fs_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/gfs_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/nfsm_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/nfsx_macro" />
+ <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" />
</div>
</div>
@@ -223,7 +223,7 @@
tmp_URL context/cluster/index_html/absolute_url;
global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" />
- <strong>IP Address Resource Configuration</strong>
+ <strong class="reshdr">IP Address Resource Configuration</strong>
<form name="ip_form" id="ip_form" method="get"
tal:attributes="action processURL">
@@ -252,7 +252,8 @@
<input size="3" name="ip3" type="text" maxlength="3" tal:attributes="value ip3 | nothing"/>.
<input size="3" name="ip4" type="text" maxlength="3" tal:attributes="value ip4 | nothing"/>
</td>
-
+ </tr>
+ <tr class="systemsTable">
<td class="systemsTable">
<strong>Monitor Link</strong>
</td>
@@ -297,7 +298,7 @@
tmp_URL context/cluster/index_html/absolute_url;
global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" />
- <strong>File System Resource Configuration</strong>
+ <strong class="reshdr">File System Resource Configuration</strong>
<form name="fs_form" method="get" tal:attributes="action processURL">
@@ -444,7 +445,7 @@
tmp_URL context/cluster/index_html/absolute_url;
global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" />
- <strong>GFS Resource Configuration</strong>
+ <strong class="reshdr">GFS Resource Configuration</strong>
<form name="gfs_form" method="get" tal:attributes="action processURL">
<input name="pagetype" type="hidden" value="35" />
@@ -556,7 +557,7 @@
global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" />
<form name="nfsm_form" method="get" tal:attributes="action processURL">
- <strong>NFS Mount Resource Configuration</strong>
+ <strong class="reshdr">NFS Mount Resource Configuration</strong>
<input name="pagetype" type="hidden" value="35" />
@@ -675,7 +676,7 @@
tmp_URL context/cluster/index_html/absolute_url;
global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" />
- <strong>NFS Client Resource Configuration</strong>
+ <strong class="reshdr">NFS Client Resource Configuration</strong>
<form name="nfsc_form" method="post" tal:attributes="action processURL">
@@ -746,7 +747,7 @@
tmp_URL context/cluster/index_html/absolute_url;
global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" />
- <strong>NFS Export Resource Configuration</strong>
+ <strong class="reshdr">NFS Export Resource Configuration</strong>
<form name="nfsx_form" method="post" tal:attributes="action processURL">
<input name="pagetype" type="hidden" value="35" />
@@ -797,7 +798,7 @@
tmp_URL context/cluster/index_html/absolute_url;
global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" />
- <strong>Script Resource Configuration</strong>
+ <strong class="reshdr">Script Resource Configuration</strong>
<form name="scr_form" method="post" tal:attributes="action processURL">
<input name="pagetype" type="hidden" value="35" />
@@ -859,7 +860,7 @@
tmp_URL context/cluster/index_html/absolute_url;
global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" />
- <strong tal:condition="python: edit != 'true'">Samba Server Configuration</strong>
+ <strong class="reshdr" tal:condition="python: edit != 'true'">Samba Server Configuration</strong>
<form name="smb_form" method="post" tal:attributes="action processURL">
--- conga/luci/homebase/form-macros 2006/08/02 16:25:11 1.34
+++ conga/luci/homebase/form-macros 2006/09/05 21:25:45 1.35
@@ -1,7 +1,7 @@
<html>
<tal:comment replace="nothing">
- $Id: form-macros,v 1.34 2006/08/02 16:25:11 rmccabe Exp $
+ $Id: form-macros,v 1.35 2006/09/05 21:25:45 rmccabe Exp $
</tal:comment>
<head>
@@ -403,7 +403,7 @@
<tfoot class="systemsTable">
<tr class="systemsTable"><td colspan="2" class="systemsTable">
<div id="allSameDiv">
- <input type="checkbox" class="allSameCheckBox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if storage system passwords are identical.
+ <input type="checkbox" class="allSameCheckBox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/><span>Check if storage system passwords are identical.</span>
</div>
</td></tr>
--- conga/luci/homebase/homebase_common.js 2006/08/30 22:57:58 1.6
+++ conga/luci/homebase/homebase_common.js 2006/09/05 21:25:45 1.7
@@ -1,11 +1,33 @@
-function list_toggle_collapse(li) {
- var elem = li.parent;
- if (!elem)
- return;
- if (elem.className == 'tree expanded')
- elem.className = 'tree collapsed';
+function collapse_div(image) {
+ if (!image)
+ return (-1);
+
+ var span = image.parentNode.getElementsByTagName('span');
+ if (span && span.length > 0)
+ span = span[0];
else
- elem.className = 'tree expanded';
+ span = null;
+
+ div = image.parentNode.parentNode.parentNode.getElementsByTagName('div');
+ if (!div || div.length < 1)
+ return (-1);
+ div = div[3];
+
+ if (image.name == 'arrow_down') {
+ image.src = 'arrow_right.png';
+ image.name = 'arrow_right';
+ if (span)
+ span.innerHTML = 'Show Children';
+ div.style.visibility = 'hidden';
+ div.style.display = 'none';
+ } else {
+ image.src = 'arrow_down.png';
+ image.name = 'arrow_down';
+ if (span)
+ span.innerHTML = 'Hide Children';
+ div.style.visibility = 'inherit';
+ div.style.display = 'block';
+ }
}
function is_valid_int(str, min, max) {
@@ -64,8 +86,10 @@
function hide_element(id) {
var elem = document.getElementById(id);
- if (elem)
- elem.style['visibility'] = 'hidden';
+ if (elem) {
+ elem.style.visibility = 'hidden';
+ elem.style.display = 'none';
+ }
}
function isValidHost(str) {
@@ -173,8 +197,7 @@
if (num_systems == 2) {
var temp = document.getElementById('allSameDiv');
temp.style.visibility = 'visible';
- temp = document.getElementById('allSameCheckBox');
- temp.style.visibility = 'visible';
+ temp.style.display = 'block';
}
}
--- conga/luci/homebase/luci_homebase.css 2006/08/30 22:57:58 1.17
+++ conga/luci/homebase/luci_homebase.css 2006/09/05 21:25:45 1.18
@@ -1,3 +1,7 @@
+input[type=text], input[type=password] {
+ padding: .2em ! important;
+}
+
ul.configTab {
color: #436976 !important;
margin: 20px 0px 0px 0px !important;
@@ -8,22 +12,27 @@
}
input.qdisk {
+ padding: .2em;
font-size: 10px;
}
input.qdname {
+ padding: .2em;
width: 15em;
}
input.qdint {
+ padding: .2em;
width: 5em;
}
input.qdpath {
+ padding: .2em;
width: 20em;
}
input.qdscore {
+ padding: .2em;
width: 5em;
}
@@ -79,9 +88,6 @@
color: red !important;
}
-div.luciContent {
-}
-
p.luciInst {
color: black;
}
@@ -125,13 +131,13 @@
}
div.hbCSystems {
- margin-left:1em !important;
- padding-top:.5em !important;
+ margin-left:1em;
+ padding-top:.5em;
}
div.hbSSysList {
- margin-top: .25em !important;
- margin-bottom: .25em !important;
+ margin-top: .25em;
+ margin-bottom: .25em;
}
div.hbSubmit {
@@ -194,13 +200,13 @@
margin-left: +1.5em;
}
-#allSameDiv, input.allSameCheckBox {
+#invisible, #allSameDiv {
visibility: hidden;
+ display: none;
}
input.hbInputSys {
- padding: .20em !important;
- padding-top: .5em !important;
+ padding: .2em ! important;
width: 200px;
}
@@ -209,18 +215,18 @@
padding-left: +.5em;
}
-
-ul.tree {
- background: #dee7ec;
- padding-top: .25em;
- padding-bottom: .25em;
- padding-left: .5em;
- list-style: none;
- max-width: 600px;
- margin-left: 0;
+img.service_tree {
+ border: none;
+ margin-right: 1em;
}
+div.service_tree {
+ margin-top: 1em;
+}
+span.tree {
+ font-size: 10px;
+}
li.node_fdom {
list-style-image: url(/luci/cluster/small_fdom.png);
@@ -341,7 +347,7 @@
}
input.hbInputPass {
- padding: .20em !important;
+ padding: .2em ! important;
width: 160px;
}
@@ -361,7 +367,7 @@
}
div.rc_indent0 {
- margin-left: 0px
+ margin-left: 0px;
max-width: 700px;
}
next reply other threads:[~2006-09-05 21:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-05 21:25 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-09-11 22:22 [Cluster-devel] conga/luci cluster/form-macros cluster/resourc rmccabe
2006-09-13 17:50 rmccabe
2006-09-14 21:24 rmccabe
2006-09-23 4:04 rmccabe
2006-12-05 6:44 rmccabe
2006-12-05 23:32 rmccabe
2006-12-06 22:44 rmccabe
2007-01-20 4:50 rmccabe
2007-01-26 17:56 rmccabe
2007-02-08 5:05 rmccabe
2007-02-08 15:59 rmccabe
2007-02-08 16:00 rmccabe
2007-02-16 2:06 rmccabe
2007-02-16 2:12 rmccabe
2007-05-30 5:54 rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060905212545.7720.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.