Author: jmorliaguet
Date: Sat Apr 22 16:09:26 2006
New Revision: 2938
Removed:
CPSSkins4Five/trunk/themesfolder.py
Modified:
CPSSkins4Five/trunk/CPSSkinsSiteInstaller.py
CPSSkins4Five/trunk/__init__.py
CPSSkins4Five/trunk/configure.zcml
CPSSkins4Five/trunk/site.py
Log:
- added a patches.py file that monkey-patches cpsskins v3 modules if needed
- simpler registration of the keyreference's zcml
Modified: CPSSkins4Five/trunk/CPSSkinsSiteInstaller.py
==============================================================================
--- CPSSkins4Five/trunk/CPSSkinsSiteInstaller.py (original)
+++ CPSSkins4Five/trunk/CPSSkinsSiteInstaller.py Sat Apr 22 16:09:26 2006
@@ -28,11 +28,10 @@
# zope3
from zope.app.component.hooks import setSite
-from cpsskins.thememanager import IThemeManagementFolder
+from cpsskins.thememanager import ThemeManagementFolder, IThemeManagementFolder
# CPSSkins4Five
from Products.CPSSkins4Five.site import CPSSkinsSite
-from Products.CPSSkins4Five.themesfolder import ThemesFolder
manage_addInstaller = Globals.DTMLFile('zmi/addCPSSkinsSiteForm', globals())
@@ -42,8 +41,8 @@
Globals.InitializeClass(Installer)
def manage_addCPSSkinsSite(dispatcher, id, REQUEST=None):
- """CPSSkins Site installer"""
-
+ """CPSSkins Site installer.
+ """
container = dispatcher.Destination()
# create the site
@@ -55,11 +54,12 @@
setSite(site)
# register the themes folder as a local utility
- tmutil = ThemesFolder()
+ tmutil = ThemeManagementFolder()
sm = site.getSiteManager()
sm.registerUtility(IThemeManagementFolder, tmutil)
if REQUEST is not None:
url = dispatcher.DestinationURL()
- REQUEST.RESPONSE.redirect('%s/%s/++skin++cpsskins/@@site-info.html' %
(url, id))
+ redirect_url = '%s/%s/++skin++cpsskins/@@site-info.html' % (url, id)
+ REQUEST.RESPONSE.redirect(redirect_url)
Modified: CPSSkins4Five/trunk/__init__.py
==============================================================================
--- CPSSkins4Five/trunk/__init__.py (original)
+++ CPSSkins4Five/trunk/__init__.py Sat Apr 22 16:09:26 2006
@@ -20,6 +20,8 @@
import CPSSkinsSiteInstaller
+import patches
+
def initialize(registrar):
registrar.registerClass(
CPSSkinsSiteInstaller.Installer,
Modified: CPSSkins4Five/trunk/configure.zcml
==============================================================================
--- CPSSkins4Five/trunk/configure.zcml (original)
+++ CPSSkins4Five/trunk/configure.zcml Sat Apr 22 16:09:26 2006
@@ -1,5 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope";
+ xmlns:browser="http://namespaces.zope.org/browser";
xmlns:five="http://namespaces.zope.org/five";>
<include file="permissions.zcml" />
@@ -8,34 +9,17 @@
<include file="views.zcml" />
- <!-- CPSSkins site -->
+ <!-- CPSSkins v3 site -->
<five:localsite class=".site.CPSSkinsSite" />
- <five:traversable class=".site.CPSSkinsSite" />
-
<!-- zope2 -->
<five:traversable class="OFS.Folder.Folder" />
- <adapter
- for="persistent.interfaces.IPersistent"
- provides="zope.app.keyreference.interfaces.IKeyReference"
- factory="zope.app.keyreference.persistent.KeyReferenceToPersistent"
- trusted="y"
- />
-
- <class class="zope.app.keyreference.persistent.KeyReferenceToPersistent">
- <require permission="zope.Public"
- interface="zope.app.keyreference.interfaces.IKeyReference" />
- </class>
+ <include package="zope.app.keyreference" />
- <adapter
- for="persistent.interfaces.IPersistent"
- provides="ZODB.interfaces.IConnection"
- factory="zope.app.keyreference.persistent.connectionOfPersistent"
- />
<!-- name choosers -->
Modified: CPSSkins4Five/trunk/site.py
==============================================================================
--- CPSSkins4Five/trunk/site.py (original)
+++ CPSSkins4Five/trunk/site.py Sat Apr 22 16:09:26 2006
@@ -18,20 +18,19 @@
__docformat__ = "reStructuredText"
-#zope2
+# zope2
from OFS.Folder import Folder
-from Acquisition import Implicit
# zope3
from zope.component.interfaces import IComponentLookup
from zope.interface import implementsOnly, Interface
class ICPSSkinsSite(Interface):
- pass
+ """A CPSSkins v3 site marker interface"""
class CPSSkinsSite(Folder):
- """A CPSSkins v3 site"""
-
+ """A CPSSkins v3 site
+ """
meta_type = portal_type = "CPSSkins v3 Site"
implementsOnly(ICPSSkinsSite)
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
