Commit Graph

448 Commits

Author SHA1 Message Date
Timo Stollenwerk
9cc32a76a4 Enable ajaxify comment deletion again ([thomasdesvenain]). This has been disabled in 1.0b12 because of problems with Plone 3.
svn path=/plone.app.discussion/trunk/; revision=46970
2011-01-20 19:38:26 +00:00
Timo Stollenwerk
75cde25b6f Always show existing comments, even if commenting is disabled.
svn path=/plone.app.discussion/trunk/; revision=46785
2011-01-07 15:27:17 +00:00
Timo Stollenwerk
61e231b336 Fix CSS for commenter images with a width of more than 2.5em. This fixes http://dev.plone.org/plone/ticket/11391. Refs #11391
svn path=/plone.app.discussion/trunk/; revision=46783
2011-01-07 10:27:13 +00:00
Timo Stollenwerk
c438743a3b Show a 'Comments are moderated.' message next to the comment form if comments are moderated.
svn path=/plone.app.discussion/trunk/; revision=46782
2011-01-07 10:20:24 +00:00
Maurits van Rees
a2a17085a3 Nuke trailing white space
svn path=/plone.app.discussion/trunk/; revision=46366
2010-12-15 23:52:56 +00:00
Maurits van Rees
9eb172023a No tabs in zcml please
svn path=/plone.app.discussion/trunk/; revision=46364
2010-12-15 22:59:24 +00:00
Timo Stollenwerk
4c4cd9e44d Replace XXX with todo.
svn path=/plone.app.discussion/trunk/; revision=46263
2010-12-12 08:14:48 +00:00
Timo Stollenwerk
0485398de0 whitespace, make jslint happy.
svn path=/plone.app.discussion/trunk/; revision=46262
2010-12-12 08:13:03 +00:00
Timo Stollenwerk
be78fbe300 There is no need to enable the "enable moderation" checkbox dynamically, except when commenting is disabled/enabled globally.
svn path=/plone.app.discussion/trunk/; revision=46261
2010-12-12 07:35:43 +00:00
Timo Stollenwerk
08857df7a9 Fix cancel button on edit view when using Dexterity types. This fixes http://dev.plone.org/plone/ticket/11338. Refs #11338
svn path=/plone.app.discussion/trunk/; revision=46254
2010-12-11 21:33:43 +00:00
Timo Stollenwerk
f2f97c5b38 Change the comment workflow setting in the discussion control panel if the setting is changed in the types control panel; show warning message and disable the setting if a custom comment workflow is enabled.
svn path=/plone.app.discussion/trunk/; revision=46253
2010-12-11 21:30:18 +00:00
Timo Stollenwerk
0475376ed0 "Enable comment moderation" setting added to the discussion control panel. Just a proof of concept so far. Not fully implemented yet. No tests.
svn path=/plone.app.discussion/trunk/; revision=46249
2010-12-11 17:18:14 +00:00
Timo Stollenwerk
7e279d3ad3 Make sure the handleComment method checks for the 'Reply to item' permission when adding a comment.
svn path=/plone.app.discussion/trunk/; revision=46212
2010-12-09 08:11:41 +00:00
Timo Stollenwerk
c8e78449a2 Make the mail-setting warning message show up in the discussion control panel.
svn path=/plone.app.discussion/trunk/; revision=46211
2010-12-09 08:07:15 +00:00
Timo Stollenwerk
797ed40852 Link directly to the "Discussion Item" types control panel in the moderation view.
svn path=/plone.app.discussion/trunk/; revision=46207
2010-12-08 17:45:58 +00:00
Timo Stollenwerk
583b25530e Show "moderate comments" link in the admin panel only if a moderation workflow is enabled for comments.
svn path=/plone.app.discussion/trunk/; revision=46206
2010-12-08 17:45:11 +00:00
Timo Stollenwerk
04a0669731 Remove the grey background from disabled settings.
svn path=/plone.app.discussion/trunk/; revision=46142
2010-12-05 14:10:21 +00:00
Timo Stollenwerk
bbd44b7b95 workflow setting added to control panel config string.
svn path=/plone.app.discussion/trunk/; revision=46091
2010-12-02 23:20:10 +00:00
Timo Stollenwerk
ffde4b423d Do not allow to change the mail settings in the discussion control panel, if there is no valid mail setup. Refactor js code to use class settings of #content.
svn path=/plone.app.discussion/trunk/; revision=46090
2010-12-02 23:02:00 +00:00
Timo Stollenwerk
fbd7eb2bbc Do not allow to change the mail settings in the discussion control panel, if there is no valid mail setup.
svn path=/plone.app.discussion/trunk/; revision=46089
2010-12-02 21:07:58 +00:00
Timo Stollenwerk
1b36f99a7a make jslint happy; disable settings onload;
svn path=/plone.app.discussion/trunk/; revision=46088
2010-12-02 19:49:49 +00:00
Timo Stollenwerk
2a7a65293e disable form fields when disabling the fields.
svn path=/plone.app.discussion/trunk/; revision=46087
2010-12-02 19:09:16 +00:00
Timo Stollenwerk
f97c17e62a Factor out enable/disable settings function.
svn path=/plone.app.discussion/trunk/; revision=46086
2010-12-02 18:50:21 +00:00
Timo Stollenwerk
ffcc29a401 Override the default plone.app.registry controlpanel template; JS file for the controlpanel added. Disable all commenting options in the discussion control panel when comments are disabled globally.
svn path=/plone.app.discussion/trunk/; revision=46085
2010-12-02 18:15:47 +00:00
Timo Stollenwerk
c311a4f88d Check for the 'review comments' permission instead of 'manage' to decide if the user should see a 'this comment is pending' message.
svn path=/plone.app.discussion/trunk/; revision=46050
2010-12-01 06:34:05 +00:00
Timo Stollenwerk
13772c6e5b Redirect back to the discussion control panel when the discussion control panel form is submitted.
svn path=/plone.app.discussion/trunk/; revision=46040
2010-11-30 09:06:46 +00:00
Timo Stollenwerk
824ed1e94a Fix document_byline bottom margin if commenter images are disabled.
svn path=/plone.app.discussion/trunk/; revision=46037
2010-11-30 07:33:22 +00:00
Timo Stollenwerk
0c94707743 Dynamically show the comment formatting message dependent on the text transform setting.
svn path=/plone.app.discussion/trunk/; revision=46035
2010-11-29 22:42:20 +00:00
David Glick
4c31afeac2 fix comparison of string to integer which broke 'check all'
svn path=/plone.app.discussion/trunk/; revision=45926
2010-11-23 18:53:38 +00:00
Timo Stollenwerk
5b788d1156 Merge 'Convert anonymous-supplied name to unicode as done for authenticated members.' from jarn-unicode branch.
svn path=/plone.app.discussion/trunk/; revision=45662
2010-11-08 17:09:26 +00:00
Timo Stollenwerk
501cee78e2 ".comment" and ".replyTreeLevel0" are both CSS classes of the comment div. Fix for Plone 3 only.
svn path=/plone.app.discussion/trunk/; revision=45189
2010-11-04 14:50:30 +00:00
Timo Stollenwerk
823ada7491 Remove AJAX comment deletion binding. This function relies on the nextUntil() selector introduced by jQuery 1.4 and therefore breaks in Plone 3 (that currently uses jQuery 1.3.2).
svn path=/plone.app.discussion/trunk/; revision=45188
2010-11-04 14:42:32 +00:00
Timo Stollenwerk
b68da9925b Use parseInt with second param to make jslint happy.
svn path=/plone.app.discussion/trunk/; revision=45187
2010-11-04 14:37:18 +00:00
Timo Stollenwerk
b95707ac52 Re-add the CommentsViewlet can_manage method. This method has been removed in version 1.0b9 and added again in 1.0b11 because we don't want to change the API in beta releases.
svn path=/plone.app.discussion/trunk/; revision=45110
2010-11-03 11:26:18 +00:00
Timo Stollenwerk
cc96acb50a Ajaxify comment deletion and approval. thanks thomasdesvenain!
svn path=/plone.app.discussion/trunk/; revision=40984
2010-10-30 17:32:31 +00:00
Timo Stollenwerk
82afd3ef15 New feature: As a logged-in user, I can enable/disable email notification of additional comments on this content object.
svn path=/plone.app.discussion/trunk/; revision=40949
2010-10-30 15:02:05 +00:00
Timo Stollenwerk
81dcdeaea3 Disable the plone.app.registry check on schema elements, so no error is raised on upgrades. This fixes https://dev.plone.org/plone/ticket/11195. Refs #11195
svn path=/plone.app.discussion/trunk/; revision=40868
2010-10-29 10:43:46 +00:00
Timo Stollenwerk
f6b7ef1bcb Remove the too generic id attribute of the comment form.
svn path=/plone.app.discussion/trunk/; revision=40858
2010-10-28 10:30:10 +00:00
Timo Stollenwerk
777e687169 Rename the id of the comment form from "form" to "comment-form".
svn path=/plone.app.discussion/trunk/; revision=40857
2010-10-28 09:45:34 +00:00
Timo Stollenwerk
22e4189c37 Revert revisions r40851 to r40853, they should have gone into the ajax-ui branch.
svn path=/plone.app.discussion/trunk/; revision=40856
2010-10-28 09:39:00 +00:00
Timo Stollenwerk
14e2600a79 Make ajax call for delete comment button work for comment replies.
svn path=/plone.app.discussion/trunk/; revision=40853
2010-10-27 16:10:04 +00:00
Timo Stollenwerk
926e4f6b8e Integrate Denys ajax ui code.
svn path=/plone.app.discussion/trunk/; revision=40852
2010-10-27 14:44:52 +00:00
Timo Stollenwerk
79f4481722 Use "#comment-form" as id for the comment form instead of "#form" which is too generic.
svn path=/plone.app.discussion/trunk/; revision=40851
2010-10-27 14:44:06 +00:00
Hanno Schlichting
aa8a1ea934 Fixed handling of non-ascii member data, like fullname and email.
svn path=/plone.app.discussion/trunk/; revision=40789
2010-10-22 10:14:07 +00:00
Radim Novotny
18e92f7a85 - Fixed "global name 'WrongCaptchaCode' is not defined" if norobots captcha,
but no other validation package is installed.

svn path=/plone.app.discussion/trunk/; revision=40574
2010-10-09 11:13:28 +00:00
Timo Stollenwerk
6e9bb4a9cd Check the review_state to decide if moderation is enabled. If the current comment workflow implements a 'pending' state, moderation is enabled. Refs #11184.
svn path=/plone.app.discussion/trunk/; revision=40569
2010-10-08 10:22:40 +00:00
Timo Stollenwerk
2790e6d4eb Check the review_state instead of the workflow after a comment has been posted to decide if a message is shown to the user. This allows integrators to use custom review workflows. Refs #11184
svn path=/plone.app.discussion/trunk/; revision=40566
2010-10-08 09:53:00 +00:00
Timo Stollenwerk
94584429fd Do not use has_key.
svn path=/plone.app.discussion/trunk/; revision=40536
2010-10-06 14:12:30 +00:00
Timo Stollenwerk
4bbfe677e4 Replace the can_manage method with a can_review method that checks the 'Review comments' permission. This fixes http://dev.plone.org/plone/ticket/11145.
svn path=/plone.app.discussion/trunk/; revision=40534
2010-10-06 13:55:57 +00:00
Timo Stollenwerk
7de585542b Fix moderation actions (publish, delete) in the moderation view with virtual hosts. This is a replacement for http://dev.plone.org/plone/changeset/35608.
svn path=/plone.app.discussion/trunk/; revision=40518
2010-10-05 15:21:54 +00:00
Timo Stollenwerk
b984a445d5 Inline documentation for moderation view added.
svn path=/plone.app.discussion/trunk/; revision=40517
2010-10-05 15:14:12 +00:00
Timo Stollenwerk
837e6b2966 Do not show two "login to add comments" buttons when there are no comments yet. This fixes http://plone.org/products/plone.app.discussion/issues/12.
svn path=/plone.app.discussion/trunk/; revision=40515
2010-10-05 12:07:08 +00:00
Timo Stollenwerk
6d92d1383c Remove comment title from comments viewlet tests.
svn path=/plone.app.discussion/trunk/; revision=40496
2010-10-03 19:41:02 +00:00
Timo Stollenwerk
603bcf3547 Ignore certain lines for code coverage.
svn path=/plone.app.discussion/trunk/; revision=40494
2010-10-03 16:52:26 +00:00
Timo Stollenwerk
497c2a075e There is no need to set the title in the handleComment method anymore.
svn path=/plone.app.discussion/trunk/; revision=40492
2010-10-03 07:29:44 +00:00
Timo Stollenwerk
689fd26c12 Apply the comment viewlet template and styles to the new title-less comments. This might require integrators to apply their custom templates and styles.
svn path=/plone.app.discussion/trunk/; revision=40433
2010-09-29 08:13:54 +00:00
Timo Stollenwerk
8d00463502 Remove subject line from comment batch moderation view, since this doesn't make sense anymore with auto-generated titles.
svn path=/plone.app.discussion/trunk/; revision=40432
2010-09-29 08:02:39 +00:00
Timo Stollenwerk
f67c7cde6d Remove title field from the comment form and replace it with an auto-generated title ("John Doe on Welcome to Plone").
This also fixes http://dev.plone.org/plone/ticket/11098

svn path=/plone.app.discussion/trunk/; revision=40431
2010-09-29 07:56:36 +00:00
Timo Stollenwerk
ad99e45203 Revert r35608 since this was breaking the comment moderation bulk actions. The BulkActionsView expects the absolute path of the comments without the portal url (e.g. '/plone/doc1/++conversation++default/1285346769126020'). This fixes https://dev.plone.org/plone/ticket/11156.
svn path=/plone.app.discussion/trunk/; revision=40227
2010-09-24 17:04:24 +00:00
Timo Stollenwerk
2ff95fe847 Make sure the moderation JS functions are executed after the page is fully loaded.
svn path=/plone.app.discussion/trunk/; revision=40215
2010-09-24 14:57:19 +00:00
Timo Stollenwerk
399bba5eca Use "(function($) { /* some code that uses $ */ })(jQuery)" instead of "$(document).ready(function(){ /* some code that uses $ */ });" to invoke jQuery code.
svn path=/plone.app.discussion/trunk/; revision=40214
2010-09-24 14:21:26 +00:00
Timo Stollenwerk
6b4fd0f0c1 Ignore certain lines for code coverage.
svn path=/plone.app.discussion/trunk/; revision=40083
2010-09-20 10:03:55 +00:00
Timo Stollenwerk
e8a4caa5db Some more tests for moderation bulk actions.
svn path=/plone.app.discussion/trunk/; revision=39945
2010-09-16 15:42:27 +00:00
Timo Stollenwerk
8d866a0ff6 Tests for moderate comments bulk actions added.
svn path=/plone.app.discussion/trunk/; revision=39942
2010-09-16 14:58:11 +00:00
Timo Stollenwerk
3d594a934d Captcha plugin support for collective.z3cform.norobots added.
svn path=/plone.app.discussion/trunk/; revision=39848
2010-09-10 13:02:56 +00:00
Patrick Gerken
823da240d8 Change datetime conversion to handle TZ
The way it happens now, the timezone gets corrected

svn path=/plone.app.discussion/trunk/; revision=39728
2010-09-07 12:03:31 +00:00
Timo Stollenwerk
0358a03d5b Fetch context for the comment view with "context = aq_inner(self.context)". This fixes a failing Plone 3 test.
svn path=/plone.app.discussion/trunk/; revision=39678
2010-09-06 10:38:54 +00:00
Timo Stollenwerk
ea13020498 Raise an unauthorized error when authenticated users try to post a comment on a content object that has discussion disabled. Thanks to vincentfrentin for reporting this!
svn path=/plone.app.discussion/trunk/; revision=39627
2010-09-03 20:40:27 +00:00
Timo Stollenwerk
87ce946947 Removed unused imports. Raise ImportError when import fails.
svn path=/plone.app.discussion/trunk/; revision=39571
2010-08-31 17:36:28 +00:00
Timo Stollenwerk
77d3bc2eb1 Obey the 80 chars limit.
svn path=/plone.app.discussion/trunk/; revision=39570
2010-08-31 17:33:22 +00:00
Timo Stollenwerk
d59369a408 Obey the 80 chars limit.
svn path=/plone.app.discussion/trunk/; revision=39569
2010-08-31 17:31:27 +00:00
Timo Stollenwerk
dc160f9d5e Obey the 80 chars limit in the comments view.
svn path=/plone.app.discussion/trunk/; revision=39332
2010-08-28 20:19:58 +00:00
Timo Stollenwerk
785b006394 Obey the 80 chars limit in the migration function.
svn path=/plone.app.discussion/trunk/; revision=39331
2010-08-28 20:18:36 +00:00
Timo Stollenwerk
632e167806 revert 39237 since this breaks some tests.
svn path=/plone.app.discussion/trunk/; revision=39330
2010-08-28 20:10:48 +00:00
Timo Stollenwerk
a2a8956d09 Obey the 80 char limit.
svn path=/plone.app.discussion/trunk/; revision=39327
2010-08-28 20:02:08 +00:00
Timo Stollenwerk
cef90c576b remove author_username variable, because it is unused.
svn path=/plone.app.discussion/trunk/; revision=39325
2010-08-28 19:54:57 +00:00
Timo Stollenwerk
87b2c5dd02 Comment out author_notification because we don't use it right now.
svn path=/plone.app.discussion/trunk/; revision=39324
2010-08-28 19:51:53 +00:00
Timo Stollenwerk
4390b8929b Revert r39314. zptlint failed as expected. hudson integration works!
svn path=/plone.app.discussion/trunk/; revision=39319
2010-08-28 19:31:17 +00:00
Timo Stollenwerk
133da3d305 BREAK templates to check if zptlint in hudson works. Will be reverted immediately.
svn path=/plone.app.discussion/trunk/; revision=39314
2010-08-28 19:19:27 +00:00
Timo Stollenwerk
ba8e7ac5cd Move the functions out of the ready function. this makes the JS tests pass.
svn path=/plone.app.discussion/trunk/; revision=39151
2010-08-27 21:26:37 +00:00
Timo Stollenwerk
67fb426f08 Javascript doc added.
svn path=/plone.app.discussion/trunk/; revision=39146
2010-08-27 20:52:38 +00:00
Timo Stollenwerk
a1605fb88b Revert r39104 since it breaks the comments js.
svn path=/plone.app.discussion/trunk/; revision=39141
2010-08-27 20:45:11 +00:00
Timo Stollenwerk
d713409aa1 Use a discussion JS namespace for comments.js; JS tests for clearForm and createReplyForm functions added.
svn path=/plone.app.discussion/trunk/; revision=39104
2010-08-27 17:11:25 +00:00
Timo Stollenwerk
d3074fa4fd Make Javascripts pass JSLint validation
svn path=/plone.app.discussion/trunk/; revision=39059
2010-08-27 10:34:42 +00:00
Timo Stollenwerk
a2c89ed5e8 Plain text and intelligent text options for comment text added to preserve basic text structure and to make links clickable.
svn path=/plone.app.discussion/trunk/; revision=38931
2010-08-25 14:03:29 +00:00
Timo Stollenwerk
35d7743b7a Plain text to HTML transformation added for comment text
svn path=/plone.app.discussion/trunk/; revision=38898
2010-08-25 09:19:28 +00:00
Vincent Fretin
17fce9d515 Rewrote all tal:condition in comments.pt. The authenticated user has
the reply button and the comment form if he has the "Reply to item"
permission and the conversation is currently enabled.

Warning:
There is a security hole at the moment. Any authenticated user having the
zope2.View permission or anonymous user without captcha can add a comment
by creating a post request.

svn path=/plone.app.discussion/trunk/; revision=38888
2010-08-24 11:25:17 +00:00
Timo Stollenwerk
7a2f1ff12b Fix indentation.
svn path=/plone.app.discussion/trunk/; revision=38665
2010-08-09 12:42:21 +00:00
Timo Stollenwerk
d37d5aa9f5 Redirect to the comment form action instead of the absolute url when a comment is posted. This fixes the accidentially triggered file upload when a comment is posted on a file content object.
svn path=/plone.app.discussion/trunk/; revision=38664
2010-08-09 12:25:14 +00:00
Vincent Fretin
fd6a8e0fd8 * Renamed legend_add_comment to label_add_comment to have the translation from
plone domain.
* label_comment_by and label_commented_at are not in Plone 4 translation anymore, so
  these two messages moved to plone.app.discussions i18n domain.

svn path=/plone.app.discussion/trunk/; revision=38574
2010-08-06 15:33:34 +00:00
Vincent Fretin
733c3439ca Translate "Warning" shown in @@moderate-comments in the plone domain.
svn path=/plone.app.discussion/trunk/; revision=38568
2010-08-06 10:46:37 +00:00
Vincent Fretin
d2b19deeac use double quotes
svn path=/plone.app.discussion/trunk/; revision=38565
2010-08-06 10:01:52 +00:00
Vincent Fretin
c1e861e969 Fixed i18n markup of message_moderation_disabled.
svn path=/plone.app.discussion/trunk/; revision=38564
2010-08-06 09:51:23 +00:00
Vincent Fretin
27710ca541 It's 'Allow comments', not 'enable moderation'
svn path=/plone.app.discussion/trunk/; revision=38563
2010-08-06 09:34:05 +00:00
Timo Stollenwerk
27a2d3fa36 Use only one MessageFactory.
svn path=/plone.app.discussion/trunk/; revision=38551
2010-08-05 18:40:22 +00:00
Timo Stollenwerk
f72972844d Call the CaptchaValidator even when no captcha data was submitted. This is necessary to ensure that the collective.akismet validator is called when installed.
svn path=/plone.app.discussion/trunk/; revision=38541
2010-08-05 15:36:07 +00:00
Timo Stollenwerk
0925a63c15 Unnecessary imports removed.
svn path=/plone.app.discussion/trunk/; revision=38139
2010-07-19 08:25:37 +00:00
Timo Stollenwerk
88ce860aa5 Use self.form instead of CommentForm for the CommentsViewlet update method so integrators don't have to override the viewlet's update method. [Matous]
svn path=/plone.app.discussion/trunk/; revision=37916
2010-07-16 15:26:01 +00:00
Timo Stollenwerk
85d5b823b0 Remove collective.akismet from the captcha documentation.
svn path=/plone.app.discussion/trunk/; revision=37915
2010-07-16 15:08:18 +00:00
Timo Stollenwerk
c3320def88 Make sure the form fields in the reply form are always placed under the field labels; Fix CSS overflow bug that occurs with the new Plone 4.0b5 comment styles
svn path=/plone.app.discussion/trunk/; revision=37774
2010-07-13 13:39:35 +00:00