From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/homebase form-macros luci_homebase.css
Date: 1 Aug 2006 16:26:46 -0000 [thread overview]
Message-ID: <20060801162646.21601.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-08-01 16:26:43
Modified files:
luci/homebase : form-macros luci_homebase.css
Log message:
interface and wording tweaks
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.32&r2=1.33
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.8&r2=1.9
--- conga/luci/homebase/form-macros 2006/07/31 17:46:32 1.32
+++ conga/luci/homebase/form-macros 2006/08/01 16:26:42 1.33
@@ -1,7 +1,7 @@
<html>
<tal:comment replace="nothing">
- $Id: form-macros,v 1.32 2006/07/31 17:46:32 rmccabe Exp $
+ $Id: form-macros,v 1.33 2006/08/01 16:26:42 rmccabe Exp $
</tal:comment>
<head>
@@ -55,7 +55,6 @@
Delete a User
</h2>
-
<select tal:condition="python:userList" name="deluserId" class="homebase">
<option class="homebase" value="" selected="1">Select a User</option>
<tal:block tal:repeat="user python:userList">
@@ -73,7 +72,7 @@
tal:attributes="value python:data['children'][data['curIndex']]['absolute_url']" />
<div class="hbSubmit" tal:condition="python:userList" id="hbSubmit">
- <input class="hbSubmit" name="Submit" type="button" value="Submit" onClick="validateForm(document.adminform);" />
+ <input class="hbSubmit" name="Submit" type="button" value="Delete This User" onClick="validateForm(document.adminform);" />
</div>
</form>
@@ -213,32 +212,16 @@
checked python:perms[curUser]['cluster'][c] and 'checked' or None;
name python:'__CLUSTER:' + cfname;
id python:'__CLUSTER' + str(num_clusters);
- onChange python: 'checkChildren(\'' + cfname + '\', this)';
value python: c"
/>
<span tal:omit-tag="" tal:content="python:c" />
-
- <tal:block tal:repeat="cs python:systems[0][c]">
- <div class="hbcheckdiv">
- <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;
- name python:'__SYSTEM:' + here.strFilter('[^0-9A-Za-z_-]', '_', cs);
- id python:'__SYSTEM' + str(num_systems);
- value python:cs"
- />
- <span tal:omit-tag="" tal:content="python: cs" />
- </div>
- </tal:block>
</div>
</tal:block>
<div tal:omit-tag="" tal:condition="python: systems[1] and len(systems[1]) > 0">
<h3 class="homebase">Storage Systems</h3>
- <tal:block tal:repeat="s python: systems[1]">
- <div class="hbcheckdiv">
+ <div class="hbcheckdiv" tal:repeat="s python: systems[1]">
<input type="checkbox" class="homebase"
tal:define="global num_systems python:num_systems + 1"
tal:attributes="
@@ -248,8 +231,7 @@
value python:s"
/>
<span class="hbText" tal:omit-tag="" tal:content="python:s"/>
- </div>
- </tal:block>
+ </div>
</div>
<input type="hidden" id="numStorage"
@@ -259,7 +241,7 @@
tal:attributes="value python: num_clusters + 1" />
<div class="hbSubmit" id="hbSubmit">
- <input type="button" class="hbSubmit" name="Submit" value="Submit" onClick="validateForm(document.adminform);" />
+ <input type="button" class="hbSubmit" name="Update Permissions" value="Update Permissions" onClick="validateForm(document.adminform);" />
</div>
</form>
@@ -305,12 +287,16 @@
<span tal:omit-tag="" tal:define="global blankForm python:0" />
<h2 class="homebase" tal:condition="python:systems">
- Remove Systems and Clusters
+ Manage Systems and Clusters
</h2>
<input type="hidden" name="pagetype"
tal:attributes="value request/form/pagetype | request/pagetype | nothing" />
+ <p class="luciInst">
+ Check storage systems and clusters to remove from the Luci management interface.
+ </p>
+
<h3 class="homebase" tal:condition="python: systems[0] and len(systems[0]) > 0">
Clusters
</h3>
@@ -363,7 +349,7 @@
tal:attributes="value python: num_clusters + 1" />
<div class="hbSubmit" id="hbSubmit">
- <input type="button" class="hbSubmit" name="Submit" value="Submit" onClick="validateForm(document.adminform);" />
+ <input type="button" class="hbSubmit" name="Submit" value="Remove Selected Systems" onClick="validateForm(document.adminform);" />
</div>
</form>
@@ -398,7 +384,7 @@
</script>
<form name="adminform" method="post" action="">
- <h2 class="homebase">Add a Storage System</h2>
+ <h2 class="homebase">Add a System</h2>
<input name="pagetype" type="hidden"
tal:attributes="value request/form/pagetype | request/pagetype | nothing" />
@@ -412,7 +398,7 @@
<thead class="systemsTable">
<tr class="systemsTable">
<th class="systemsTable">System Hostname</th>
- <th class="systemsTable">Password</th>
+ <th class="systemsTable">Root Password</th>
</tr>
</thead>
@@ -425,7 +411,7 @@
<tr class="systemsTable"><td class="systemsTable" colspan="2">
<div class="systemsTableEnd">
- <input type="button" class="hbSubmit" value="Add Another Row" onClick="addSystem(adminform);" />
+ <input type="button" class="hbSubmit" value="Add another entry" onClick="addSystem(adminform);" />
</div>
</td></tr>
</tfoot>
@@ -548,7 +534,7 @@
tal:attributes="value python: sysNum" />
<div class="hbSubmit" id="hbSubmit">
- <input type="button" class="hbSubmit" name="Submit" value="Submit" onClick="validateForm(document.adminform);" />
+ <input type="button" class="hbSubmit" name="Submit" value="Add This Cluster" onClick="validateForm(document.adminform);" />
</div>
</form>
</div>
@@ -579,7 +565,7 @@
<input name="absoluteURL" type="hidden"
tal:attributes="value python:data['children'][data['curIndex']]['absolute_url']" />
- <h2 class="homebase">Manage an Existing Cluster</h2>
+ <h2 class="homebase">Add an Existing Cluster</h2>
<p class="hbText">Enter one node from the cluster you wish to add to the Luci management interface.</p>
@@ -587,7 +573,7 @@
<thead class="systemsTable">
<tr class="systemsTable">
<th class="systemsTable">System Hostname</th>
- <th class="systemsTable">Password</th>
+ <th class="systemsTable">Root Password</th>
</tr>
</thead>
--- conga/luci/homebase/luci_homebase.css 2006/07/18 19:25:20 1.8
+++ conga/luci/homebase/luci_homebase.css 2006/08/01 16:26:42 1.9
@@ -1,4 +1,4 @@
-/* $Id: luci_homebase.css,v 1.8 2006/07/18 19:25:20 rmccabe Exp $ */
+/* $Id: luci_homebase.css,v 1.9 2006/08/01 16:26:42 rmccabe Exp $ */
*.errmsgs,*.retmsgs {
list-style-image: none !important;
@@ -9,6 +9,12 @@
color: red !important;
}
+p.luciInst {
+ font-family: Helvetica, sans-serif;
+ font-size: 11px;
+ color: black;
+}
+
h3.homebase {
color: #436976;
margin-top: 1em;
next reply other threads:[~2006-08-01 16:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-01 16:26 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-08-09 20:53 [Cluster-devel] conga/luci/homebase form-macros luci_homebase.css rmccabe
2006-06-22 3:49 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=20060801162646.21601.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.