[Cluster-devel] conga/luci/homebase form-macros luci_homebase. ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-01-24 20:21:33

Modified files:
	luci/homebase  : form-macros luci_homebase.css 
	                 validate_cluster_add.js 

Log message:
	bz 222051

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.53&r2=1.54
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.34&r2=1.35
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/validate_cluster_add.js.diff?cvsroot=cluster&r1=1.5&r2=1.6

--- conga/luci/homebase/form-macros	2007/01/24 19:59:52	1.53
+++ conga/luci/homebase/form-macros	2007/01/24 20:21:32	1.54
@@ -295,9 +295,11 @@
 
 	<h2 class="homebase">Manage Systems and Clusters</h2>
 
-	<h3>Reauthenticate to Storage or Cluster Systems</h3>
 
-	<form name="authform" method="post" action="">
+	<form name="authform" method="post" action="" class="form_border">
+		<fieldset>
+			<legend>Reauthenticate</legend>
+		<h3>Reauthenticate to Storage or Cluster Systems</h3><br/>
 		<table id="systemsTable" class="systemsTable" border="0" cellspacing="0"
 			tal:define="
 				new_systems request/SESSION/auth_systems | nothing;
@@ -469,6 +471,7 @@
 				tal:define="x python: request.SESSION.delete('auth_status')" />
 			<div class="padding">&nbsp;</div>
 		</tal:block>
+	</fieldset>
 	</form>
 
 	<tal:block tal:define="
@@ -477,8 +480,10 @@
 		global num_clusters python:-1;
 		global num_systems python:-1" />
 
-	<form name="adminform" method="post" action=""
+	<form name="adminform" method="post" class="form_border" action=""
 		tal:condition="python:(systems[0] and len(systems[0]) > 0) or (systems[1] and len(systems[1]) > 0)">
+	<fieldset>
+		<legend>Remove clusters and systems</legend>
 
 		<tal:block tal:define="global blankForm python:0" />
 
@@ -542,6 +547,7 @@
 			<input type="button" name="Submit" value="Remove selected entries"
 				onClick="validateForm(this.form)" />
 		</div>
+	</fieldset>
 	</form>
 
 	<div tal:condition="python: blankForm">
--- conga/luci/homebase/luci_homebase.css	2007/01/20 04:50:19	1.34
+++ conga/luci/homebase/luci_homebase.css	2007/01/24 20:21:32	1.35
@@ -18,6 +18,10 @@
 	margin-left: +.3333em;
 }
 
+form.form_border {
+	border-bottom: 1px solid #8cacbb;
+}
+
 div.fence {
 	max-width: 700px;
 	padding: .5em;
--- conga/luci/homebase/validate_cluster_add.js	2006/12/08 20:47:37	1.5
+++ conga/luci/homebase/validate_cluster_add.js	2007/01/24 20:21:32	1.6
@@ -31,7 +31,7 @@
 
 	var confirm_str = '';
 	if (form.addnode)
-		confirm_str = 'Add node' + (added_storage.length > 1 ? 's' : '') + ' to the \"' + clusterName + '\" cluster?';
+		confirm_str = 'Add ' + (added_storage.length > 1 ? 'these nodes' : 'this node') + ' to the \"' + clusterName + '\" cluster?';
 	else
 		confirm_str = 'Add the cluster \"' + clusterName + '\" to the Luci management interface?';