[Cluster-devel] conga/luci cluster/resource_form_handlers.js h ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-09-25 17:36:02

Modified files:
	luci/cluster   : resource_form_handlers.js 
	luci/homebase  : luci_homebase.css 
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	style and javascript tweaks

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.67&r2=1.68

--- conga/luci/cluster/resource_form_handlers.js	2006/09/23 04:04:08	1.12
+++ conga/luci/cluster/resource_form_handlers.js	2006/09/25 17:36:02	1.13
@@ -215,8 +215,6 @@
 		if (!f[i].global || !f[i].global.value)
 			continue;
 		replace[f[i].parentNode.id] = f[i].parentNode;
-		if (f[i].parentNode.parentNode)
-			f[i].parentNode.parentNode.removeChild(f[i].parentNode);
 	}
 
 	var sopt = document.getElementById('gres_chooser');
@@ -225,6 +223,8 @@
 	sopt = sopt.options;
 	for (var i = 0 ; i < sopt.length ; i++) {
 		if (replace[sopt[i].value]) {
+			if (replace[sopt[i].value].parentNode)
+				replace[sopt[i].value].parentNode.parentNode.removeChild(replace[sopt[i].value].parentNode);
 			globalres.appendChild(replace[sopt[i].value]);
 			sopt[i].className = null;
 		}
@@ -335,6 +335,10 @@
 			continue;
 		} else if (!form[i].uuid || !form[i].uuid.value)
 			continue;
+
+		var err = validate_form(form[i]);
+		if (err)
+			errors.concat(err);
 		var temp = form[i].innerHTML.match(/<input [^>]+>/ig).toString().replace(/>(,|$)/g, '/>');
 		if (!temp)
 			continue;
@@ -342,6 +346,9 @@
 					form[i].parent_uuid.value + '">' + temp + '</form>';
 	}
 
+	if (error_dialog(errors))
+		return (-1);
+
 	if (!master_form || !form_xml)
 		return (-1);
 
--- conga/luci/homebase/luci_homebase.css	2006/09/23 04:04:08	1.23
+++ conga/luci/homebase/luci_homebase.css	2006/09/25 17:36:02	1.24
@@ -1,11 +1,11 @@
 input[type=text], input[type=password] {
 	padding: .2em ! important;
 	font-family: "Bitstream Vera Sans Mono", "DejaVu Sans Mono", monospace;
-	font-size: 11px;
+	font-size: 12px;
 }
 
 input[type=button] {
-	font-size: 11px;
+	font-size: 12px;
 }
 
 input[type=checkbox], input[type=radio] {
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/09/23 04:04:08	1.67
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/09/25 17:36:02	1.68
@@ -386,7 +386,7 @@
     
 
   ndadd = {}
-  ndadd['Title'] = "Add A Node"
+  ndadd['Title'] = "Add a Node"
   ndadd['cfg_type'] = "nodeadd"
   ndadd['absolute_url'] = url + "?pagetype=" + NODE_ADD + "&clustername=" + cluname
   ndadd['Description'] = "Add a node to this cluster"