From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 15 Sep 2006 21:25:37 -0000
Subject: [Cluster-devel] conga/luci load_site.py plone-custom/favicon.ico
Message-ID: <20060915212537.28742.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-09-15 21:25:37

Modified files:
	luci           : load_site.py 
Added files:
	luci/plone-custom: favicon.ico 

Log message:
	get rid of the default plone address line brower icon

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/load_site.py.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/favicon.ico.diff?cvsroot=cluster&r1=NONE&r2=1.1

--- conga/luci/load_site.py	2006/08/11 16:31:36	1.10
+++ conga/luci/load_site.py	2006/09/15 21:25:37	1.11
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# $Id: load_site.py,v 1.10 2006/08/11 16:31:36 rmccabe Exp $
+# $Id: load_site.py,v 1.11 2006/09/15 21:25:37 rmccabe Exp $
 
 ##############################################################################
 #
@@ -332,6 +332,14 @@
 	f=open(f)
 
 	try:
+		db_id = name.split('.')
+		db_id_len = len(db_id)
+		if db_id_len > 2 and db_id[db_id_len - 2] != 'dtml':
+			db_id = str.join(db_id[:-1])
+	except:
+		db_id = name
+
+	try:
 		call(object.manage_addDTMLMethod, id=name, file=f)
 		if verbose: print 'Uploaded', name
 	except:
@@ -364,5 +372,6 @@
 
 upload_jpg=upload_gif
 upload_png=upload_gif
+upload_ico=upload_gif
 
 if __name__=='__main__': main()
/cvs/cluster/conga/luci/plone-custom/favicon.ico,v  -->  standard output
revision 1.1
Binary files /cvs/cluster/conga/luci/plone-custom/favicon.ico and - differ