From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 2 Jan 2008 17:36:53 -0000 Subject: [Cluster-devel] conga/luci cluster/cluster_config-macros clust ... Message-ID: <20080102173653.21932.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: rmccabe at sourceware.org 2008-01-02 17:36:52 Modified files: luci/cluster : cluster_config-macros validate_config_fence.js validate_config_general.js validate_config_gulm.js validate_config_multicast.js validate_config_qdisk.js luci/plone-custom: conga.js luci.css Log message: Fix display issues with the cluster properties dialog on some browsers Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_config-macros.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_fence.js.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_general.js.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_gulm.js.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_multicast.js.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_qdisk.js.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga.js.diff?cvsroot=cluster&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/luci.css.diff?cvsroot=cluster&r1=1.2&r2=1.3 --- conga/luci/cluster/cluster_config-macros 2007/11/19 18:22:48 1.1 +++ conga/luci/cluster/cluster_config-macros 2008/01/02 17:36:52 1.2 @@ -18,6 +18,8 @@
+ +
+
-
- +
@@ -136,7 +141,7 @@ @@ -410,7 +415,13 @@ -
+
+ + +
- - -
- Token Timeout (ms) + Token Timeout (ms) - Number of token retransmits before loss + Number of token retransmits before loss - Join Timeout (ms) + Join Timeout (ms) - Consensus Timeout (ms) + Consensus Timeout (ms)
- Secure Authentication + Secure Authentication @@ -188,7 +193,7 @@
- Redundant Ring Protocol Mode + Redundant Ring Protocol Mode
- Network MTU + Network MTU - Number of Threads + Number of Threads - Virtual Synchrony Type + Virtual Synchrony Type
- Token Retransmit (ms) + Token Retransmit (ms) - Hold Token Timeout (ms) + Hold Token Timeout (ms) - Maximum time to wait before sending a join message (ms) + Maximum time to wait before sending a join message (ms) - Merge Detection Timeout (ms) + Merge Detection Timeout (ms) - Interface Down Check Timeout (ms) + Interface Down Check Timeout (ms) - Fail to Receive Constant + Fail to Receive Constant - Rotations with no mcast traffic before merge detection timeout started + Rotations with no mcast traffic before merge detection timeout started - Number of Heartbeat Failures Allowed + Number of Heartbeat Failures Allowed - Maximum Network Delay (ms) + Maximum Network Delay (ms) - Window Size + Window Size - Maximum Messages + Maximum Messages - RRP Problem Count Timeout (ms) + RRP Problem Count Timeout (ms) - RRP Problem Count Threshold + RRP Problem Count Threshold - RRP Token Expired Timeout + RRP Token Expired Timeout
+ onclick="validate_config_form(this.form)"/>
@@ -540,10 +544,8 @@ -
- +
@@ -570,7 +572,7 @@
@@ -636,13 +638,12 @@ -
- - +
+ +
@@ -783,7 +784,7 @@ id="heuristic0:hdel" name="heuristic0:hdel" src="delete-row.png" title="delete this heuristic" - onClick="delete_qdisk_heur(this, document.quorum_partition);"> + onclick="delete_qdisk_heur(this, document.quorum_partition)"> @@ -827,7 +828,7 @@ @@ -838,7 +839,7 @@
@@ -531,7 +535,7 @@
+ onclick="validate_fence_form(this.form)" />
@@ -585,7 +587,7 @@
@@ -628,7 +630,7 @@
+ onclick="validate_mcast_form(this.form)"/>
Do not use a Quorum Partition
Use a Quorum Partition
- +
@@ -848,7 +849,7 @@
+ onclick="validate_qdisk_form(this.form)" />
+
@@ -944,7 +943,7 @@
+ onclick="validate_gulm_form(this.form)"/>
--- conga/luci/cluster/validate_config_fence.js 2007/08/08 21:00:06 1.4 +++ conga/luci/cluster/validate_config_fence.js 2008/01/02 17:36:52 1.5 @@ -7,7 +7,7 @@ ** Free Software Foundation. */ -function validate_form(form) { +function validate_fence_form(form) { var errors = new Array(); if (!form) --- conga/luci/cluster/validate_config_general.js 2007/08/08 21:00:06 1.5 +++ conga/luci/cluster/validate_config_general.js 2008/01/02 17:36:52 1.6 @@ -7,7 +7,7 @@ ** Free Software Foundation. */ -function validate_form(form) { +function validate_config_form(form) { var errors = new Array(); var name = null; var ver = null; --- conga/luci/cluster/validate_config_gulm.js 2007/08/08 21:00:06 1.4 +++ conga/luci/cluster/validate_config_gulm.js 2008/01/02 17:36:52 1.5 @@ -7,7 +7,7 @@ ** Free Software Foundation. */ -function validate_form(form) { +function validate_gulm_form(form) { var errors = new Array(); var lscount = 0; --- conga/luci/cluster/validate_config_multicast.js 2007/09/11 16:04:32 1.7 +++ conga/luci/cluster/validate_config_multicast.js 2008/01/02 17:36:52 1.8 @@ -40,7 +40,7 @@ } } -function validate_form(form) { +function validate_mcast_form(form) { var errors = new Array(); if (!form.mcast) { --- conga/luci/cluster/validate_config_qdisk.js 2007/09/25 03:51:02 1.10 +++ conga/luci/cluster/validate_config_qdisk.js 2008/01/02 17:36:52 1.11 @@ -141,7 +141,7 @@ return (null); } -function validate_form(form) { +function validate_qdisk_form(form) { var errors = new Array(); if (!form || !form.quorumd) { --- conga/luci/plone-custom/conga.js 2007/12/12 15:50:18 1.9 +++ conga/luci/plone-custom/conga.js 2008/01/02 17:36:52 1.10 @@ -206,7 +206,7 @@ cur_tab_elem.className += ' invisible'; new_tab_elem.className = new_tab_elem.className.replace(/invisible/gi, ''); - new_label.className += 'configTab configTabActive'; + new_label.className = 'configTab configTabActive'; var cur_label = document.getElementById(cur_tab + '_label'); cur_label.className = 'configTab'; } catch (e) { --- conga/luci/plone-custom/luci.css 2007/12/12 15:50:18 1.2 +++ conga/luci/plone-custom/luci.css 2008/01/02 17:36:52 1.3 @@ -75,15 +75,6 @@ width: 50%; } -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; -} - input.qdisk { font-family: "Bitstream Vera Sans Mono", "DejaVu Sans Mono", monospace ! important; font-size: 12px ! important; @@ -128,43 +119,53 @@ margin-bottom: +.5em; } -li.configTab { - display: inline ! important; - overflow: hidden ! important; +div.configTab { + margin-top: 2em; +} + +ul.configTab { + text-align: left ! important; + margin: 1em 0 1em 0 ! important; list-style-type: none ! important; - padding-left: 6px ! important; - padding-bottom: 0px ! important; - margin-bottom: 0px ! important; - border-bottom: none ! important; + line-height: normal ! important; + padding: 3px 10px 0px 10px ! important; + display: inline ! important; } -div.configTabMainContent { - background: #dee7ec !important; - margin-top: 0px !important; - padding: 20px !important; - border: 1px solid #8cacbb !important; - z-index: 2 !important; - max-width: 700px; +li.configTab { + display: inline ! important; + background-color: #ffffff ! important; + margin-bottom: 0px ! important; + padding-right: .3333em; } -a.configTab, a.configTabActive { - 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; +a.configTab { + padding: 0px 4px 0px ! important; + border: 1px solid #8cacbb ! important; + border-bottom: 1px solid #8cacbb ! important; + background-color: #ffffff ! important; + margin-right: 0px ! important; + text-decoration: none ! important; + cursor: pointer; } a.configTabActive { - background: #dee7ec !important; - border-bottom: 2px solid #dee7ec !important; + color: #436976 ! important; + background-color: #dee7ec ! important; + border-bottom: 1px solid #dee7ec ! important; } a.configTab:hover { - color: #436976 !important; - background: #dee7ec !important; + color: #436976 ! important; + background-color: #dee7ec ! important; +} + +div.configTabMainContent { + background-color: #dee7ec ! important; + margin-top: 0px ! important; + padding: 20px ! important; + border: 1px solid #8cacbb ! important; + max-width: 700px; } *.errmsgs,*.retmsgs {