From 9c80b99ead8d7f854c55e3ccab8668d3c8abbf80 Mon Sep 17 00:00:00 2001
From: Hanno Schlichting <hanno@hannosch.eu>
Date: Thu, 28 Jan 2010 13:23:58 +0000
Subject: [PATCH] Play by the Plone 3.3+ rules and use the INavigationRoot as a
 base for the moderation views.

svn path=/plone.app.discussion/trunk/; revision=33544
---
 docs/HISTORY.txt                                 |  1 +
 plone/app/discussion/browser/configure.zcml      | 16 ++++++++++++++++
 .../app/discussion/profiles/default/actions.xml  |  2 +-
 setup.py                                         |  3 +--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index a28af0f..5f6ece1 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -4,6 +4,7 @@ Changelog
 1.0b3 (XXXX-XX-XX)
 ------------------
 
+* Play by the Plone 3.3+ rules and use the INavigationRoot as a base for the moderation view. [hannosch]
 * Added a commentTitle CSS class to the comment titles. [hannosch]
 * Update message ids to match their real text. [hannosch]
 * Set CSS classes for the comment form in the updateActions method. [timo]
diff --git a/plone/app/discussion/browser/configure.zcml b/plone/app/discussion/browser/configure.zcml
index 0fd0ab9..e22aed8 100644
--- a/plone/app/discussion/browser/configure.zcml
+++ b/plone/app/discussion/browser/configure.zcml
@@ -26,6 +26,14 @@
         permission="plone.app.discussion.ReviewComments"
         />
 
+    <browser:page
+        for="plone.app.layout.navigation.interfaces.INavigationRoot"
+        name="moderate-comments"
+        layer="..interfaces.IDiscussionLayer"
+        class=".moderation.View"
+        permission="plone.app.discussion.ReviewComments"
+        />
+
     <!-- Moderation bulk actions view -->
     <browser:page
         for="Products.CMFCore.interfaces.ISiteRoot"
@@ -35,6 +43,14 @@
         permission="plone.app.discussion.ReviewComments"
         />
 
+    <browser:page
+        for="plone.app.layout.navigation.interfaces.INavigationRoot"
+        name="bulk-actions"
+        layer="..interfaces.IDiscussionLayer"
+        class=".moderation.BulkActionsView"
+        permission="plone.app.discussion.ReviewComments"
+        />
+
     <!-- Delete comment view -->
     <browser:page
         for="plone.app.discussion.interfaces.IComment"
diff --git a/plone/app/discussion/profiles/default/actions.xml b/plone/app/discussion/profiles/default/actions.xml
index d880d85..b779eef 100644
--- a/plone/app/discussion/profiles/default/actions.xml
+++ b/plone/app/discussion/profiles/default/actions.xml
@@ -4,7 +4,7 @@
   <object name="review-comments" meta_type="CMF Action" i18n:domain="plone">
    <property name="title" i18n:translate="">Moderate comments</property>
    <property name="description" i18n:translate=""></property>
-   <property name="url_expr">string:$portal_url/@@moderate-comments</property>
+   <property name="url_expr">string:${globals_view/navigationRootUrl}/@@moderate-comments</property>
    <property name="icon_expr"></property>
    <property name="available_expr"></property>
    <property name="permissions">
diff --git a/setup.py b/setup.py
index 24fe8a0..2c12bc9 100644
--- a/setup.py
+++ b/setup.py
@@ -8,11 +8,9 @@ setup(name='plone.app.discussion',
       description="Enhanced discussion support for Plone",
       long_description=open("README.txt").read() + "\n" +
                        open(os.path.join("docs", "HISTORY.txt")).read(),
-      # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
         "Framework :: Plone",
         "Programming Language :: Python",
-        "Topic :: Software Development :: Libraries :: Python Modules",
         ],
       keywords='',
       author='Timo Stollenwerk',
@@ -27,6 +25,7 @@ setup(name='plone.app.discussion',
           'setuptools',
           'collective.autopermission',
           'collective.monkeypatcher',
+          'plone.app.layout',
           'plone.app.registry',
           'plone.app.z3cform',
           'plone.indexer',