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

Merge pull request #43 from plone/remove-dt-dl-dd

Browse Source 
Remove DL's from portal message in templates.
This commit is contained in:
Timo Stollenwerk 2014-05-12 20:52:49 +02:00
commit fd6ac0788b
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.rst
View File

@ -57,6 +57,10 @@ Changelog
2.3.0 (2014-02-22) 2.3.0 (2014-02-22)
------------------ ------------------
- Remove DL's from portal message in templates.
https://github.com/plone/Products.CMFPlone/issues/153
[khink]
- Execute the proper workflow change when using the moderation buttons instead - Execute the proper workflow change when using the moderation buttons instead
of hardcoding the workflow action to always publish of hardcoding the workflow action to always publish
[omiron] [omiron]

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

@ -22,12 +22,12 @@
tal:attributes="src string:${context/portal_url}/++resource++plone.app.discussion.javascripts/controlpanel.js"> tal:attributes="src string:${context/portal_url}/++resource++plone.app.discussion.javascripts/controlpanel.js">
</script> </script>
<dl class="portalMessage warning" <div class="portalMessage warning"
tal:condition="view/mailhost_warning"> tal:condition="view/mailhost_warning">
<dt i18n:translate=""> <strong i18n:translate="">
Warning Warning
</dt> </strong>
<dd i18n:translate="text_no_mailhost_configured"> <span tal:omit-tag="" i18n:translate="text_no_mailhost_configured">
You have not configured a mail host or a site 'From' You have not configured a mail host or a site 'From'
address, various features including contact forms, email address, various features including contact forms, email
notification and password reset will not work. Go to the notification and password reset will not work. Go to the
@ -38,15 +38,15 @@
>Mail control panel</a> >Mail control panel</a>
</tal:link> </tal:link>
to fix this. to fix this.
</dd> </span>
</dl> </div>
<dl class="portalMessage warning" <div class="portalMessage warning"
tal:condition="view/custom_comment_workflow_warning"> tal:condition="view/custom_comment_workflow_warning">
<dt i18n:translate=""> <strong i18n:translate="">
Warning Warning
</dt> </strong>
<dd i18n:translate="text_custom_comment_workflow"> <span tal:omit-tag="" i18n:translate="text_custom_comment_workflow">
You have configured a custom workflow for the 'Discussion Item' You have configured a custom workflow for the 'Discussion Item'
content type. You can enable/disable the comment moderation content type. You can enable/disable the comment moderation
in this control panel only if you use one of the default in this control panel only if you use one of the default
@ -58,15 +58,15 @@
>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.
</dd> </span>
</dl> </div>
<dl class="portalMessage warning" <div class="portalMessage warning"
tal:condition="view/unmigrated_comments_warning"> tal:condition="view/unmigrated_comments_warning">
<dt i18n:translate=""> <strong i18n:translate="">
Warning Warning
</dt> </strong>
<dd i18n:translate="text_unmigrated_comments"> <span tal:omit-tag="" i18n:translate="text_unmigrated_comments">
You have comments that have not been migrated to the new You have comments that have not been migrated to the new
commenting system that has been introduced in Plone 4.1. commenting system that has been introduced in Plone 4.1.
Please Please
@ -77,8 +77,8 @@
>migrate your comments</a> >migrate your comments</a>
</tal:link> </tal:link>
to fix this. to fix this.
</dd> </span>
</dl> </div>
<div metal:use-macro="context/global_statusmessage/macros/portal_message"> <div metal:use-macro="context/global_statusmessage/macros/portal_message">
Portal status message Portal status message

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

@ -25,18 +25,18 @@
Moderate comments Moderate comments
</h1> </h1>
<dl class="portalMessage warning" <div class="portalMessage warning"
tal:condition="not: view/moderation_enabled"> tal:condition="not: view/moderation_enabled">
<dt i18n:domain="plone" i18n:translate="">Warning</dt> <strong i18n:domain="plone" i18n:translate="">Warning</strong>
<dd i18n:translate="message_moderation_disabled"> <span tal:omit-tag="" i18n:translate="message_moderation_disabled">
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}/@@types-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.
</dd> </span>
</dl> </div>
<form tal:condition="not:items"> <form tal:condition="not:items">
<fieldset id="fieldset-moderate-comments" class="formPanel"> <fieldset id="fieldset-moderate-comments" class="formPanel">