From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci cluster/form-macros homebase/luci_h ...
Date: 14 Aug 2006 22:46:50 -0000 [thread overview]
Message-ID: <20060814224650.415.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-08-14 22:46:49
Modified files:
luci/cluster : form-macros
luci/homebase : luci_homebase.css
Log message:
tabs for cluster configure.. still need to work on the style of each configuration option
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.42&r2=1.43
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.11&r2=1.12
--- conga/luci/cluster/form-macros 2006/08/14 14:53:07 1.42
+++ conga/luci/cluster/form-macros 2006/08/14 22:46:49 1.43
@@ -286,229 +286,258 @@
<span tal:define="global ricci_agent python:here.getRicciAgentForCluster(request)"/>
</tal:comment>
- <form name="basecluster" action="" method="get"
- tal:attributes="action clusterinfo/basecluster_url"
- tal:define="global clusterinfo python:here.getClusterInfo(modelb, request)">
-
- <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
- <thead class="systemsTable">
- <tr class="systemsTable"><td class="systemsTable" colspan="1">
- <div class="systemsTableTop">
- <strong>General Properties</strong>
- </div>
- </td></tr>
- </thead>
-
- <tbody class="systemsTable">
- <tr class="systemsTable">
- <td class="systemsTable">Cluster Name</td>
- <td class="systemsTable">
- <input type="text" name="cluname" value="" tal:attributes="value clusterinfo/clustername"/>
- </td>
- </tr>
- <tr class="systemsTable">
- <td class="systemsTable">Configuration Version</td>
- <td class="systemsTable">
- <input type="text" name="cfgver" size="5" value="" tal:attributes="value clusterinfo/config_version"/>
- </td>
- </tr>
- </tbody>
-
- <tfoot class="systemsTable">
- <tr class="systemsTable">
- <td class="systemsTable" colspan="2">
- <div class="systemsTableEnd">
- <input type="submit" value="Apply"/>
+ <tal:block
+ tal:define="global clusterinfo python:here.getClusterInfo(modelb, request)" />
+
+ <span tal:omit-tag="" tal:define="global configTabNum python: 'tab' in request and int(request['tab']) or 1" />
+
+ <ul class="configTab">
+ <li class="configTab">
+ <a tal:attributes="
+ href python: request['URL'] + '?pagetype=' + request['pagetype'] + '&clustername=' + request['clustername'] + '&tab=1';
+ class python: 'configTab' + (configTabNum == 1 and ' configTabActive' or '');
+ ">General</a>
+ </li>
+ <li class="configTab">
+ <a tal:attributes="
+ href python: request['URL'] + '?pagetype=' + request['pagetype'] + '&clustername=' + request['clustername'] + '&tab=2';
+ class python: 'configTab' + (configTabNum == 2 and ' configTabActive' or '');
+ ">Fence</a>
+ </li>
+ <li class="configTab">
+ <a tal:attributes="
+ href python: request['URL'] + '?pagetype=' + request['pagetype'] + '&clustername=' + request['clustername'] + '&tab=3';
+ class python: 'configTab' + (configTabNum == 3 and ' configTabActive' or '');
+ ">Multicast</a>
+ </li>
+ <li class="configTab">
+ <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>
+ </li>
+ </ul>
+
+ <div id="configTabContent" tal:condition="python: configTabNum == 1">
+ <form name="basecluster" action="" method="get"
+ tal:attributes="action clusterinfo/basecluster_url">
+ <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+ <thead class="systemsTable">
+ <tr class="systemsTable"><td class="systemsTable" colspan="1">
+ <div class="systemsTableTop">
+ <strong>General Properties</strong>
</div>
- </td>
- </tr>
- </tfoot>
- </table>
+ </td></tr>
+ </thead>
- </form>
- <hr/>
+ <tbody class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Cluster Name</td>
+ <td class="systemsTable">
+ <input type="text" name="cluname" value="" tal:attributes="value clusterinfo/clustername"/>
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">Configuration Version</td>
+ <td class="systemsTable">
+ <input type="text" name="cfgver" size="5" value="" tal:attributes="value clusterinfo/config_version"/>
+ </td>
+ </tr>
+ </tbody>
+
+ <tfoot class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable" colspan="2">
+ <div class="systemsTableEnd">
+ <input type="submit" value="Apply"/>
+ </div>
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </form>
+ </div>
- <form name="fencedaemon" action="" method="get" tal:attributes="action clusterinfo/fencedaemon_url">
- <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
- <thead class="systemsTable">
- <tr class="systemsTable"><td class="systemsTable" colspan="1">
- <div class="systemsTableTop">
- <strong>Fence Daemon Properties</strong>
- </div>
- </td></tr>
- </thead>
-
- <tbody class="systemsTable">
- <tr class="systemsTable">
- <td class="systemsTable">Post Fail Delay</td>
- <td class="systemsTable">
- <input type="text" name="post_fail_delay" value="" tal:attributes="value clusterinfo/pfd"/>
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Post Join Delay</td>
- <td class="systemsTable">
- <input type="text" name="post_join_delay" value="" tal:attributes="value clusterinfo/pjd"/>
- </td>
- </tr>
- </tbody>
-
- <tfoot class="systemsTable">
- <tr class="systemsTable">
- <td class="systemsTable" colspan="2">
+ <div id="configTabContent" tal:condition="python: configTabNum == 2">
+ <form name="fencedaemon" action="" method="get" tal:attributes="action clusterinfo/fencedaemon_url">
+ <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+ <thead class="systemsTable">
+ <tr class="systemsTable"><td class="systemsTable" colspan="1">
+ <div class="systemsTableTop">
+ <strong>Fence Daemon Properties</strong>
+ </div>
+ </td></tr>
+ </thead>
+
+ <tbody class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Post Fail Delay</td>
+ <td class="systemsTable">
+ <input type="text" name="post_fail_delay" value="" tal:attributes="value clusterinfo/pfd"/>
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">Post Join Delay</td>
+ <td class="systemsTable">
+ <input type="text" name="post_join_delay" value="" tal:attributes="value clusterinfo/pjd"/>
+ </td>
+ </tr>
+ </tbody>
+
+ <tfoot class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable" colspan="2">
+ <div class="systemsTableEnd">
+ <input type="submit" value="Apply"/>
+ </div>
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </form>
+ </div>
+
+ <div id="configTabContent" tal:condition="python: configTabNum == 3">
+ <form name="multicast" action="" method="get" tal:attributes="action clusterinfo/multicast_url">
+ <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+ <thead class="systemsTable">
+ <tr class="systemsTable"><td class="systemsTable" colspan="1">
+ <div class="systemsTableTop">
+ <strong>Multicast Configuration</strong>
+ </div>
+ </td></tr>
+ </thead>
+
+ <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>
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">
+ <input type="radio" name="mcast" value="True"/><strong>I prefer to choose the multicast address</strong>
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable" colspan="2">
+ <input type="text" name="mcast_address" value="" tal:attributes="value clusterinfo/mcast_addr"/>
+ </td>
+ </tr>
+ </tbody>
+
+ <tfoot class="systemsTable">
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
<div class="systemsTableEnd">
<input type="submit" value="Apply"/>
</div>
- </td>
- </tr>
- </tfoot>
- </table>
+ </td></tr>
+ </tfoot>
+ </table>
+ </form>
+ </div>
- </form>
- <hr/>
+ <div id="configTabContent" tal:condition="python: configTabNum == 4">
+ <form name="quorum_partition" action="" method="get" tal:attributes="action clusterinfo/quorumd_url">
+ <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+ <thead class="systemsTable">
+ <tr class="systemsTable"><td class="systemsTable" colspan="1">
+ <div class="systemsTableTop">
+ <strong>Quorum Partition Configuration</strong>
+ </div>
+ </td></tr>
+ </thead>
- <form name="multicast" action="" method="get" tal:attributes="action clusterinfo/multicast_url">
+ <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>
+ </td></tr>
- <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
- <thead class="systemsTable">
- <tr class="systemsTable"><td class="systemsTable" colspan="1">
- <div class="systemsTableTop">
- <strong>Multicast Configuration</strong>
- </div>
- </td></tr>
- </thead>
-
- <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>
- </td>
- </tr>
- <tr class="systemsTable">
- <td class="systemsTable">
- <input type="radio" name="mcast" value="True"/><strong>I prefer to choose the multicast address</strong>
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable" colspan="2">
- <input type="text" name="mcast_address" value="" tal:attributes="value clusterinfo/mcast_addr"/>
- </td>
- </tr>
- </tbody>
-
- <tfoot class="systemsTable">
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- <div class="systemsTableEnd">
- <input type="submit" value="Apply"/>
- </div>
- </td></tr>
- </tfoot>
- </table>
+ <tr class="systemsTable"><td class="systemsTable">
+ <input type="radio" name="quorumd" value="True"/>
+ <strong>I prefer to use a Quorum Partition</strong>
+ </td></tr>
- </form>
- <hr/>
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ Interval: <input type="text" name="interval" value="" tal:attributes="value clusterinfo/interval"/>
+ </td></tr>
- <form name="quorum_partition" action="" method="get" tal:attributes="action clusterinfo/quorumd_url">
- <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
- <thead class="systemsTable">
- <tr class="systemsTable"><td class="systemsTable" colspan="1">
- <div class="systemsTableTop">
- <strong>Quorum Partition Configuration</strong>
- </div>
- </td></tr>
- </thead>
-
- <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>
- </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">
- <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"/>
- </td></tr>
-
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- Device: <input type="text" name="device" value="" tal:attributes="value clusterinfo/device"/>
- </td></tr>
-
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- Label: <input type="text" name="label" value="" tal:attributes="value clusterinfo/label"/>
- </td></tr>
- </tbody>
- </table>
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ TKO: <input type="text" name="tko" value="" tal:attributes="value clusterinfo/tko"/>
+ </td></tr>
- <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
- <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>
- </th>
- <th class="systemsTable">
- <div class="systemsTableTop">Path to Program</div>
- </th>
- <th class="systemsTable">
- <div class="systemsTableTop">Interval</div>
- </th>
- <th class="systemsTable">
- <div class="systemsTableTop">Score</div>
- </th>
- </tr>
- </thead>
-
- <tbody class="systemsTable"
- tal:define="global heuristics clusterinfo/hlist">
-
- <tr class="systemsTable" tal:repeat="heuristic heuristics">
- <td class="systemsTable">
- <input type="text" name="hname" value="" tal:attributes="value heuristic/hname"/>
- </td>
- <td class="systemsTable">
- <input type="text" name="hinterval" value="" tal:attributes="value heuristic/hinterval"/>
- </td>
- <td class="systemsTable" colspan="2">
- <input type="text" name="hprog" value="" tal:attributes="value heuristic/hprog"/>
- </td>
- <td class="systemsTable">
- <input type="text" name="hscore" value="" tal:attributes="value heuristic/hscore"/>
- </td>
- </tr>
- </tbody>
-
- <tfoot class="systemsTable">
- <tr class="systemsTable"><td class="systemsTable" colspan="2">
- <div class="systemsTableEnd">
- <input type="submit" value="Apply"/>
- </div>
- </td></tr>
- </tfoot>
- </table>
- </form>
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ Minimum Score: <input type="text" name="min_score" value="" tal:attributes="value clusterinfo/min_score"/>
+ </td></tr>
+
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ Device: <input type="text" name="device" value="" tal:attributes="value clusterinfo/device"/>
+ </td></tr>
+
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ Label: <input type="text" name="label" value="" tal:attributes="value clusterinfo/label"/>
+ </td></tr>
+ </tbody>
+ </table>
+
+ <table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
+ <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>
+ </th>
+ <th class="systemsTable">
+ <div class="systemsTableTop">Path to Program</div>
+ </th>
+ <th class="systemsTable">
+ <div class="systemsTableTop">Interval</div>
+ </th>
+ <th class="systemsTable">
+ <div class="systemsTableTop">Score</div>
+ </th>
+ </tr>
+ </thead>
+
+ <tbody class="systemsTable"
+ tal:define="global heuristics clusterinfo/hlist">
+
+ <tr class="systemsTable" tal:repeat="heuristic heuristics">
+ <td class="systemsTable">
+ <input type="text" name="hname" value="" tal:attributes="value heuristic/hname"/>
+ </td>
+ <td class="systemsTable">
+ <input type="text" name="hinterval" value="" tal:attributes="value heuristic/hinterval"/>
+ </td>
+ <td class="systemsTable" colspan="2">
+ <input type="text" name="hprog" value="" tal:attributes="value heuristic/hprog"/>
+ </td>
+ <td class="systemsTable">
+ <input type="text" name="hscore" value="" tal:attributes="value heuristic/hscore"/>
+ </td>
+ </tr>
+ </tbody>
+
+ <tfoot class="systemsTable">
+ <tr class="systemsTable"><td class="systemsTable" colspan="2">
+ <div class="systemsTableEnd">
+ <input type="submit" value="Apply"/>
+ </div>
+ </td></tr>
+ </tfoot>
+ </table>
+ </form>
+ </div>
</div>
<div metal:define-macro="clusterprocess-form">
--- conga/luci/homebase/luci_homebase.css 2006/08/11 19:42:06 1.11
+++ conga/luci/homebase/luci_homebase.css 2006/08/14 22:46:49 1.12
@@ -1,4 +1,51 @@
-/* $Id: luci_homebase.css,v 1.11 2006/08/11 19:42:06 jparsons Exp $ */
+ul.configTab {
+ color: #436976 !important;
+ margin: 20px 0px 0px 0px !important;
+ padding: 0px !important;
+ padding-left: 15px !important;
+ border-bottom: none !important;
+ z-index: 1 !important;
+}
+
+li.configTab {
+ display: inline !important;
+ overflow: hidden !important;
+ list-style-type: none !important;
+ padding-left: 6px !important;
+ padding-bottom: 0px !important;
+ margin-bottom: 0px !important;
+ border-bottom: none !important;
+}
+
+#configTabContent {
+ background: #dee7ec !important;
+ margin-top: 0px !important;
+ padding: 20px !important;
+ border: 1px solid #8cacbb !important;
+ z-index: 2 !important;
+ max-width: 75%;
+}
+
+a.configTab, a.configTabActive {
+ color: #436976 !important;
+ background: #ffffff !important;
+ font: bold 1em !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;
+}
+
+a.configTabActive {
+ background: #dee7ec !important;
+ border-bottom: 2px solid #dee7ec !important;
+}
+
+a.configTab:hover {
+ color: #436976 !important;
+ background: #dee7ec !important;
+}
*.errmsgs,*.retmsgs {
list-style-image: none !important;
next reply other threads:[~2006-08-14 22:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-14 22:46 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-08-15 22:27 [Cluster-devel] conga/luci cluster/form-macros homebase/luci_h rmccabe
2006-09-26 20:57 rmccabe
2006-10-11 16:40 rmccabe
2006-10-16 19:13 rmccabe
2007-01-30 22:26 rmccabe
2007-02-02 1:12 rmccabe
2007-02-07 17:18 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=20060814224650.415.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 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).