# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1453137546 -3600
# Node ID f88ccd965f2d1f24a452040b4686c97d43e019f4
# Parent  670b7956c6896a9ec5730f9d417b6087f9bf0f8d
Rewritten portal engine

diff -r 670b7956c689 -r f88ccd965f2d buildout.cfg
--- a/buildout.cfg	Mon Jan 18 18:09:46 2016 +0100
+++ b/buildout.cfg	Mon Jan 18 18:19:06 2016 +0100
@@ -58,4 +58,4 @@
 eggs = pyams_portal [test]
 
 [versions]
-pyams_portal = 0.1.1
+pyams_portal = 0.1.2
diff -r 670b7956c689 -r f88ccd965f2d docs/README.txt
--- a/docs/README.txt	Mon Jan 18 18:09:46 2016 +0100
+++ b/docs/README.txt	Mon Jan 18 18:19:06 2016 +0100
@@ -7,52 +7,52 @@
 <PortalTemplate mon_template>
 	name = 'template1'
 	__annotations__['pyams_portal.template'] = PortalTemplateConfiguration:
-		__parent__ = mon_template
+		__parent__ = <mon_template>
 		rows = 2
+		last_portlet_id = 5
 		slot_names = ['slot1', 'slot2', 'slot3']
 		slot_order = {0: ['slot1', 'slot2],
 					  1: ['slot3']}
-		slots = {0: {'slot1': [1, 2],
-					 'slot2': [3, 4, 5]},
-				 1: {'slot3': []}},
-		slot_config = {'slot1': <SlotConfiguration>,
-					   'slot2': <SlotConfiguration>,
-					   'slot3': <SlotConfiguration>},
-		portlets = {1: 'portlet1',
-					2: 'portlet2',
-					3: 'portlet1',
-					4: 'portlet3',
-					5: 'portlet1'},
-	__annotations__['pyams_portal.portlets'] = PortalPortletsConfiguration:
-		portlet_config = {1: <Portlet1Configuration(portlet='portlet1')>,
-						  2: <Portlet2Configuration(portlet='portlet2')>},
-						  3: <Portlet1Configuration(portlet='portlet1')>,
-						  4: <Portlet3Configuration(portlet='portlet3')>,
-						  5: <Portlet1Configuration(portlet='portlet1')>}}
+		slot_config = {'slot1': <SlotConfiguration(portlets=[0, 2, 6])>,
+					   'slot2': <SlotConfiguration(portlets=[3, 4])>,
+					   'slot3': <SlotConfiguration(portlets=[])>},
+	__annotations__['pyams_portal.portlets'] = PortalPortletsConfiguration = <PersistentMapping>:
+		__parent__ = <mon_template>
+		0: <Portlet1Configuration(portlet='portlet1')>
+			__parent__ = <mon_template>
+			__name__ = ++portlet++0
+			can_inherit = False
+			inherit_parent = False
+			settings = <Portlet1Settings>
+		2: <Portlet2Configuration(portlet='portlet2')>
+		3: <Portlet1Configuration(portlet='portlet1')>
+		4: <Portlet3Configuration(portlet='portlet3')>
+		5: <Portlet1Configuration(portlet='portlet1')>
 
 
 <PortalContext mon_contexte>
 	shared_template = 'template1'
-	template = mon_template
-	__annotations__['pyams_portal.template'] = PortalTemplateConfiguration:
-		__parent__ = mon_contexte
-		slots = {0: {'slot1': [1, 2],
-					 'slot2': [3, 4, 5]},
-				 1: {'slot3': []}},
-		slot_config = {'slot1': <SlotConfiguration>,
-					   'slot2': <SlotConfiguration>,
-					   'slot3': <SlotConfiguration>},
-	__annotations__['pyams_portal.portlets'] = PortalPortletsConfiguration:
-		portlet_config = {1: <Portlet1Configuration(portlet='portlet1')>,
-						  2: <Portlet2Configuration(portlet='portlet2')>},
-						  3: <Portlet1Configuration(portlet='portlet1')>,
-						  4: <Portlet3Configuration(portlet='portlet3')>,
-						  5: <Portlet1Configuration(portlet='portlet1')>}}
+	template = <mon_template>
+	__annotations__['pyams_portal.portlets'] = PortalPortletsConfiguration = <PersistentMapping>
+		__parent__ = <mon_contexte>
+		0: <Portlet1Configuration(portlet='portlet1')>
+			__parent__ = <mon_contexte>
+			__name__ = ++portlet++0
+			can_inherit = True
+			inherit_parent = True
+		2: <Portlet2Configuration(portlet='portlet2')>
+			__parent__ = <mon_contexte>
+			__name__ = ++portlet++0
+			can_inherit = True
+			inherit_parent = False
+		3: <Portlet1Configuration(portlet='portlet1')>
+		4: <Portlet3Configuration(portlet='portlet3')>
+		5: <Portlet1Configuration(portlet='portlet1')>
 
 
 <IPortalContext context1>:
 	<PortalPage>
-		__parent__ = context1
+		__parent__ = <context1>
 		inherit_parent = False
 		use_local_template = False
 		shared_template = 'template1'
@@ -60,9 +60,28 @@
 
 <IPortalContext context2>:
 	<PortalPage>
-		__parent__ = context2
+		__parent__ = <context2>
 		inherit_parent = False
 		use_local_template = True
 		local_template = <PortalWfTemplate ++template++>
 		__annotations__['pyams_portal.portlets'] = PortalPortletsConfiguration:
 			__parent__ = ++template++
+
+
+Gestion de l'héritage
+=====================
+
+
+
+Configuration des portlets
+==========================
+
+Sur un modèle (partagé ou local) :
+	- configuration obligatoirement locale
+	- pas d'héritage possible
+
+Sur un contexte "racine" :
+	- héritage possible du modèle
+
+Sur un contexte "interne" :
+	- héritage possible du parent
diff -r 670b7956c689 -r f88ccd965f2d setup.py
--- a/setup.py	Mon Jan 18 18:09:46 2016 +0100
+++ b/setup.py	Mon Jan 18 18:19:06 2016 +0100
@@ -22,7 +22,7 @@
 README = os.path.join(DOCS, 'README.txt')
 HISTORY = os.path.join(DOCS, 'HISTORY.txt')
 
-version = '0.1.1'
+version = '0.1.2'
 long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = []
@@ -58,9 +58,27 @@
           'setuptools',
           # -*- Extra requirements: -*-
           'fanstatic',
+          'persistent',
+          'pyams_form',
+          'pyams_pagelet',
+          'pyams_security',
+          'pyams_skin',
+          'pyams_template',
+          'pyams_utils',
+          'pyams_viewlet',
+          'pyams_zmi',
           'pyramid',
+          'transaction',
+          'z3c.form',
+          'zope.annotation',
           'zope.component',
+          'zope.container',
+          'zope.copy',
           'zope.interface',
+          'zope.lifecycleevent',
+          'zope.location',
+          'zope.schema',
+          'zope.traversing',
       ],
       entry_points={
           'fanstatic.libraries': [
diff -r 670b7956c689 -r f88ccd965f2d src/pyams_portal.egg-info/PKG-INFO
--- a/src/pyams_portal.egg-info/PKG-INFO	Mon Jan 18 18:09:46 2016 +0100
+++ b/src/pyams_portal.egg-info/PKG-INFO	Mon Jan 18 18:19:06 2016 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyams-portal
-Version: 0.1.1
+Version: 0.1.2
 Summary: PyAMS portal and portlets interfaces and classes
 Home-page: http://hg.ztfy.org/pyams/pyams_portal
 Author: Thierry Florac
@@ -15,52 +15,52 @@
         <PortalTemplate mon_template>
         	name = 'template1'
         	__annotations__['pyams_portal.template'] = PortalTemplateConfiguration:
-        		__parent__ = mon_template
+        		__parent__ = <mon_template>
         		rows = 2
+        		last_portlet_id = 5
         		slot_names = ['slot1', 'slot2', 'slot3']
         		slot_order = {0: ['slot1', 'slot2],
         					  1: ['slot3']}
-        		slots = {0: {'slot1': [1, 2],
-        					 'slot2': [3, 4, 5]},
-        				 1: {'slot3': []}},
-        		slot_config = {'slot1': <SlotConfiguration>,
-        					   'slot2': <SlotConfiguration>,
-        					   'slot3': <SlotConfiguration>},
-        		portlets = {1: 'portlet1',
-        					2: 'portlet2',
-        					3: 'portlet1',
-        					4: 'portlet3',
-        					5: 'portlet1'},
-        	__annotations__['pyams_portal.portlets'] = PortalPortletsConfiguration:
-        		portlet_config = {1: <Portlet1Configuration(portlet='portlet1')>,
-        						  2: <Portlet2Configuration(portlet='portlet2')>},
-        						  3: <Portlet1Configuration(portlet='portlet1')>,
-        						  4: <Portlet3Configuration(portlet='portlet3')>,
-        						  5: <Portlet1Configuration(portlet='portlet1')>}}
+        		slot_config = {'slot1': <SlotConfiguration(portlets=[0, 2, 6])>,
+        					   'slot2': <SlotConfiguration(portlets=[3, 4])>,
+        					   'slot3': <SlotConfiguration(portlets=[])>},
+        	__annotations__['pyams_portal.portlets'] = PortalPortletsConfiguration = <PersistentMapping>:
+        		__parent__ = <mon_template>
+        		0: <Portlet1Configuration(portlet='portlet1')>
+        			__parent__ = <mon_template>
+        			__name__ = ++portlet++0
+        			can_inherit = False
+        			inherit_parent = False
+        			settings = <Portlet1Settings>
+        		2: <Portlet2Configuration(portlet='portlet2')>
+        		3: <Portlet1Configuration(portlet='portlet1')>
+        		4: <Portlet3Configuration(portlet='portlet3')>
+        		5: <Portlet1Configuration(portlet='portlet1')>
         
         
         <PortalContext mon_contexte>
         	shared_template = 'template1'
-        	template = mon_template
-        	__annotations__['pyams_portal.template'] = PortalTemplateConfiguration:
-        		__parent__ = mon_contexte
-        		slots = {0: {'slot1': [1, 2],
-        					 'slot2': [3, 4, 5]},
-        				 1: {'slot3': []}},
-        		slot_config = {'slot1': <SlotConfiguration>,
-        					   'slot2': <SlotConfiguration>,
-        					   'slot3': <SlotConfiguration>},
-        	__annotations__['pyams_portal.portlets'] = PortalPortletsConfiguration:
-        		portlet_config = {1: <Portlet1Configuration(portlet='portlet1')>,
-        						  2: <Portlet2Configuration(portlet='portlet2')>},
-        						  3: <Portlet1Configuration(portlet='portlet1')>,
-        						  4: <Portlet3Configuration(portlet='portlet3')>,
-        						  5: <Portlet1Configuration(portlet='portlet1')>}}
+        	template = <mon_template>
+        	__annotations__['pyams_portal.portlets'] = PortalPortletsConfiguration = <PersistentMapping>
+        		__parent__ = <mon_contexte>
+        		0: <Portlet1Configuration(portlet='portlet1')>
+        			__parent__ = <mon_contexte>
+        			__name__ = ++portlet++0
+        			can_inherit = True
+        			inherit_parent = True
+        		2: <Portlet2Configuration(portlet='portlet2')>
+        			__parent__ = <mon_contexte>
+        			__name__ = ++portlet++0
+        			can_inherit = True
+        			inherit_parent = False
+        		3: <Portlet1Configuration(portlet='portlet1')>
+        		4: <Portlet3Configuration(portlet='portlet3')>
+        		5: <Portlet1Configuration(portlet='portlet1')>
         
         
         <IPortalContext context1>:
         	<PortalPage>
-        		__parent__ = context1
+        		__parent__ = <context1>
         		inherit_parent = False
         		use_local_template = False
         		shared_template = 'template1'
@@ -68,7 +68,7 @@
         
         <IPortalContext context2>:
         	<PortalPage>
-        		__parent__ = context2
+        		__parent__ = <context2>
         		inherit_parent = False
         		use_local_template = True
         		local_template = <PortalWfTemplate ++template++>
@@ -76,6 +76,25 @@
         			__parent__ = ++template++
         
         
+        Gestion de l'héritage
+        =====================
+        
+        
+        
+        Configuration des portlets
+        ==========================
+        
+        Sur un modèle (partagé ou local) :
+        	- configuration obligatoirement locale
+        	- pas d'héritage possible
+        
+        Sur un contexte "racine" :
+        	- héritage possible du modèle
+        
+        Sur un contexte "interne" :
+        	- héritage possible du parent
+        
+        
         
 Keywords: Pyramid PyAMS portal portlets
 Platform: UNKNOWN
diff -r 670b7956c689 -r f88ccd965f2d src/pyams_portal.egg-info/SOURCES.txt
--- a/src/pyams_portal.egg-info/SOURCES.txt	Mon Jan 18 18:09:46 2016 +0100
+++ b/src/pyams_portal.egg-info/SOURCES.txt	Mon Jan 18 18:19:06 2016 +0100
@@ -2,6 +2,33 @@
 setup.py
 docs/HISTORY.txt
 docs/README.txt
+docs/__backup__/page.py
+docs/__backup__/portlet.py
+docs/__backup__/slot.py
+docs/__backup__/template.py
+docs/__backup__/workflow.py
+docs/__backup__/portlets/__init__.py
+docs/__backup__/portlets/context/__init__.py
+docs/__backup__/portlets/context/context.pt
+docs/__backup__/portlets/context/interfaces.py
+docs/__backup__/portlets/image/__init__.py
+docs/__backup__/portlets/image/image.pt
+docs/__backup__/portlets/image/interfaces.py
+docs/__backup__/zmi/__init__.py
+docs/__backup__/zmi/container.py
+docs/__backup__/zmi/interfaces.py
+docs/__backup__/zmi/portlet.py
+docs/__backup__/zmi/workflow.py
+docs/__backup__/zmi/portlets/__init__.py
+docs/__backup__/zmi/portlets/context.py
+docs/__backup__/zmi/portlets/image.py
+docs/__backup__/zmi/portlets/templates/context-preview.pt
+docs/__backup__/zmi/portlets/templates/image-preview.pt
+docs/__backup__/zmi/template/__init__.py
+docs/__backup__/zmi/template/config.py
+docs/__backup__/zmi/template/page.py
+docs/__backup__/zmi/template/workflow.py
+docs/__backup__/zmi/template/templates/config.pt
 src/pyams_portal/__init__.py
 src/pyams_portal/include.py
 src/pyams_portal/page.py
@@ -9,7 +36,6 @@
 src/pyams_portal/site.py
 src/pyams_portal/slot.py
 src/pyams_portal/template.py
-src/pyams_portal/workflow.py
 src/pyams_portal.egg-info/PKG-INFO
 src/pyams_portal.egg-info/SOURCES.txt
 src/pyams_portal.egg-info/dependency_links.txt
@@ -24,9 +50,9 @@
 src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.mo
 src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po
 src/pyams_portal/portlets/__init__.py
-src/pyams_portal/portlets/context/__init__.py
-src/pyams_portal/portlets/context/context.pt
-src/pyams_portal/portlets/context/interfaces.py
+src/pyams_portal/portlets/content/__init__.py
+src/pyams_portal/portlets/content/content.pt
+src/pyams_portal/portlets/content/interfaces.py
 src/pyams_portal/portlets/image/__init__.py
 src/pyams_portal/portlets/image/image.pt
 src/pyams_portal/portlets/image/interfaces.py
@@ -41,14 +67,14 @@
 src/pyams_portal/zmi/__init__.py
 src/pyams_portal/zmi/container.py
 src/pyams_portal/zmi/interfaces.py
+src/pyams_portal/zmi/layout.py
+src/pyams_portal/zmi/page.py
 src/pyams_portal/zmi/portlet.py
+src/pyams_portal/zmi/template.py
 src/pyams_portal/zmi/portlets/__init__.py
-src/pyams_portal/zmi/portlets/context.py
+src/pyams_portal/zmi/portlets/content.py
 src/pyams_portal/zmi/portlets/image.py
 src/pyams_portal/zmi/portlets/templates/context-preview.pt
 src/pyams_portal/zmi/portlets/templates/image-preview.pt
-src/pyams_portal/zmi/template/__init__.py
-src/pyams_portal/zmi/template/config.py
-src/pyams_portal/zmi/template/page.py
-src/pyams_portal/zmi/template/workflow.py
-src/pyams_portal/zmi/template/templates/config.pt
\ No newline at end of file
+src/pyams_portal/zmi/templates/layout.pt
+src/pyams_portal/zmi/templates/portlet.pt
\ No newline at end of file
diff -r 670b7956c689 -r f88ccd965f2d src/pyams_portal.egg-info/requires.txt
--- a/src/pyams_portal.egg-info/requires.txt	Mon Jan 18 18:09:46 2016 +0100
+++ b/src/pyams_portal.egg-info/requires.txt	Mon Jan 18 18:19:06 2016 +0100
@@ -1,7 +1,25 @@
 setuptools
 fanstatic
+persistent
+pyams_form
+pyams_pagelet
+pyams_security
+pyams_skin
+pyams_template
+pyams_utils
+pyams_viewlet
+pyams_zmi
 pyramid
+transaction
+z3c.form
+zope.annotation
 zope.component
+zope.container
+zope.copy
 zope.interface
+zope.lifecycleevent
+zope.location
+zope.schema
+zope.traversing
 
 [test]