* [Cluster-devel] conga/luci/homebase form-macros luci_homebase.css
@ 2006-06-22 3:49 rmccabe
0 siblings, 0 replies; 3+ messages in thread
From: rmccabe @ 2006-06-22 3:49 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-06-22 03:49:54
Modified files:
luci/homebase : form-macros luci_homebase.css
Log message:
style
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.5&r2=1.6
--- conga/luci/homebase/form-macros 2006/06/20 23:05:41 1.23
+++ conga/luci/homebase/form-macros 2006/06/22 03:49:54 1.24
@@ -1,7 +1,7 @@
<html>
<tal:comment replace="nothing">
- $Id: form-macros,v 1.23 2006/06/20 23:05:41 rmccabe Exp $
+ $Id: form-macros,v 1.24 2006/06/22 03:49:54 rmccabe Exp $
</tal:comment>
<head>
@@ -608,7 +608,9 @@
</td></tr>
<tr class="systemsTable"><td class="systemsTable" colspan="2">
- <input type="button" class="hbSubmit" value="Add Another Row" onClick="addSystem(adminform);" />
+ <div class="systemsTableEnd">
+ <input type="button" class="hbSubmit" value="Add Another Row" onClick="addSystem(adminform);" />
+ </div>
</td></tr>
</tfoot>
@@ -687,11 +689,15 @@
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" />
<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
<thead class="systemsTable">
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ <div class="systemsTableTop">
+ <strong>Cluster Name</strong>
+ <input class="hbInputSys" type="text" id="clusterName" name="clusterName" />
+ </div>
+ </td></tr>
<tr class="systemsTable">
<th class="systemsTable">System Hostname</th>
<th class="systemsTable">Password</th>
@@ -706,7 +712,9 @@
</td></tr>
<tr class="systemsTable"><td class="systemsTable" colspan="2">
- <input type="button" class="hbSubmit" value="Add Another Row" onClick="addSystem(adminform);" />
+ <div class="systemsTableEnd">
+ <input type="button" class="hbSubmit" value="Add Another Row" onClick="addSystem(adminform);" />
+ </div>
</td></tr>
</tfoot>
--- conga/luci/homebase/luci_homebase.css 2006/06/20 23:05:41 1.5
+++ conga/luci/homebase/luci_homebase.css 2006/06/22 03:49:54 1.6
@@ -1,4 +1,4 @@
-/* $Id: luci_homebase.css,v 1.5 2006/06/20 23:05:41 rmccabe Exp $ */
+/* $Id: luci_homebase.css,v 1.6 2006/06/22 03:49:54 rmccabe Exp $ */
*.errmsgs,*.retmsgs {
list-style-image: none !important;
@@ -67,11 +67,26 @@
margin-top: +1.5em;
}
+div.systemsTableTop {
+ padding-top: +1em;
+ padding-bottom: +.5em;
+}
+
+div.systemsTableEnd {
+ padding-top: +.5em;
+ padding-bottom: +1em;
+}
+
+table.systemsTable {
+ padding-left: +.5em;
+ background: #dee7ec;
+}
+
td.systemsTable {
margin: 0em;
padding: 0em 1em .33em 0em;
+ padding-left: 0.5em;
background: #dee7ec;
- padding-left: .5em;
text-align: left;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros luci_homebase.css
@ 2006-08-01 16:26 rmccabe
0 siblings, 0 replies; 3+ messages in thread
From: rmccabe @ 2006-08-01 16:26 UTC (permalink / raw)
To: cluster-devel.redhat.com
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;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Cluster-devel] conga/luci/homebase form-macros luci_homebase.css
@ 2007-08-09 20:53 rmccabe
0 siblings, 0 replies; 3+ messages in thread
From: rmccabe @ 2007-08-09 20:53 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-08-09 20:53:50
Modified files:
luci/homebase : form-macros luci_homebase.css
Log message:
Fix 249619
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.44.2.10&r2=1.44.2.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.28.2.5&r2=1.28.2.6
--- conga/luci/homebase/form-macros 2007/07/12 04:41:39 1.44.2.10
+++ conga/luci/homebase/form-macros 2007/08/09 20:53:50 1.44.2.11
@@ -493,8 +493,9 @@
Clusters
</h3>
- <tal:block tal:repeat="c python:systems[0]">
- <div class="hbcheckdiv"
+ <ul class="vanilla">
+ <li class="vanilla" tal:repeat="c python:systems[0]">
+ <tal:block
tal:define="cfname python: here.strFilter('[^0-9A-Za-z_-]', '_', c)"
tal:attributes="id python: cfname">
@@ -509,15 +510,17 @@
tal:attributes="
name python:'__CLUSTER:X___' + cfname"
/>
- <span tal:omit-tag="" tal:content="python:c" />
- </div>
- </tal:block>
+ <span tal:content="python:c" />
+ </tal:block>
+ </li>
+ </ul>
- <div tal:omit-tag="" tal:condition="python: systems[1] and len(systems[1]) > 0">
+ <tal:block 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"
+ <ul class="vanilla">
+ <li class="vanilla" tal:repeat="s python: systems[1]">
+ <tal:block
tal:define="sfname python: here.strFilter('[^0-9A-Za-z_-]', '_', s)">
<input type="checkbox" class="homebase"
tal:define="global num_systems python:num_systems + 1"
@@ -530,9 +533,10 @@
<input type="hidden" value=""
tal:attributes="name python:'__SYSTEM:X___' + sfname" />
<span class="hbText" tal:omit-tag="" tal:content="python:s"/>
- </div>
- </tal:block>
- </div>
+ </tal:block>
+ </li>
+ </ul>
+ </tal:block>
<input type="hidden" id="num_storage"
tal:attributes="value python: num_systems + 1" />
--- conga/luci/homebase/luci_homebase.css 2007/03/01 00:31:08 1.28.2.5
+++ conga/luci/homebase/luci_homebase.css 2007/08/09 20:53:50 1.28.2.6
@@ -12,12 +12,17 @@
float: left ! important;
vertical-align: middle;
background: #dee7ec;
+ margin-right: +.3333em;
}
input.pad_left {
margin-left: +.3333em;
}
+input.pad_right {
+ margin-right: +.3333em;
+}
+
td.pad_right {
padding-right: +.6666em;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-08-09 20:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-09 20:53 [Cluster-devel] conga/luci/homebase form-macros luci_homebase.css rmccabe
-- strict thread matches above, loose matches on Subject: below --
2006-08-01 16:26 rmccabe
2006-06-22 3:49 rmccabe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).