CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 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 @@
<div metal:define-macro="clusterconfig-form">
<script type="text/javascript">
set_page_title('Luci â cluster â Configure cluster
properties');
+ var active_tab = 'configtab1';
+ var cur_label_elem = null;
</script>
<script type="text/javascript"
src="conga_ajax.js">
@@ -37,49 +39,52 @@
tal:define="global clusterinfo python:
here.getClusterInfo(modelb, request)" />
<tal:block tal:condition="clusterinfo">
+ <script type="text/javascript"
+ src="/luci/homebase/homebase_common.js">
+ </script>
+
<span tal:omit-tag="" tal:define="global configTabNum python: 'tab' in
request and int(request['tab']) or 1" />
+ <div class="configTab">
<ul class="configTab">
<li class="configTab">
- <a tal:attributes="
- href clusterinfo/basecluster_url | nothing;
- class python: 'configTab' + (configTabNum == 1
and ' configTabActive' or '');
- ">General</a>
+ <a id="configtab1_label"
onclick="active_tab=swap_tabs(this, active_tab, 'configtab1')"
+ tal:attributes="
+ class python: 'configTab' +
(configTabNum == 1 and ' configTabActive' or '')">General</a>
</li>
+
<li class="configTab"
tal:condition="not:clusterinfo/gulm">
- <a tal:attributes="
- href clusterinfo/fencedaemon_url | nothing;
- class python: 'configTab' + (configTabNum == 2
and ' configTabActive' or '');
- ">Fence</a>
+ <a id="configtab2_label"
onclick="active_tab=swap_tabs(this, active_tab, 'configtab2')"
+ tal:attributes="
+ class python: 'configTab' +
(configTabNum == 2 and ' configTabActive' or '')">Fence</a>
</li>
+
<li class="configTab"
tal:condition="not:clusterinfo/gulm">
- <a tal:attributes="
- href clusterinfo/multicast_url | nothing;
- class python: 'configTab' + (configTabNum == 3
and ' configTabActive' or '');
- ">Multicast</a>
+ <a id="configtab3_label"
onclick="active_tab=swap_tabs(this, active_tab, 'configtab3')"
+ tal:attributes="
+ class python: 'configTab' +
(configTabNum == 3 and ' configTabActive' or '')">Multicast</a>
</li>
<li class="configTab"
tal:condition="clusterinfo/gulm">
- <a tal:attributes="
- href clusterinfo/gulm_url | nothing;
- class python: 'configTab' + (configTabNum == 5
and ' configTabActive' or '')">GULM</a>
+ <a id="configtab5_label"
onclick="active_tab=swap_tabs(this, active_tab, 'configtab5')"
+ tal:attributes="
+ class python: 'configTab' +
(configTabNum == 5 and ' configTabActive' or '')">GULM</a>
</li>
- <li class="configTab">
- <a tal:attributes="
- href clusterinfo/quorumd_url | nothing;
- class python: 'configTab' + (configTabNum == 4
and ' configTabActive' or '');
- ">Quorum Partition</a>
+ <li class="configTab"
+ tal:condition="not:clusterinfo/gulm">
+ <a id="configtab4_label"
onclick="active_tab=swap_tabs(this, active_tab, 'configtab4')"
+ tal:attributes="
+ class python: 'configTab' +
(configTabNum == 4 and ' configTabActive' or '')">Quorum Partition</a>
</li>
</ul>
+ </div>
- <div id="configTabContent" tal:condition="python: configTabNum == 1">
- <script type="text/javascript"
- src="/luci/homebase/homebase_common.js">
- </script>
+ <div id="configtab1"
+ tal:attributes="class python:'configTabMainContent ' +
(configTabNum == 1 and ' ' or 'invisible')">
<script type="text/javascript"
src="/luci/cluster/validate_config_general.js">
</script>
@@ -136,7 +141,7 @@
<table class="systemsTable">
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#token', 55, 65);">Token
Timeout</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#token', 55, 65)">Token
Timeout</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10" name="token"
@@ -146,7 +151,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#retransmits_before_loss',
55, 65);">Number of token retransmits before loss</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#retransmits_before_loss',
55, 65)">Number of token retransmits before loss</a>
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -157,7 +162,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#join', 55, 65);">Join
Timeout</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#join', 55, 65)">Join
Timeout</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10" name="join"
@@ -167,7 +172,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#consensus', 55,
65);">Consensus Timeout</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#consensus', 55,
65)">Consensus Timeout</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -179,7 +184,7 @@
<tal:comment tal:replace="nothing">
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#secauth', 55,
65);">Secure Authentication</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#secauth', 55, 65)">Secure
Authentication</a>
</td>
<td
class="systemsTable">
<input
type="checkbox" name="secauth" checked="checked" />
@@ -188,7 +193,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#rrp_mode', 55,
65);">Redundant Ring Protocol Mode</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#rrp_mode', 55,
65)">Redundant Ring Protocol Mode</a>
</td>
<td
class="systemsTable">
<select
type="text" name="rrp_mode">
@@ -207,7 +212,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#netmtu', 55,
65);">Network MTU</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#netmtu', 55, 65)">Network
MTU</a>
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -218,7 +223,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#threads', 55,
65);">Number of Threads
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#threads', 55, 65)">Number
of Threads
</td>
<td
class="systemsTable">
<input
type="text" size="10" name="threads"
@@ -228,7 +233,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#vsftype', 55,
65);">Virtual Synchrony Type
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#vsftype', 55,
65)">Virtual Synchrony Type
</td>
<td
class="systemsTable">
<select
name="vsftype">
@@ -243,7 +248,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#token_retransmit', 55,
65);">Token Retransmit</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#token_retransmit', 55,
65)">Token Retransmit</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -254,7 +259,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#hold', 55, 65);">Hold
Token Timeout</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#hold', 55, 65)">Hold
Token Timeout</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10" name="hold"
@@ -264,7 +269,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#send_join', 55,
65);">Maximum time to wait before sending a join message</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#send_join', 55,
65)">Maximum time to wait before sending a join message</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10" name="send_join"
@@ -274,7 +279,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#merge', 55, 65);">Merge
Detection Timeout</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#merge', 55, 65)">Merge
Detection Timeout</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -285,7 +290,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#downcheck', 55,
65);">Interface Down Check Timeout</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#downcheck', 55,
65)">Interface Down Check Timeout</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -296,7 +301,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#fail_to_recv_const', 55,
65);">Fail to Receive Constant</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#fail_to_recv_const', 55,
65)">Fail to Receive Constant</a>
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -307,7 +312,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#seqno_unchanged_const',
55, 65);">Rotations with no mcast traffic before merge detection timeout
started</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#seqno_unchanged_const',
55, 65)">Rotations with no mcast traffic before merge detection timeout
started</a>
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -318,7 +323,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#heartbeat_failures_allowed',
55, 65);">Number of Heartbeat Failures Allowed</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#heartbeat_failures_allowed',
55, 65)">Number of Heartbeat Failures Allowed</a>
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -329,7 +334,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#max_network_delay', 55,
65);">Maximum Network Delay</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#max_network_delay', 55,
65)">Maximum Network Delay</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -340,7 +345,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#window_size', 55,
65);">Window Size</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#window_size', 55,
65)">Window Size</a>
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -351,7 +356,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#max_messages', 55,
65);">Maximum Messages</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#max_messages', 55,
65)">Maximum Messages</a>
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -362,7 +367,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#rrp_problem_count_timeout',
55, 65);">RRP Problem Count Timeout</a> (ms)
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#rrp_problem_count_timeout',
55, 65)">RRP Problem Count Timeout</a> (ms)
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -373,7 +378,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#rrp_problem_count_threshold',
55, 65);">RRP Problem Count Threshold</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#rrp_problem_count_threshold',
55, 65)">RRP Problem Count Threshold</a>
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -384,7 +389,7 @@
<tr class="systemsTable">
<td
class="systemsTable">
- <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#rrp_token_expired_timeout',
55, 65);">RRP Token Expired Timeout</a>
+ <a
class="cluster_help"
href="javascript:popup_window('/luci/doc/config_rhel5#rrp_token_expired_timeout',
55, 65)">RRP Token Expired Timeout</a>
</td>
<td
class="systemsTable">
<input
type="text" size="10"
@@ -402,7 +407,7 @@
<td class="systemsTable" colspan="2">
<div class="systemsTableEnd">
<input type="button"
value="Apply"
-
onClick="validate_form(this.form);"/>
+
onclick="validate_config_form(this.form)"/>
</div>
</td>
</tr>
@@ -410,7 +415,13 @@
</form>
</div>
- <div id="configTabContent" tal:condition="python: configTabNum == 2">
+ <div id="configtab2"
+ tal:attributes="class python:'configTabMainContent ' +
(configTabNum == 2 and ' ' or 'invisible')">
+
+ <script type="text/javascript"
+ src="/luci/cluster/validate_config_fence.js">
+ </script>
+
<form name="fencedaemon" method="post" id="fence_config_form"
action="">
<input type="hidden" name="configtype" value="fence" />
<input type="hidden" name="pagetype"
@@ -421,13 +432,6 @@
<input type="hidden" name="clustername"
tal:attributes="value request/clustername |
clusterinfo/clustername | nothing" />
- <script type="text/javascript"
- src="/luci/homebase/homebase_common.js">
- </script>
- <script type="text/javascript"
- src="/luci/cluster/validate_config_fence.js">
- </script>
-
<table id="systemsTable" class="systemsTable" border="0"
cellspacing="0">
<thead class="systemsTable">
<tr class="systemsTable"><td
class="systemsTable" colspan="1">
@@ -531,7 +535,7 @@
<div class="systemsTableEnd">
<input type="button"
value="Apply"
id="fence_config_submit"
-
onClick="validate_form(this.form)" />
+
onclick="validate_fence_form(this.form)" />
</div>
</td>
</tr>
@@ -540,10 +544,8 @@
</form>
</div>
- <div id="configTabContent" tal:condition="python: configTabNum == 3">
- <script type="text/javascript"
- src="/luci/homebase/homebase_common.js">
- </script>
+ <div id="configtab3"
+ tal:attributes="class python:'configTabMainContent ' +
(configTabNum == 3 and ' ' or 'invisible')">
<script type="text/javascript"
src="/luci/cluster/validate_config_multicast.js">
</script>
@@ -570,7 +572,7 @@
<tr class="systemsTable">
<td class="systemsTable">
<input type="radio"
name="mcast" value="False"
-
onClick="disable_mcast('mcast_address', 'mcast_interface');"
+
onclick="disable_mcast('mcast_address', 'mcast_interface')"
tal:attributes="checked
python: clusterinfo['is_mcast'] != 'True'"
/>
<tal:block
tal:condition="python:os_version == 'rhel4'">
@@ -585,7 +587,7 @@
<tr class="systemsTable">
<td class="systemsTable">
<input type="radio"
name="mcast" value="True"
-
onClick="enable_mcast('mcast_address', 'mcast_interface');"
+
onclick="enable_mcast('mcast_address', 'mcast_interface')"
tal:attributes="checked
python: clusterinfo['is_mcast'] == 'True'"
/>
@@ -628,7 +630,7 @@
<tr class="systemsTable"><td
class="systemsTable" colspan="2">
<div class="systemsTableEnd">
<input type="button"
value="Apply"
-
onClick="validate_form(this.form);"/>
+
onclick="validate_mcast_form(this.form)"/>
</div>
</td></tr>
</tfoot>
@@ -636,13 +638,12 @@
</form>
</div>
- <div id="configTabContent" tal:condition="python: configTabNum == 4">
- <script type="text/javascript"
- src="/luci/homebase/homebase_common.js">
- </script>
- <script type="text/javascript"
- src="/luci/cluster/validate_config_qdisk.js">
- </script>
+ <div id="configtab4"
+ tal:attributes="class python:'configTabMainContent ' +
(configTabNum == 4 and ' ' or 'invisible')">
+ <script type="text/javascript"
+ src="/luci/cluster/validate_config_qdisk.js">
+ </script>
+
<form name="quorum_partition" action="" method="post">
<input type="hidden" name="pagetype"
tal:attributes="value request/pagetype |
request/form/pagetype"
@@ -665,14 +666,14 @@
<tbody class="systemsTable" id="sys_tbody">
<tr class="systemsTable" id="st_row"><td
class="systemsTable" id="st_col">
<input type="radio" name="quorumd"
value="False"
-
onClick="disableChildrenInput('quorumdisk');"
+
onclick="disableChildrenInput('quorumdisk')"
tal:attributes="checked python:
(not clusterinfo['is_quorumd']) and 'checked' or ''" />
Do not use a Quorum Partition
</td></tr>
<tr class="systemsTable"><td
class="systemsTable">
<input type="radio" name="quorumd"
value="True"
-
onClick="enableChildrenInput('quorumdisk');"
+
onclick="enableChildrenInput('quorumdisk')"
tal:attributes="checked python:
(clusterinfo['is_quorumd']) and 'checked' or ''" />
Use a Quorum Partition
</td></tr>
@@ -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)">
</td>
</tr>
</tal:block>
@@ -827,7 +828,7 @@
<img class="qdisk deleteRow"
src="delete-row.png"
title="delete this
heuristic"
-
onClick="delete_qdisk_heur(this, document.quorum_partition);"
+
onclick="delete_qdisk_heur(this, document.quorum_partition)"
tal:attributes="
id python:
'heuristic' + str(curHeur) + ':hdel';
name python:
'heuristic' + str(curHeur) + ':hdel'" />
@@ -838,7 +839,7 @@
<tfoot>
<tr class="systemsTable"><td
class="systemsTable">
- <input class="addrow" type="button"
value="Add another heuristic" onClick="addHeuristic('heuristicList')">
+ <input class="addrow" type="button"
value="Add another heuristic" onclick="addHeuristic('heuristicList')">
</td></tr>
</tfoot>
</table>
@@ -848,7 +849,7 @@
<div class="spacing configTabContent"></div>
<div class="hbSubmit spacing configTabContent">
<input type="button" value="Apply"
- onClick="validate_form(this.form)" />
+ onclick="validate_qdisk_form(this.form)" />
</div>
<script tal:condition="not: clusterinfo/is_quorumd">
disableChildrenInput('quorumdisk');
@@ -857,10 +858,8 @@
</div>
<tal:block tal:condition="clusterinfo/gulm">
- <div id="configTabContent" tal:condition="python: configTabNum == 5">
- <script type="text/javascript"
- src="/luci/homebase/homebase_common.js">
- </script>
+ <div id="configtab5"
+ tal:attributes="class python:'configTabMainContent ' +
(configTabNum == 5 and ' ' or 'invisible')">
<script type="text/javascript"
src="/luci/cluster/validate_config_gulm.js">
</script>
@@ -944,7 +943,7 @@
<div class="spacing configTabContent"></div>
<div class="hbSubmit spacing configTabContent">
<input type="button" value="Apply"
- onClick="validate_form(this.form)"/>
+ onclick="validate_gulm_form(this.form)"/>
</div>
</div>
</tal:block>
--- 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 {
