From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/homebase form-macros index_html luc ...
Date: 20 Jun 2006 23:05:43 -0000 [thread overview]
Message-ID: <20060620230543.21649.qmail@sourceware.org> (raw)
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 @@
<html>
<tal:comment replace="nothing">
- $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 $
</tal:comment>
<head>
@@ -592,22 +592,37 @@
tal:attributes="value python:data['children'][data['curIndex']]['absolute_url']" />
- <div id="systemsList" class="hbSSysList">
- <div class="hbSSysList">
- System Hostname
- <input class="hbInputSys" type="text" id="__SYSTEM0:Addr" name="__SYSTEM0:Addr" />
- Password
- <input type="password" id="__SYSTEM0:Passwd" name="__SYSTEM0:Passwd" class="hbInputPass" onChange="pwd0Change(adminform);" />
- </div>
- </div>
-
- <div class="hbSubmit">
- <input type="button" class="hbSubmit" value="Add Another Row" onClick="addSystem(adminform);" />
- </div>
+ <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+ <thead class="systemsTable">
+ <tr class="systemsTable">
+ <th class="systemsTable">System Hostname</th>
+ <th class="systemsTable">Password</th>
+ </tr>
+ </thead>
+
+ <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.
+ </div>
+ </td></tr>
- <div id="samePwd" class="hbSubmit">
- <span id="samePwdSpan" class="hbText" />
- </div>
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ <input type="button" class="hbSubmit" value="Add Another Row" onClick="addSystem(adminform);" />
+ </td></tr>
+ </tfoot>
+
+ <tbody class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">
+ <input class="hbInputSys" type="text" id="__SYSTEM0:Addr" name="__SYSTEM0:Addr" />
+ </td>
+ <td class="systemsTable">
+ <input type="password" id="__SYSTEM0:Passwd" name="__SYSTEM0:Passwd" class="hbInputPass" onChange="pwd0Change(adminform);" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
<div class="hbSubmit" id="hbSubmit">
<input type="button" class="hbSubmit" name="Submit" value="Submit" onClick="validateForm(document.adminform);" />
@@ -660,53 +675,70 @@
</script>
<form name="adminform" action="" method="post">
- <div id="systemsList" class="hbCSystems">
- <span tal:omit-tag=""
- tal:define="global clusters python:here.getClusters()" />
-
- <input name="pagetype" type="hidden"
- tal:attributes="value request/pagetype | request/form/pagetype | nothing" />
+ <span tal:omit-tag=""
+ tal:define="global clusters python:here.getClusters()" />
- <input name="numStorage" id="numStorage" type="hidden" value="3" />
+ <input name="pagetype" type="hidden"
+ tal:attributes="value request/pagetype | request/form/pagetype | nothing" />
- <input name="absoluteURL" type="hidden"
- tal:attributes="value python:data['children'][data['curIndex']]['absolute_url']" />
+ <input name="numStorage" id="numStorage" type="hidden" value="3" />
- <h2 class="homebase">Add Cluster</h2>
+ <input name="absoluteURL" type="hidden"
+ tal:attributes="value python:data['children'][data['curIndex']]['absolute_url']" />
+ <h2 class="homebase">Add Cluster</h2>
<span class="hbText">Cluster Name</span>
<input class="hbInputSys" type="text" id="clusterName" name="clusterName" />
- <div class="hbSSysList">
- System Hostname
- <input class="hbInputSys" type="text" id="__SYSTEM0:Addr" name="__SYSTEM0:Addr" />
- Password
- <input type="password" id="__SYSTEM0:Passwd" name="__SYSTEM0:Passwd" class="hbInputPass" onChange="pwd0Change(adminform);" />
- </div>
-
- <div class="hbSSysList">
- System Hostname
- <input class="hbInputSys" type="text" id="__SYSTEM1:Addr" name="__SYSTEM1:Addr" />
- Password
- <input type="password" id="__SYSTEM1:Passwd" name="__SYSTEM1:Passwd" class="hbInputPass" />
- </div>
-
- <div class="hbSSysList">
- System Hostname
- <input class="hbInputSys" type="text" id="__SYSTEM2:Addr" name="__SYSTEM2:Addr" />
- Password
- <input type="password" id="__SYSTEM2:Passwd" name="__SYSTEM2:Passwd" class="hbInputPass" />
- </div>
- </div>
-
- <div class="hbSubmit">
- <input type="button" class="hbSubmit" value="Add Another Row" onClick="addSystem(adminform);" />
- </div>
+ <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+ <thead class="systemsTable">
+ <tr class="systemsTable">
+ <th class="systemsTable">System Hostname</th>
+ <th class="systemsTable">Password</th>
+ </tr>
+ </thead>
+
+ <tfoot class="systemsTable">
+ <tr class="systemsTable"><td colspan="2" class="systemsTable">
+ <div>
+ <input type="checkbox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if storage system passwords are identical.
+ </div>
+ </td></tr>
- <div class="hbSubmit">
- All Storage System Passwords Are the Same
- <input class="hbSubmit" type="checkbox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);" />
- </div>
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ <input type="button" class="hbSubmit" value="Add Another Row" onClick="addSystem(adminform);" />
+ </td></tr>
+ </tfoot>
+
+ <tbody class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">
+ <input class="hbInputSys" type="text" id="__SYSTEM0:Addr" name="__SYSTEM0:Addr" />
+ </td>
+ <td class="systemsTable">
+ <input type="password" id="__SYSTEM0:Passwd" name="__SYSTEM0:Passwd" class="hbInputPass" onChange="pwd0Change(adminform);" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">
+ <input class="hbInputSys" type="text" id="__SYSTEM1:Addr" name="__SYSTEM1:Addr" />
+ </td>
+ <td class="systemsTable">
+ <input type="password" id="__SYSTEM1:Passwd" name="__SYSTEM1:Passwd" class="hbInputPass" onChange="pwd0Change(adminform);" />
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">
+ <input class="hbInputSys" type="text" id="__SYSTEM2:Addr" name="__SYSTEM2:Addr" />
+ </td>
+ <td class="systemsTable">
+ <input type="password" id="__SYSTEM2:Passwd" name="__SYSTEM2:Passwd" class="hbInputPass" onChange="pwd0Change(adminform);" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
<div class="hbSubmit" id="hbSubmit">
<input type="button" class="hbSubmit" name="Submit" value="Submit" onClick="validateForm(document.adminform);" />
--- 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">
<tal:comment replace="nothing">
- $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 $
</tal:comment>
<head metal:use-macro="here/header/macros/html_header">
@@ -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;
reply other threads:[~2006-06-20 23:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20060620230543.21649.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.