From 7212f49b3b29a4ca53c0d71e24790b6b891cca09 Mon Sep 17 00:00:00 2001 From: Stefan Antonelli Date: Mon, 15 Feb 2021 17:06:49 +0100 Subject: [PATCH] update markup, fix js for controlpanel --- plone/app/discussion/browser/comments.pt | 233 +++++++++--------- plone/app/discussion/browser/controlpanel.pt | 37 ++- .../browser/javascripts/controlpanel.js | 12 +- plone/app/discussion/browser/moderation.pt | 23 +- 4 files changed, 151 insertions(+), 154 deletions(-) diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt index 0c062da..1e7a8eb 100644 --- a/plone/app/discussion/browser/comments.pt +++ b/plone/app/discussion/browser/comments.pt @@ -14,10 +14,9 @@ tal:condition="python:isDiscussionAllowed or has_replies" i18n:domain="plone"> -
+
-
-
+
-
-
- - +
+ + + -
- - - Poster Name - - - Anonymous - - says: -
- 8/23/2001 12:40:44 PM -
+ +
+ + + ${reply/author_name} + + + + ${reply/author_name} + + + Anonymous + +
+ + + 8/23/2001 12:40:44 PM + +
-
-
- -
- +
+ + + + +
+ +
+ + + Edit + + + + + + + +
+ +
+ + +
- -
-
Delete +
+ + +
- -
- - - - Edit -
- +
-
+ +
- - -
+ + - - -
-
+ id string:${action/id}-${comment_id}; + "> + + + + +
+ +
+ -
-
+ +
@@ -191,8 +198,7 @@
-
+
-
+
Add comment +

You can add a comment by filling out the form below. Plain text formatting. diff --git a/plone/app/discussion/browser/controlpanel.pt b/plone/app/discussion/browser/controlpanel.pt index 798c6dc..2f7b08a 100644 --- a/plone/app/discussion/browser/controlpanel.pt +++ b/plone/app/discussion/browser/controlpanel.pt @@ -6,16 +6,12 @@ metal:use-macro="here/prefs_main_template/macros/master" i18n:domain="plone"> -

-
- - Warning - + + + -
- - Warning - + -

View Title

+
+

View Title

+

Description

+
-
-
- -
+
+
-
+ + diff --git a/plone/app/discussion/browser/javascripts/controlpanel.js b/plone/app/discussion/browser/javascripts/controlpanel.js index 9ff0992..bfb5ba6 100644 --- a/plone/app/discussion/browser/javascripts/controlpanel.js +++ b/plone/app/discussion/browser/javascripts/controlpanel.js @@ -41,9 +41,9 @@ require([ // jshint ignore:line /* Update settings */ $.updateSettings = function () { - var globally_enabled = $('#content').hasClass('globally_enabled'); - var moderation_custom = $('#content').hasClass('moderation_custom'); - var invalid_mail_setup = $('#content').hasClass('invalid_mail_setup'); + var globally_enabled = $('#content-core').hasClass('globally_enabled'); + var moderation_custom = $('#content-core').hasClass('moderation_custom'); + var invalid_mail_setup = $('#content-core').hasClass('invalid_mail_setup'); /* If commenting is globally disabled, disable all settings. */ if (globally_enabled === true) { @@ -115,13 +115,13 @@ require([ // jshint ignore:line // Update settings on page load $.updateSettings(); - // Set #content class and update settings afterwards + // Set #content-core class and update settings afterwards $('#form-widgets-globally_enabled-0').on('change', function(){ if (this.checked) { - $('#content').addClass('globally_enabled'); + $('#content-core').addClass('globally_enabled'); } else { - $('#content').removeClass('globally_enabled'); + $('#content-core').removeClass('globally_enabled'); } $.updateSettings(); }); diff --git a/plone/app/discussion/browser/moderation.pt b/plone/app/discussion/browser/moderation.pt index 6fc31d0..c3d565f 100644 --- a/plone/app/discussion/browser/moderation.pt +++ b/plone/app/discussion/browser/moderation.pt @@ -33,23 +33,18 @@ } -

+

Moderate comments

-
- Warning - - Moderation workflow is disabled. You have to - - enable the 'Comment Review Workflow' for the Comment content - type before you can moderate comments here. - -
+

+ Moderation workflow is disabled. You have to + + enable the 'Comment Review Workflow' for the Comment content + type before you can moderate comments here. +