Changeset 1215 in products

Timestamp:

Aug 6, 2009 2:48:25 PM (15 years ago)

Author:

mylan

Message:

Added support of both qPloneComments or quintagroup.plonecomments products

Location:

quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras

Files:

• __init__.py (modified) (1 diff)
• browser/comments.py (modified) (1 diff)
• browser/overrides.zcml (modified) (2 diffs)
• tests.py (deleted)

quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/__init__.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 #import weblogfolder_patch, keywords_widget_patch
 import keywords_widget_patch
 from zope.i18nmessageid import MessageFactory
 quintagroupQuillsMessageFactory = MessageFactory('quintagroup.quills.extras')
-

quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/browser/comments.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from Products.qPloneComments.browser import comments
+try:
+    from Products.qPloneComments.browser import comments
+except ImportError:
+    from quintagroup.plonecomments.browser import comments
 
 class CommentsViewlet(comments.CommentsViewlet):

quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/browser/overrides.zcml

@@ -3 +3 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="quintagroup.quills.extras">
 
@@ -38 +39 @@
 
       <browser:page
-          for="*"
-          name="discussion_reply_redirect"
-          class=".discussionreply.DiscussionReply"
-          permission="zope.Public"
-          allowed_attributes="__call__"
-          />
+          for="*"
+          name="discussion_reply_redirect"
+          class=".discussionreply.DiscussionReply"
+          permission="zope.Public"
+          allowed_attributes="__call__"
+          />
 
-      <include package="Products.qPloneComments" file="overrides.zcml" />
+      <include zcml:condition="installed Products.qPloneComments"
+          package="Products.qPloneComments" file="overrides.zcml" />
       <browser:viewlet
-          name="plone.comments"
-          for="Products.CMFCore.interfaces.IContentish"
-          manager="plone.app.layout.viewlets.interfaces.IBelowContent"
-          view="plone.app.layout.globals.interfaces.IViewView"
-          class=".comments.CommentsViewlet"
-          layer="Products.qPloneComments.interfaces.IPloneCommentsLayer"
-          permission="zope2.View"
-          />
+          zcml:condition="installed Products.qPloneComments"
+          name="plone.comments"
+          for="Products.CMFCore.interfaces.IContentish"
+          manager="plone.app.layout.viewlets.interfaces.IBelowContent"
+          view="plone.app.layout.globals.interfaces.IViewView"
+          class=".comments.CommentsViewlet"
+          layer="Products.qPloneComments.interfaces.IPloneCommentsLayer"
+          permission="zope2.View"
+          />
+
+      <include zcml:condition="installed quintagroup.plonecomments"
+          package="quintagroup.plonecomments" file="overrides.zcml" />
+
+      <browser:viewlet
+          zcml:condition="installed quintagroup.plonecomments"
+          name="plone.comments"
+          for="Products.CMFCore.interfaces.IContentish"
+          manager="plone.app.layout.viewlets.interfaces.IBelowContent"
+          view="plone.app.layout.globals.interfaces.IViewView"
+          class=".comments.CommentsViewlet"
+          layer="quintagroup.plonecomments.interfaces.IPloneCommentsLayer"
+          permission="zope2.View"
+          />
 
     <!-- metal macros -->
-    <view for="*"
+    <browser:page
+        for="*"
         name="quills_header_macros"
         class=".macros.HeaderMacros"