ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71 from plone/toolbar-fixup

Browse Source 
Toolbar fixup
This commit is contained in:
Ramon Navarro Bosch 2015-07-16 18:30:11 +02:00
commit eff573897d
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.rst
View File

@ -4,7 +4,9 @@ Changelog
2.4.4 (unreleased) 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) 2.4.3 (2015-06-05)

4
plone/app/discussion/browser/controlpanel.pt
View File

@ -11,7 +11,7 @@
tal:attributes="class view/settings" tal:attributes="class view/settings"
metal:fill-slot="prefs_configlet_content"> metal:fill-slot="prefs_configlet_content">
<div class="portalMessage warning" <div class="portalMessage warning"
tal:condition="view/mailhost_warning"> tal:condition="view/mailhost_warning">
<strong i18n:translate=""> <strong i18n:translate="">
@ -44,7 +44,7 @@
<tal:link i18n:name="label_discussion_control_panel_link"> <tal:link i18n:name="label_discussion_control_panel_link">
<a href="" <a href=""
i18n:translate="text_discussion_type_control_panel_link" 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> >Types control panel</a>
</tal:link> </tal:link>
to choose a workflow for the 'Discussion Item' type. to choose a workflow for the 'Discussion Item' type.

2
plone/app/discussion/browser/moderation.pt
View File

@ -32,7 +32,7 @@
Moderation workflow is disabled. You have to Moderation workflow is disabled. You have to
<a i18n:name="enable_comment_workflow" <a i18n:name="enable_comment_workflow"
i18n:translate="message_enable_comment_workflow" href="" 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 enable the 'Comment Review Workflow' for the Comment content
type</a> before you can moderate comments here. type</a> before you can moderate comments here.
</span> </span>

2
plone/app/discussion/profiles/default/controlpanel.xml
View File

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