[Cluster-devel] conga ./conga.spec.in.in luci/homebase/homebas ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-07-18 18:57:41

Modified files:
	.              : conga.spec.in.in 
	luci/homebase  : homebase_common.js 
	luci/plone-custom: conga.js 
	luci/site/luci/var: Data.fs 

Log message:
	Update the DB with the fixes for bz245202

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.47&r2=1.45.2.48
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/homebase_common.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.13.2.4&r2=1.13.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.2&r2=1.3.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.18&r2=1.15.2.19

--- conga/conga.spec.in.in	2007/07/16 22:18:50	1.45.2.47
+++ conga/conga.spec.in.in	2007/07/18 18:57:19	1.45.2.48
@@ -287,7 +287,7 @@
 ###  changelog ###
 
 %changelog
-* Mon Jul 16 2007 Ryan McCabe <rmccabe at redhat.com> 0.10.0-2
+* Wed Jul 18 2007 Ryan McCabe <rmccabe at redhat.com> 0.10.0-2
 - Fixed bz245202 (Conga needs to support Internet Explorer 6.0 and later)
 - Fixed bz248317 (luci sets incorrect permissions on /usr/lib64/luci and /var/lib/luci) 
 - Resolves: bz245202 bz248317
--- conga/luci/homebase/homebase_common.js	2007/07/12 04:41:39	1.13.2.4
+++ conga/luci/homebase/homebase_common.js	2007/07/18 18:57:19	1.13.2.5
@@ -108,14 +108,6 @@
 	}
 }
 
-function hide_element(id) {
-	var elem = document.getElementById(id);
-	if (elem) {
-		elem.style.visibility = 'hidden';
-		elem.style.display = 'none';
-	}
-}
-
 function isValidHost(str) {
 	var i = str.split('.');
 
--- conga/luci/plone-custom/conga.js	2007/06/20 20:19:34	1.3.2.2
+++ conga/luci/plone-custom/conga.js	2007/07/18 18:57:19	1.3.2.3
@@ -11,6 +11,14 @@
 	return str.replace('&', '&').replace('<', '<').replace('>', '>').replace('"', '"').replace('\'', ''');
 }
 
+function hide_element(id) {
+	var elem = document.getElementById(id);
+	if (elem) {
+		elem.style.visibility = 'hidden';
+		elem.style.display = 'none';
+	}
+}
+
 function popup_window(url, width_percent, height_percent) {
 	var width = window.innerWidth * (width_percent / 100);
 	var height = window.innerHeight * (height_percent / 100);
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2007/06/27 07:43:17	1.15.2.18 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2007/07/18 18:57:19	1.15.2.19 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed