From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 20 Jun 2006 23:05:43 -0000 Subject: [Cluster-devel] conga/luci/homebase form-macros index_html luc ... Message-ID: <20060620230543.21649.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-06-20 23:05:41 Modified files: luci/homebase : form-macros index_html luci_homebase.css Log message: Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.22&r2=1.23 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/index_html.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.4&r2=1.5 --- conga/luci/homebase/form-macros 2006/06/20 21:21:47 1.22 +++ conga/luci/homebase/form-macros 2006/06/20 23:05:41 1.23 @@ -1,7 +1,7 @@ - $Id: form-macros,v 1.22 2006/06/20 21:21:47 rmccabe Exp $ + $Id: form-macros,v 1.23 2006/06/20 23:05:41 rmccabe Exp $ @@ -592,22 +592,37 @@ tal:attributes="value python:data['children'][data['curIndex']]['absolute_url']" /> -
-
- System Hostname - - Password - -
-
- -
- -
+ + + + + + + + + + -
- -
+ + + + + + + + + +
System HostnamePassword
+
+ Check if storage system passwords are identical. +
+
+ +
+ + + +
@@ -660,53 +675,70 @@
-
- - - + - + - + -

Add Cluster

+ +

Add Cluster

Cluster Name -
- System Hostname - - Password - -
- -
- System Hostname - - Password - -
- -
- System Hostname - - Password - -
-
- -
- -
+ + + + + + + + + + -
- All Storage System Passwords Are the Same - -
+ + + + + + + + + + + + + + + + + + + +
System HostnamePassword
+
+ Check if storage system passwords are identical. +
+
+ +
+ + + +
+ + + +
+ + + +
--- conga/luci/homebase/index_html 2006/06/20 21:21:47 1.7 +++ conga/luci/homebase/index_html 2006/06/20 23:05:41 1.8 @@ -15,7 +15,7 @@ xml:lang language"> - $Id: index_html,v 1.7 2006/06/20 21:21:47 rmccabe Exp $ + $Id: index_html,v 1.8 2006/06/20 23:05:41 rmccabe Exp $ @@ -166,8 +166,8 @@ } function addSystem(form) { - var sldiv = document.getElementById('systemsList'); - if (!sldiv) + var sltab = document.getElementById('systemsTable'); + if (!sltab) return; var num_systems = form.numStorage.value; @@ -191,30 +191,24 @@ newsysp.setAttribute('disabled', true); } - var newdiv = document.createElement('div'); + var newrow = document.createElement('tr'); + var hcol = document.createElement('td') + hcol.setAttribute('style', 'margin: 0em;padding: 0em 1em .33em 0em;background: #dee7ec;padding-left: .5em;text-align: left;'); + var pcol = document.createElement('td') + pcol.setAttribute('style', 'margin: 0em;padding: 0em 1em .33em 0em;background: #dee7ec;padding-left: .5em;text-align: left;'); + + hcol.appendChild(newsys) + pcol.appendChild(newsysp) + newrow.appendChild(hcol) + newrow.appendChild(pcol) + sltab.appendChild(newrow) - newdiv.setAttribute('style', 'margin-top: .25em;margin-bottom:.25em'); - newdiv.innerHTML = 'System Hostname '; - newdiv.appendChild(newsys); - newdiv.innerHTML += ' Password '; - newdiv.appendChild(newsysp); - - sldiv.appendChild(newdiv); form.numStorage.value = ++num_systems; - if (num_systems == 2) { - var button = document.createElement('input'); - if (!button) - return (-1); - button.setAttribute('type', 'checkbox'); - button.setAttribute('class', 'homebase'); - button.setAttribute('name', 'allSameCheckBox'); - button.setAttribute('id', 'allSameCheckBox'); - button.setAttribute('onChange', 'allPasswdsSame(document.adminform);'); - - var temps = document.getElementById('samePwdSpan'); - temps.innerHTML = 'All Storage System passwords are the same'; - temps.appendChild(button); + var temp = document.getElementById('allSameDiv'); + temp.style.visibility = 'visible'; + temp = document.getElementById('allSameCheckBox'); + temp.style.visibility = 'visible'; } } --- conga/luci/homebase/luci_homebase.css 2006/06/20 21:21:47 1.4 +++ conga/luci/homebase/luci_homebase.css 2006/06/20 23:05:41 1.5 @@ -1,4 +1,4 @@ -/* $Id: luci_homebase.css,v 1.4 2006/06/20 21:21:47 rmccabe Exp $ */ +/* $Id: luci_homebase.css,v 1.5 2006/06/20 23:05:41 rmccabe Exp $ */ *.errmsgs,*.retmsgs { list-style-image: none !important; @@ -19,7 +19,6 @@ h2.homebase { margin-bottom: +1em; - inherit; } *.retmsgs { @@ -65,8 +64,28 @@ } #hbSubmit { - margin-top: +1em; - margin-left: 40%; + margin-top: +1.5em; +} + +td.systemsTable { + margin: 0em; + padding: 0em 1em .33em 0em; + background: #dee7ec; + padding-left: .5em; + text-align: left; +} + +th.systemsTable { + text-align: left; + margin-bottom: .75em; + line-height: 115%; + background: #dee7ec; + padding: .5em; +} + +tfoot.systemsTable { + margin-top: .75em; + padding: .5em; } td.hbAddUser { @@ -83,6 +102,10 @@ margin-left: +1.5em; } +#allSameDiv, input.allSameCheckBox { + visibility: hidden; +} + input.hbInputSys { padding: .20em !important; width: 200px;