Merge des modifications récentes opérées dans le script final d'installation de Plinn.

diff --git a/profiles/default/various.py b/profiles/default/various.py
index dd64da9..18f9953 100644 (file)
--- a/profiles/default/various.py
+++ b/profiles/default/various.py
@@ -10,11 +10,8 @@
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.exceptions import BadRequest
 from Products.Plinn.exceptions import WorkflowException
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.exceptions import BadRequest
 from Products.Plinn.exceptions import WorkflowException

-# TODO : CMF-2.1 compat
-#from Products.PlacelessTranslationService.MessageID import MessageIDFactory
-#_ = MessageIDFactory('plinn')
-translate = lambda msg : msg
-#---
+from Products.Plinn.utils import translate as i18ntranslate
+translate = lambda msg : i18ntranslate(msg, context)

 
 
 # constructs misc objects
 
 
 # constructs misc objects


@@ -60,14 +57,19 @@ def doActionForOrSkip(*args, **kw) :
        except WorkflowException : pass
        
 # home page
        except WorkflowException : pass
        
 # home page

+text=[]
+text.append('<h1>%s</h1>' % translate('Welcome to Plinn!'))
+text.append('<p>%s</p>' % translate('This is the default home page.'))
+text.append('<p>%s</p>' % translate('To change the content just select "Edit" in the Tab bar on the top.'))
+text = '\n'.join(text)

 constructOrSkip(  'Document', site, 'index_html'
                                , title =       translate('Home')
                                , text_format='html'
 constructOrSkip(  'Document', site, 'index_html'
                                , title =       translate('Home')
                                , text_format='html'

-                               , text=site.default_home_page_content().encode('utf-8'))
+                               , text=text)

 doActionForOrSkip(site.index_html, 'direct_publish')
 
 # default folders
 doActionForOrSkip(site.index_html, 'direct_publish')
 
 # default folders

-constructOrSkip('Plinn Folder', site, 'Members', title =       translate('Members'))
+constructOrSkip('Huge Plinn Folder', site, 'Members', title =  translate('Members'))

 #constructOrSkip('Plinn Folder', site, 'global_settings', title = translate('Portlets'))
 if not hasattr(site, 'global_settings') :
        site.manage_addProduct['OFSP'].manage_addFolder('global_settings')
 #constructOrSkip('Plinn Folder', site, 'global_settings', title = translate('Portlets'))
 if not hasattr(site, 'global_settings') :
        site.manage_addProduct['OFSP'].manage_addFolder('global_settings')


@@ -101,6 +103,18 @@ gtool.setGroupWorkspaceType('Plinn Folder')
 caltool = getToolByName(site, 'portal_calendar')
 caltool.configureTool(['created', 'modified', 'DateTimeOriginal'], [9, 18])
 
 caltool = getToolByName(site, 'portal_calendar')
 caltool.configureTool(['created', 'modified', 'DateTimeOriginal'], [9, 18])
 

+pimtool = getToolByName(site, 'portal_image_manipulation')
+if not pimtool.hasObject('image') :
+       pimtool.manage_addProduct['OFSP'].manage_addFolder('image')
+if not pimtool.hasObject('tile') :
+       pimtool.manage_addProduct['OFSP'].manage_addFolder('tile')
+
+ctool = getToolByName(site, 'portal_catalog')
+if not 'position' in ctool.indexes() :
+       ctool.manage_addProduct['ProxyIndex'].manage_addProxyIndex('position',
+               extra = { 'idx_type' : 'FieldIndex'
+                       , 'value_expr' : 'python:object.getParentNode().getObjectPosition(object.getId())'})
+

 # Caches
 HTTPCache = site.HTTPCache
 HTTPCache.manage_editProps(title='Accelerated HTTP Cache',
 # Caches
 HTTPCache = site.HTTPCache
 HTTPCache.manage_editProps(title='Accelerated HTTP Cache',

diff --git a/profiles/photo/various.py b/profiles/photo/various.py
index 836f47d..18f9953 100644 (file)
--- a/profiles/photo/various.py
+++ b/profiles/photo/various.py
@@ -94,7 +94,7 @@ doActionForOrSkip(rb, 'direct_publish')
 
 # tools settings
 mtool = getToolByName(site, 'portal_membership')
 
 # tools settings
 mtool = getToolByName(site, 'portal_membership')

-mtool.setMemberAreaPortalType('Plinn Folder')
+mtool.setMemberAreaPortalType('Huge Plinn Folder')

 
 gtool = getToolByName(site, 'portal_groups')
 gtool.setGroupWorkspaceContainerType('Plinn Folder')
 
 gtool = getToolByName(site, 'portal_groups')
 gtool.setGroupWorkspaceContainerType('Plinn Folder')