From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 3 Nov 2006 21:47:28 -0000
Subject: [Cluster-devel] conga/luci cluster/form-macros docs/config_rhe ...
Message-ID: <20061103214728.8056.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
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	2006-11-03 21:47:27

Modified files:
	luci/cluster   : form-macros 
	luci/docs      : config_rhel5 user_manual.html 
	luci/homebase  : luci_homebase.css 
	luci/plone-custom: conga.js 

Log message:
	turn advanced cluster property labels into links to help for each particular property

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.96&r2=1.97
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/docs/config_rhel5.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/docs/user_manual.html.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga.js.diff?cvsroot=cluster&r1=1.3&r2=1.4

--- conga/luci/cluster/form-macros	2006/11/03 21:11:40	1.96
+++ conga/luci/cluster/form-macros	2006/11/03 21:47:26	1.97
@@ -440,16 +440,19 @@
 				<td class="systemsTable" colspan="2">
 					<table class="systemsTable">
 						<tr class="systemsTable">
-							<td class="systemsTable">Secure Authentication</td>
+							<td class="systemsTable">
+								<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" />
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Redundant Ring Protocol Mode
+								<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 name="text" name="ais_rrp">
+								<select name="text" name="rrp_mode">
 									<option value="none">
 										None
 									</option>
@@ -465,7 +468,7 @@
 
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Network MTU
+								<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"
@@ -476,19 +479,20 @@
 
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								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="netmtu"
+								<input type="text" size="10" name="threads"
 									tal:attributes="value string:0" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								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="vfstype">
+								<select name="vsftype">
 									<option value="none">
 										None
 									</option>
@@ -497,18 +501,20 @@
 									</option>
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Token Timeout (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"
 									tal:attributes="value string:5000" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Token Retransmit (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"
@@ -516,18 +522,20 @@
 									tal:attributes="value string:238" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Hold Token Timeout (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"
 									tal:attributes="value string:180" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Number of retransmits before loss
+								<a class="cluster_help" href="javascript:popup_window('/luci/doc/config_rhel5#retransmits_before_loss', 55, 65);">Number of retransmits before loss</a>
 							</td>
 							<td class="systemsTable">
 								<input type="text" size="10"
@@ -535,18 +543,20 @@
 									tal:attributes="value string:4" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Join Timeout (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"
 									tal:attributes="value string:100" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Consensus Timeout (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"
@@ -554,9 +564,10 @@
 									tal:attributes="value string:100" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Merge Detection Timeout (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"
@@ -564,9 +575,10 @@
 									tal:attributes="value string:200" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Interface Down Check Timeout (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"
@@ -574,9 +586,10 @@
 									tal:attributes="value string:1000" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Fail to Receive Constant
+								<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"
@@ -584,9 +597,10 @@
 									tal:attributes="value string:50" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Rotations with no multicast traffic before merge detection timeout is started.
+								<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"
@@ -597,7 +611,7 @@
 
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Number of Heartbeat Failures Allowed
+								<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"
@@ -605,9 +619,10 @@
 									tal:attributes="value string:0" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Maximum Network Delay (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"
@@ -615,9 +630,10 @@
 									tal:attributes="value string:50" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Window Size
+								<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"
@@ -625,9 +641,10 @@
 									tal:attributes="value string:50" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								Maximum Messages
+								<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"
@@ -635,9 +652,10 @@
 									tal:attributes="value string:17" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								RRP Problem Count Timeout (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"
@@ -645,9 +663,10 @@
 									tal:attributes="value string:1000" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								RRP Problem Count Threshold
+								<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"
@@ -655,9 +674,10 @@
 									tal:attributes="value string:20" />
 							</td>
 						</tr>
+
 						<tr class="systemsTable">
 							<td class="systemsTable">
-								RRP Token Expired Timeout
+								<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"
--- conga/luci/docs/config_rhel5	2006/11/03 21:12:01	1.1
+++ conga/luci/docs/config_rhel5	2006/11/03 21:47:27	1.2
@@ -1,5 +1,5 @@
 <html><head><title>Advanced Cluster Configuration Parameters</title>
-</head><body onload="window.focus();window.blur()">
+</head><body>
 <h2>Advanced Cluster Configuration Parameters</h2>
 <p>
 <dl compact>
--- conga/luci/docs/user_manual.html	2006/11/03 21:12:01	1.8
+++ conga/luci/docs/user_manual.html	2006/11/03 21:47:27	1.9
@@ -2,7 +2,7 @@
  <head>
   <title>Conga User Manual</title>
  </head>
- <body onload="window.focus();window.blur();">
+ <body>
   <h1>Conga User Manual</h1> All you need to know to get Conga up and running
   <h2>Introduction</h2>
    <h3>Conga Architecture</h3>
--- conga/luci/homebase/luci_homebase.css	2006/10/16 19:13:45	1.28
+++ conga/luci/homebase/luci_homebase.css	2006/11/03 21:47:27	1.29
@@ -380,6 +380,20 @@
 	padding: .5em;
 }
 
+a.cluster_help:link,
+a.cluster_help:visited,
+a.cluster_help:visited {
+	color: #000000;
+	text-decoration: none ! important;
+}
+
+a.cluster_help:hover {
+	text-decoration: none ! important;
+	cursor: help;
+	color: #000000;
+	border-bottom: 1px solid #cccccc;
+}
+
 a.cluster:link,
 a.cluster:visited {
 	border-bottom: 1px dashed #cccccc;
--- conga/luci/plone-custom/conga.js	2006/10/10 19:19:13	1.3
+++ conga/luci/plone-custom/conga.js	2006/11/03 21:47:27	1.4
@@ -8,5 +8,7 @@
 function popup_window(url, width_percent, height_percent) {
 	var width = window.innerWidth * (width_percent / 100);
 	var height = window.innerHeight * (height_percent / 100);
-	window.open('luci/doc', '', 'width=' + width + ',height=' + height + ',scrollbars,resizable', false);
+	var newwin = window.open(url, 'Conga Help', 'width=' + width + ',height=' + height + ',scrollbars,resizable', false);
+	if (newwin)
+		newwin.focus();
 }