From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci cluster/form-macros homebase/luci_h ...
Date: 15 Aug 2006 22:27:05 -0000 [thread overview]
Message-ID: <20060815222705.4634.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-08-15 22:27:05
Modified files:
luci/cluster : form-macros
luci/homebase : luci_homebase.css
Log message:
more cluster properties config stuff
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.43&r2=1.44
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.13&r2=1.14
--- conga/luci/cluster/form-macros 2006/08/14 22:46:49 1.43
+++ conga/luci/cluster/form-macros 2006/08/15 22:27:05 1.44
@@ -314,7 +314,7 @@
<a tal:attributes="
href python: request['URL'] + '?pagetype=' + request['pagetype'] + '&clustername=' + request['clustername'] + '&tab=4';
class python: 'configTab' + (configTabNum == 4 and ' configTabActive' or '');
- ">Qurorum Partition</a>
+ ">Quorum Partition</a>
</li>
</ul>
@@ -411,18 +411,32 @@
<tbody class="systemsTable">
<tr class="systemsTable">
<td class="systemsTable">
- <input type="radio" name="mcast" value="False" checked="" tal:attributes="checked python:clusterinfo['is_mcast'] == 'False'"/><strong>Let cluster choose the multicast address</strong>
+ <input type="radio" name="mcast" value="False"
+ onchecked="javascript:document.getElementById('mcast_address').disabled=true;"
+ tal:attributes="checked python:clusterinfo['is_mcast'] != 'True'"
+ />
+ Let cluster choose the multicast address
</td>
</tr>
+
<tr class="systemsTable">
<td class="systemsTable">
- <input type="radio" name="mcast" value="True"/><strong>I prefer to choose the multicast address</strong>
+ <input type="radio" name="mcast" value="True"
+ onchecked="javascript:document.getElementById('mcast_address').disabled=false;"
+ tal:attributes="checked python:clusterinfo['is_mcast'] == 'True'"
+
+ />
+ Specify the multicast address manually
</td>
</tr>
<tr class="systemsTable">
<td class="systemsTable" colspan="2">
- <input type="text" name="mcast_address" value="" tal:attributes="value clusterinfo/mcast_addr"/>
+ <input type="text" name="mcast_address" id="mcast_address"
+ tal:attributes="
+ disabled python: clusterinfo['is_mcast'] != 'True' and '1' or '0';
+ value clusterinfo/mcast_addr"
+ />
</td>
</tr>
</tbody>
@@ -440,6 +454,7 @@
<div id="configTabContent" tal:condition="python: configTabNum == 4">
<form name="quorum_partition" action="" method="get" tal:attributes="action clusterinfo/quorumd_url">
+ <div class="configTabContent">
<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
<thead class="systemsTable">
<tr class="systemsTable"><td class="systemsTable" colspan="1">
@@ -451,48 +466,82 @@
<tbody class="systemsTable">
<tr class="systemsTable"><td class="systemsTable">
- <input type="radio" name="quorumd" value="False" checked="" tal:attributes="checked python:clusterinfo['is_quorumd'] == 'False'"/>
- <strong>Do not use a Quorum Partition</strong>
+ <input type="radio" name="quorumd" value="False" checked="" tal:attributes="checked python:clusterinfo['is_quorumd'] != 'True'"/>
+ Do not use a Quorum Partition
</td></tr>
<tr class="systemsTable"><td class="systemsTable">
<input type="radio" name="quorumd" value="True"/>
- <strong>I prefer to use a Quorum Partition</strong>
- </td></tr>
-
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- Interval: <input type="text" name="interval" value="" tal:attributes="value clusterinfo/interval"/>
- </td></tr>
-
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- Votes: <input type="text" name="votes" value="" tal:attributes="value clusterinfo/votes"/>
- </td></tr>
-
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- TKO: <input type="text" name="tko" value="" tal:attributes="value clusterinfo/tko"/>
- </td></tr>
-
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- Minimum Score: <input type="text" name="min_score" value="" tal:attributes="value clusterinfo/min_score"/>
+ Use a Quorum Partition
</td></tr>
+ </tbody>
+ </table>
+ </div>
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- Device: <input type="text" name="device" value="" tal:attributes="value clusterinfo/device"/>
- </td></tr>
+ <div class="spacing configTabContent"></div>
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- Label: <input type="text" name="label" value="" tal:attributes="value clusterinfo/label"/>
- </td></tr>
- </tbody>
+ <div id="quorumdisk" class="configTabContent">
+ <div class="configTabContent">
+ <table name="qdiskprefs" class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Interval</td>
+ <td class="systemsTable">
+ <input type="text" name="interval" value=""
+ tal:attributes="value clusterinfo/interval"/>
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Votes</td>
+ <td class="systemsTable">
+ <input type="text" name="votes" value=""
+ tal:attributes="value clusterinfo/votes"/>
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">TKO</td>
+ <td class="systemsTable">
+ <input type="text" name="tko" value=""
+ tal:attributes="value clusterinfo/tko"/>
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Minimum Score</td>
+ <td class="systemsTable">
+ <input type="text" name="min_score" value=""
+ tal:attributes="value clusterinfo/min_score"/>
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Device</td>
+ <td class="systemsTable">
+ <input type="text" name="device" value=""
+ tal:attributes="value clusterinfo/device"/>
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Label</td>
+ <td class="systemsTable">
+ <input type="text" name="label" value=""
+ tal:attributes="value clusterinfo/label"/>
+ </td>
+ </tr>
</table>
+ </div>
- <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+ <div class="configTabContent">
+ <table name="qdiskheur" class="systemsTable">
<thead class="systemsTable">
<tr class="systemsTable"><td class="systemsTable" colspan="1">
<div class="systemsTableTop">
<strong>Heuristics</strong>
</div>
</td></tr>
+
<tr class="systemsTable">
<th class="systemsTable">
<div class="systemsTableTop">Name</div>
@@ -511,31 +560,76 @@
<tbody class="systemsTable"
tal:define="global heuristics clusterinfo/hlist">
-
- <tr class="systemsTable" tal:repeat="heuristic heuristics">
+
+ <tal:block tal:condition="python: not len(heuristics)">
+ <input type="hidden" name="num_heuristics" id="num_heuristics" value="0">
+ <tr class="systemsTable">
<td class="systemsTable">
- <input type="text" name="hname" value="" tal:attributes="value heuristic/hname"/>
+ <input class="qdname qdisk" type="text" name="heuristic0:hname" value="">
</td>
<td class="systemsTable">
- <input type="text" name="hinterval" value="" tal:attributes="value heuristic/hinterval"/>
+ <input class="qdpath qdisk" type="text" name="heuristic0:hprog" value="">
</td>
- <td class="systemsTable" colspan="2">
- <input type="text" name="hprog" value="" tal:attributes="value heuristic/hprog"/>
+ <td class="systemsTable">
+ <input class="qdint qdisk" type="text" name="heuristic0:hinterval" value="">
</td>
<td class="systemsTable">
- <input type="text" name="hscore" value="" tal:attributes="value heuristic/hscore"/>
+ <input class="qdscore qdisk" type="text" name="heuristic0:hscore" value="">
</td>
</tr>
- </tbody>
+ </tal:block>
- <tfoot class="systemsTable">
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- <div class="systemsTableEnd">
- <input type="submit" value="Apply"/>
- </div>
+ <tal:block
+ tal:condition="python: len(heuristics)"
+ tal:define="global curHeur python: -1">
+
+ <input type="hidden" name="num_heuristics" id="num_heuristics"
+ tal:attributes="value python: len(heuristics)" />
+
+ <tr class="systemsTable"
+ tal:repeat="heuristic heuristics"
+ tal:define="global curHeur python: curHeur + 1">
+
+ <td class="systemsTable">
+ <input class="qdname qdisk" type="text"
+ tal:attributes="
+ value heuristic/hname;
+ name python: 'heuristic' + str(curHeur) + ':hname';"/>
+ </td>
+ <td class="systemsTable">
+ <input class="qdpath qdisk" type="text"
+ tal:attributes="
+ value heuristic/hprog;
+ name python: 'heuristic' + str(curHeur) + ':hprog';"/>
+ </td>
+ <td class="systemsTable">
+ <input class="qdint qdisk" type="text"
+ tal:attributes="
+ value heuristic/hinterval;
+ name python: 'heuristic' + str(curHeur) + ':hinterval';"/>
+ </td>
+ <td class="systemsTable">
+ <input class="qdscore qdisk" type="text"
+ tal:attributes="
+ value heuristic/hscore;
+ name python: 'heuristic' + str(curHeur) + ':hscore';"/>
+ </td>
+ </tr>
+ </tal:block>
+ </tbody>
+ <tfoot>
+ <tr class="systemsTable"><td class="systemsTable">
+ <input class="addrow" type="button" value="Add another heuristic">
</td></tr>
</tfoot>
</table>
+ </div>
+ </div>
+
+ <div class="spacing configTabContent"></div>
+ <div class="hbSubmit spacing configTabContent">
+ <input class="hbSubmit" type="submit" value="Apply">
+ </div>
</form>
</div>
</div>
--- conga/luci/homebase/luci_homebase.css 2006/08/15 18:54:11 1.13
+++ conga/luci/homebase/luci_homebase.css 2006/08/15 22:27:05 1.14
@@ -1,16 +1,40 @@
ul.configTab {
- color: #436976 !important;
- margin: 20px 0px 0px 0px !important;
- padding: 0px !important;
- padding-left: 15px !important;
+ color: #436976 !important;
+ margin: 20px 0px 0px 0px !important;
+ padding: 0px !important;
+ padding-left: 15px !important;
border-bottom: none !important;
- z-index: 1 !important;
+ z-index: 1 !important;
+}
+
+input.qdisk {
+ font-size: 10px;
+}
+
+input.qdname {
+ width: 15em;
+}
+
+input.qdint {
+ width: 5em;
+}
+
+input.qdpath {
+ width: 20em;
+}
+
+input.qdscore {
+ width: 5em;
+}
+
+div.spacing {
+ margin-top: 16px;
}
li.configTab {
- display: inline !important;
- overflow: hidden !important;
- list-style-type: none !important;
+ display: inline !important;
+ overflow: hidden !important;
+ list-style-type: none !important;
padding-left: 6px !important;
padding-bottom: 0px !important;
margin-bottom: 0px !important;
@@ -20,21 +44,20 @@
#configTabContent {
background: #dee7ec !important;
margin-top: 0px !important;
- padding: 20px !important;
- border: 1px solid #8cacbb !important;
+ padding: 20px !important;
+ border: 1px solid #8cacbb !important;
z-index: 2 !important;
- max-width: 75%;
+ max-width: 600px;
}
a.configTab, a.configTabActive {
- color: #436976 !important;
- background: #ffffff !important;
- font: bold 1em !important;
- border: 1px solid #8cacbb !important;
+ color: #436976 !important;
+ background: #ffffff !important;
+ border: 1px solid #8cacbb !important;
border-bottom: 1px solid transparent !important;
- padding: 2px 6px 0px 6px !important;
- margin: 0 !important;
- text-decoration: none !important;
+ padding: 2px 6px 0px 6px !important;
+ margin: 0 !important;
+ text-decoration: none !important;
}
a.configTabActive {
@@ -44,7 +67,7 @@
a.configTab:hover {
color: #436976 !important;
- background: #dee7ec !important;
+ background: #dee7ec !important;
}
*.errmsgs,*.retmsgs {
next reply other threads:[~2006-08-15 22:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-15 22:27 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-02-07 17:18 [Cluster-devel] conga/luci cluster/form-macros homebase/luci_h rmccabe
2007-02-02 1:12 rmccabe
2007-01-30 22:26 rmccabe
2006-10-16 19:13 rmccabe
2006-10-11 16:40 rmccabe
2006-09-26 20:57 rmccabe
2006-08-14 22:46 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=20060815222705.4634.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.