From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 5 Sep 2006 21:25:45 -0000 Subject: [Cluster-devel] conga/luci cluster/form-macros cluster/resourc ... Message-ID: <20060905212545.7720.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 @@ -
+

Add a Resource

- Select Resource Type
+ Select Resource Type +
-
+ . - + + Monitor Link @@ -297,7 +298,7 @@ tmp_URL context/cluster/index_html/absolute_url; global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" /> - File System Resource Configuration + File System Resource Configuration @@ -444,7 +445,7 @@ tmp_URL context/cluster/index_html/absolute_url; global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" /> - GFS Resource Configuration + GFS Resource Configuration @@ -556,7 +557,7 @@ global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" /> - NFS Mount Resource Configuration + NFS Mount Resource Configuration @@ -675,7 +676,7 @@ tmp_URL context/cluster/index_html/absolute_url; global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" /> - NFS Client Resource Configuration + NFS Client Resource Configuration @@ -746,7 +747,7 @@ tmp_URL context/cluster/index_html/absolute_url; global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" /> - NFS Export Resource Configuration + NFS Export Resource Configuration @@ -797,7 +798,7 @@ tmp_URL context/cluster/index_html/absolute_url; global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" /> - Script Resource Configuration + Script Resource Configuration @@ -859,7 +860,7 @@ tmp_URL context/cluster/index_html/absolute_url; global processURL python: tmp_URL+'?pagetype=35&clustername='+cluname" /> - Samba Server Configuration + Samba Server Configuration --- 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 @@ - $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 $ @@ -403,7 +403,7 @@
- Check if storage system passwords are identical. + Check if storage system passwords are identical.
--- 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; }