Merge pull request #71 from plone/toolbar-fixup

Toolbar fixup

CHANGES.rst

@@ -4,7 +4,9 @@ Changelog
 2.4.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Change the category of the configlet to 'plone-general' [sneridagh]
+
+- Updated links for the renamed 'Types' control panel [sneridagh]
 
 
 2.4.3 (2015-06-05)

plone/app/discussion/browser/controlpanel.pt

@@ -11,7 +11,7 @@
      tal:attributes="class view/settings"
      metal:fill-slot="prefs_configlet_content">
 
-    
+
     <div class="portalMessage warning"
         tal:condition="view/mailhost_warning">
         <strong i18n:translate="">
@@ -44,7 +44,7 @@
             <tal:link i18n:name="label_discussion_control_panel_link">
                 <a href=""
                    i18n:translate="text_discussion_type_control_panel_link"
-                   tal:attributes="href string:${portal_url}/@@types-controlpanel?type_id=Discussion Item"
+                   tal:attributes="href string:${portal_url}/@@content-controlpanel?type_id=Discussion Item"
                 >Types control panel</a>
             </tal:link>
             to choose a workflow for the 'Discussion Item' type.

plone/app/discussion/browser/moderation.pt

@@ -32,7 +32,7 @@
                 Moderation workflow is disabled. You have to
                 <a i18n:name="enable_comment_workflow"
                    i18n:translate="message_enable_comment_workflow" href=""
-                   tal:attributes="href string:${context/portal_url}/@@types-controlpanel?type_id=Discussion Item">
+                   tal:attributes="href string:${context/portal_url}/@@content-controlpanel?type_id=Discussion Item">
                 enable the 'Comment Review Workflow' for the Comment content
                 type</a> before you can moderate comments here.
             </span>

plone/app/discussion/profiles/default/controlpanel.xml

@@ -9,7 +9,7 @@
         title="Discussion"
         action_id="discussion"
         appId="plone.app.discussion"
-        category="Plone"
+        category="plone-general"
         condition_expr=""
         icon_expr="string:${portal_url}/discussionitem_icon.png"
         url_expr="string:${portal_url}/@@discussion-controlpanel"