[Plone-cvs] CMFPlone __init__.py,1.24.2.2,1.24.2.3 Portal.py,1.48,1.48.2.1

[<la...@us...>]

Update of /cvsroot/plone/CMFPlone
In directory usw-pr-cvs1:/tmp/cvs-serv11418

Modified Files:
      Tag: Plone_beta1
	__init__.py Portal.py 
Log Message:
use the plone icon for the site itself

Index: __init__.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/__init__.py,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C2 -d -r1.24.2.2 -r1.24.2.3
*** __init__.py	19 Sep 2002 23:15:24 -0000	1.24.2.2
--- __init__.py	24 Sep 2002 23:14:28 -0000	1.24.2.3
***************
*** 9,12 ****
--- 9,13 ----
  import sys
  import StatelessTreeNav
+ import Globals
  
  ADD_CONTENT_PERMISSION = 'Add portal content'
***************
*** 72,79 ****
  contentConstructors = ( PloneFolder.addPloneFolder, )
  
! DirectoryView.registerDirectory('skins', globals())
  this_module = sys.modules[ __name__ ]
  z_bases = utils.initializeBasesPhase1(contentClasses, this_module)
  
  def initialize(context):
      utils.initializeBasesPhase2( z_bases, context )    
--- 73,82 ----
  contentConstructors = ( PloneFolder.addPloneFolder, )
  
! DirectoryView.registerDirectory('skins', cmfplone_globals)
  this_module = sys.modules[ __name__ ]
  z_bases = utils.initializeBasesPhase1(contentClasses, this_module)
  
+ misc_ = {'plone_icon': Globals.ImageFile('skins/plone_images/site_icon.gif', cmfplone_globals)}
+ 
  def initialize(context):
      utils.initializeBasesPhase2( z_bases, context )    
***************
*** 87,91 ****
                       , fti=PloneFolder.factory_type_information
                       ).initialize( context )
!     Portal.register(context, globals())
!     CustomizationPolicy.register(context, globals())
!     PrivateSitePolicy.register(context, globals())
--- 90,94 ----
                       , fti=PloneFolder.factory_type_information
                       ).initialize( context )
!     Portal.register(context, cmfplone_globals)
!     CustomizationPolicy.register(context, cmfplone_globals)
!     PrivateSitePolicy.register(context, cmfplone_globals)

Index: Portal.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/Portal.py,v
retrieving revision 1.48
retrieving revision 1.48.2.1
diff -C2 -d -r1.48 -r1.48.2.1
*** Portal.py	11 Sep 2002 23:22:15 -0000	1.48
--- Portal.py	24 Sep 2002 23:14:28 -0000	1.48.2.1
***************
*** 7,11 ****
  from Products.CMFCore.TypesTool import ContentFactoryMetadata, FactoryTypeInformation
  from Products.CMFCore.DirectoryView import addDirectoryViews, registerDirectory
! from Products.CMFCore.utils import getToolByName
  from Products.CMFDefault import Portal
  from Products.CMFCalendar.Extensions import Install as CalendarInstall
--- 7,11 ----
  from Products.CMFCore.TypesTool import ContentFactoryMetadata, FactoryTypeInformation
  from Products.CMFCore.DirectoryView import addDirectoryViews, registerDirectory
! from Products.CMFCore.utils import getToolByName, registerIcon
  from Products.CMFDefault import Portal
  from Products.CMFCalendar.Extensions import Install as CalendarInstall
***************
*** 87,90 ****
--- 87,91 ----
          p._setProperty('default_language', 'en', 'string')
          p._setProperty('use_folder_tabs',('Folder',), 'lines')
+         p.icon = 'misc_/CMFPlone/plone_icon'