Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser/comments.pt
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser/comments.pt	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser/comments.pt	(revision 2087)
@@ -48,5 +48,7 @@
                     <span i18n:translate="label_commented_at">at</span>
                     <span tal:replace="python:view.format_time(reply.ModificationDate())">8/23/2001 12:40:44 PM</span>
-                    <span tal:condition="python:ifModerate and not isPublished">[pending]</span>
+                    <span i18n:domain="quintagroup.plonecomments"
+                          i18n:translate="label_pending_state"
+                          tal:condition="python:ifModerate and not isPublished">[pending]</span>
                 </div>
                 <div class="commentBody"
@@ -63,4 +65,6 @@
                            type="submit"
                            value="Reply"
+                           tal:define="onclick string:javascript:render_edit_form(${comment_id},'reply')"
+                           tal:attributes="onclick python:isAjaxReportAbuseEnabled and onclick or ''"
                            i18n:attributes="value label_reply;"
                            />
@@ -75,4 +79,6 @@
                            type="submit"
                            value="Edit"
+                           tal:define="onclick string:javascript:render_edit_form(${comment_id},'edit')"
+                           tal:attributes="onclick python:isAjaxReportAbuseEnabled and onclick or ''"
                            i18n:attributes="value label_edit;"
                            />
@@ -87,30 +93,24 @@
                            type="submit"
                            value="Remove"
+                           tal:define="onclick string:javascript:render_delete_comment(${comment_id})"
+                           tal:attributes="onclick python:isAjaxReportAbuseEnabled and onclick or ''"
                            i18n:attributes="value label_remove;"
                            />
                 </form>
-                <tal:if tal:condition="python:isReportAbuseEnabled and isPublished">
-                    <form class="report_abuse"
-                          name="report_abuse"
-                          method="post"
-                          style="display: inline;"
-                          i18n:domain="quintagroup.plonecomments"
-                          tal:attributes="action string:${reply/absolute_url}/report_abuse_form#discussion">
-                        <input type="hidden" name="comment_id" tal:attributes="value comment_id" />
-                        <input class="standalone"
-                            type="submit"
-                            value="Report Abuse"
-                            tal:define="onclick string:javascript:render_abuse_report_form(${comment_id})"
-                            tal:attributes="onclick python:not isAnon and isAjaxReportAbuseEnabled and onclick or '';
-                                            id string:input-render-abuse-cancel-${comment_id}"
-                            i18n:attributes="value label_report_abuse;"
-                            />
-                    </form>
-                    <span tal:attributes="id string:span-reply-form-holder-${comment_id}"
-                            tal:condition="isReportAbuseEnabled">
-                        <metal:macro use-macro="here/report_abuse_form/macros/form"/>
-                    </span>
-                    <span tal:attributes="id string:span-abuse-count-holder-${comment_id}"></span>
-                </tal:if>
+                <form name="report_abuse"
+                      action=""
+                      method="post"
+                      style="display: inline;"
+                      i18n:domain="quintagroup.plonecomments"
+                      tal:condition="python:isReportAbuseEnabled and isPublished"
+                      tal:attributes="action string:${reply/absolute_url}/report_abuse_form#discussion">
+                    <input class="standalone"
+                        type="submit"
+                        value="Report Abuse"
+                        tal:define="onclick string:javascript:render_edit_form(${comment_id},'report_abuse')"
+                        tal:attributes="onclick python:isAjaxReportAbuseEnabled and onclick or ''"
+                        i18n:attributes="value label_report_abuse;"
+                        />
+                </form>
                 <form name="publish_discussion"
                       action=""
@@ -131,9 +131,27 @@
                      i18n:domain="quintagroup.plonecomments"
                      tal:condition="not:isPublished">Comment must be approved before replies to comment accepted.</div>
+                <span tal:attributes="id string:span-forms-holder-${comment_id}"></span>
             </div>
         </tal:getreplies>
 
         <!-- Start of Adding comment form-->
-        <tal:addcomment define="template_id string:discussion_reply_form;">
+        <form id="reply"
+              name="reply"
+              action=""
+              method="post"
+              tal:condition="python:isAjaxReportAbuseEnabled and userHasReplyPermission and isDiscussionAllowed"
+              tal:attributes="action string:${context/absolute_url}/discussion_reply_form">
+
+              <input class="standalone"
+                     style="margin-bottom: 1.25em;"
+                     type="button"
+                     value="Add Comment"
+                     tal:attributes="onclick string:javascript:render_comment_form()"
+                     i18n:attributes="value label_add_comment;"
+                     />
+        </form>
+
+        <tal:addcomment condition="python:not isAjaxReportAbuseEnabled"
+                        define="template_id string:discussion_reply_form;">
             <metal:block metal:use-macro="here/discussion_reply_form/macros/add-comment-form" />
         </tal:addcomment>
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser/comments.py
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser/comments.py	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser/comments.py	(revision 2087)
@@ -106,68 +106,2 @@
         """ """
         return getToolByName(self.context, 'portal_url')
-
-
-
-class CommentsKSS(PloneKSSView):
-    """ Operations on the report abuse form using KSS.
-    """   
-
-    def submit_abuse_report(self):
-        """ Send an email with the abuse report message and hide abuse report form.
-        """
-        errors = {}
-        context = aq_inner(self.context)
-        request = context.REQUEST
-        portal = getToolByName(self.context, 'portal_url').getPortalObject()
-        if hasattr(context, 'captcha_validator'):
-            dummy_controller_state = ControllerState(
-                                            id='comments.pt',
-                                            context=context,
-                                            button='submit',
-                                            status='success',
-                                            errors={},
-                                            next_action=None,)
-            # get the form controller
-            controller = portal.portal_form_controller
-            # send the validate script to the form controller with the dummy state object
-            controller_state = controller.validate(dummy_controller_state, request, ['captcha_validator',])
-            errors.update(controller_state.errors)
-
-        message = request.get('message')
-        if not message:
-            errors.update({'message': 'Please provide a message'})
-
-        mtool = getToolByName(self.context, "portal_membership")
-        member = mtool.getAuthenticatedMember()
-        comment_id = self.context.request.get('comment_id')
-        ksscore = self.getCommandSet('core')
-        if errors:
-            html = self.macroContent('context/report_abuse_form/macros/form',
-                                     errors=errors,
-                                     show_form=True,
-                                     tabindex=IndexIterator(),
-                                     member=member,
-                                     **request.form)
-            node = ksscore.getHtmlIdSelector('span-reply-form-holder-%s' % comment_id)
-            ksscore.replaceInnerHTML(node,  html)
-            return self.render()
-
-        # report_abuse(context, context, message, comment)
-        manage_mails(context, self.context, 'report_abuse')
-
-        html = self.macroContent('context/report_abuse_form/macros/form',
-                                 tabindex=IndexIterator(),
-                                 member=member,
-                                 **request.form)
-        node = ksscore.getHtmlIdSelector('span-reply-form-holder-%s' % comment_id)
-        html = '<br/><span style="color:red">You have reported this comment for abuse.</span>'
-        self.commands.addCommand('remove_abuse_report_form', 
-                                 node, 
-                                 comment_id=comment_id, 
-                                 html=html)
-
-        node = ksscore.getHtmlIdSelector('div-captcha-%s' % comment_id)
-        html = self.macroContent('context/report_abuse_form/macros/captcha',
-                                 **request.form)
-        ksscore.replaceInnerHTML(node,  html)
-        return self.render()
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/de/LC_MESSAGES/quintagroup.plonecomments.po
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/de/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/de/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2087)
@@ -5,5 +5,5 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-11 16:40+0000\n"
+"POT-Creation-Date: 2010-04-08 15:31+0000\n"
 "PO-Revision-Date: 2006-12-29 11:01+0100\n"
 "Last-Translator: \n"
@@ -36,5 +36,5 @@
 msgstr "Kommentar(e) veröffentlicht."
 
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:228
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:235
 msgid "Could not send the email notification. Have you configured an email server for Plone?"
 msgstr ""
@@ -84,10 +84,10 @@
 
 #. Default: "[${organization_name}] New comment awaits moderation"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:186
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:193
 msgid "approve_notification_subject"
 msgstr ""
 
 #. Default: "Your comment on ${title} is now published"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:114
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:121
 msgid "approve_user_notification_subject"
 msgstr ""
@@ -97,4 +97,9 @@
 msgid "approvemail_new_comment_link"
 msgstr "Bitte schalten Sie den neuen Kommentar auf der Seite ' ${title} ': ${here_url} frei "
+
+#. Default: "You can edit a comment by filling out the form below. Plain text formatting."
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:38
+msgid "description_edit_comment"
+msgstr ""
 
 #. Default: "Enable Manager moderation"
@@ -227,6 +232,11 @@
 msgstr "Email Betreff"
 
+#. Default: "[pending]"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:50
+msgid "label_pending_state"
+msgstr ""
+
 #. Default: "Report Abuse"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:100
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:107
 msgid "label_report_abuse"
 msgstr ""
@@ -235,4 +245,9 @@
 #: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/prefs_comments_setup_form.cpt:96
 msgid "label_require_anonym_email"
+msgstr ""
+
+#. Default: "Edit comment"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:36
+msgid "legend_edit_comment"
 msgstr ""
 
@@ -273,5 +288,5 @@
 
 #. Default: "[${organization_name}] New comment added"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:171
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:178
 msgid "published_notification_subject"
 msgstr ""
@@ -293,10 +308,10 @@
 
 #. Default: "Your comment on ${title} was not approved"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:129
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:136
 msgid "rejected_user_notification_subject"
 msgstr ""
 
 #. Default: "Someone replied to your comment on ${title}"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:145
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:152
 msgid "reply_user_notification_subject"
 msgstr ""
@@ -308,5 +323,5 @@
 
 #. Default: "[${organization_name}] A comment on ${title} has been reported for abuse."
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:211
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:218
 msgid "report_abuse_subject"
 msgstr ""
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/es/LC_MESSAGES/quintagroup.plonecomments.po
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/es/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/es/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2087)
@@ -5,5 +5,5 @@
 msgstr ""
 "Project-Id-Version: qPloneComments\n"
-"POT-Creation-Date: 2010-02-11 16:40+0000\n"
+"POT-Creation-Date: 2010-04-08 15:31+0000\n"
 "PO-Revision-Date: 2007-04-19 20:21-0600\n"
 "Last-Translator: Héctor Velarde <hvelarde@jornada.com.mx>\n"
@@ -36,5 +36,5 @@
 msgstr "Comentario(s) publicados."
 
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:228
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:235
 msgid "Could not send the email notification. Have you configured an email server for Plone?"
 msgstr ""
@@ -84,10 +84,10 @@
 
 #. Default: "[${organization_name}] New comment awaits moderation"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:186
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:193
 msgid "approve_notification_subject"
 msgstr ""
 
 #. Default: "Your comment on ${title} is now published"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:114
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:121
 msgid "approve_user_notification_subject"
 msgstr ""
@@ -97,4 +97,9 @@
 msgid "approvemail_new_comment_link"
 msgstr "Por favor revise el nuevo comentario agregado a la siguiente página ' ${title} ': ${here_url}"
+
+#. Default: "You can edit a comment by filling out the form below. Plain text formatting."
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:38
+msgid "description_edit_comment"
+msgstr ""
 
 #. Default: "Enable Manager moderation"
@@ -227,6 +232,11 @@
 msgstr "Prefijo del asunto del mensaje (nombre de la organización)"
 
+#. Default: "[pending]"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:50
+msgid "label_pending_state"
+msgstr ""
+
 #. Default: "Report Abuse"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:100
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:107
 msgid "label_report_abuse"
 msgstr ""
@@ -235,4 +245,9 @@
 #: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/prefs_comments_setup_form.cpt:96
 msgid "label_require_anonym_email"
+msgstr ""
+
+#. Default: "Edit comment"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:36
+msgid "legend_edit_comment"
 msgstr ""
 
@@ -273,5 +288,5 @@
 
 #. Default: "[${organization_name}] New comment added"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:171
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:178
 msgid "published_notification_subject"
 msgstr ""
@@ -293,10 +308,10 @@
 
 #. Default: "Your comment on ${title} was not approved"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:129
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:136
 msgid "rejected_user_notification_subject"
 msgstr ""
 
 #. Default: "Someone replied to your comment on ${title}"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:145
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:152
 msgid "reply_user_notification_subject"
 msgstr ""
@@ -308,5 +323,5 @@
 
 #. Default: "[${organization_name}] A comment on ${title} has been reported for abuse."
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:211
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:218
 msgid "report_abuse_subject"
 msgstr ""
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/fr/LC_MESSAGES/quintagroup.plonecomments.po
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/fr/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/fr/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2087)
@@ -5,5 +5,5 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-11 16:40+0000\n"
+"POT-Creation-Date: 2010-04-08 15:31+0000\n"
 "PO-Revision-Date: 2006-11-10 08:59-0500\n"
 "Last-Translator: Nicole Turgeon-Courchesne <nicole@motspourmaux.com>\n"
@@ -36,5 +36,5 @@
 msgstr "Commentaires publiés"
 
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:228
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:235
 msgid "Could not send the email notification. Have you configured an email server for Plone?"
 msgstr ""
@@ -84,10 +84,10 @@
 
 #. Default: "[${organization_name}] New comment awaits moderation"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:186
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:193
 msgid "approve_notification_subject"
 msgstr ""
 
 #. Default: "Your comment on ${title} is now published"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:114
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:121
 msgid "approve_user_notification_subject"
 msgstr ""
@@ -97,4 +97,9 @@
 msgid "approvemail_new_comment_link"
 msgstr "Réviser le nouveau commentaire ajouté à la page suivante  ' ${title} ': ${here_url}"
+
+#. Default: "You can edit a comment by filling out the form below. Plain text formatting."
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:38
+msgid "description_edit_comment"
+msgstr ""
 
 #. Default: "Enable Manager moderation"
@@ -227,6 +232,11 @@
 msgstr "Préfixe de l’objet du courriel (nom de l’organisme)"
 
+#. Default: "[pending]"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:50
+msgid "label_pending_state"
+msgstr ""
+
 #. Default: "Report Abuse"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:100
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:107
 msgid "label_report_abuse"
 msgstr ""
@@ -235,4 +245,9 @@
 #: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/prefs_comments_setup_form.cpt:96
 msgid "label_require_anonym_email"
+msgstr ""
+
+#. Default: "Edit comment"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:36
+msgid "legend_edit_comment"
 msgstr ""
 
@@ -273,5 +288,5 @@
 
 #. Default: "[${organization_name}] New comment added"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:171
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:178
 msgid "published_notification_subject"
 msgstr ""
@@ -293,10 +308,10 @@
 
 #. Default: "Your comment on ${title} was not approved"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:129
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:136
 msgid "rejected_user_notification_subject"
 msgstr ""
 
 #. Default: "Someone replied to your comment on ${title}"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:145
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:152
 msgid "reply_user_notification_subject"
 msgstr ""
@@ -308,5 +323,5 @@
 
 #. Default: "[${organization_name}] A comment on ${title} has been reported for abuse."
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:211
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:218
 msgid "report_abuse_subject"
 msgstr ""
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/it/LC_MESSAGES/quintagroup.plonecomments.po
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/it/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/it/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2087)
@@ -5,5 +5,5 @@
 msgstr ""
 "Project-Id-Version: qPloneComments\n"
-"POT-Creation-Date: 2010-02-11 16:40+0000\n"
+"POT-Creation-Date: 2010-04-08 15:31+0000\n"
 "PO-Revision-Date: 2007-04-19 20:21-0600\n"
 "Last-Translator: Yuri Carrer <yurj@alfa.it>\n"
@@ -36,5 +36,5 @@
 msgstr "Commento(i) pubblicati"
 
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:228
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:235
 msgid "Could not send the email notification. Have you configured an email server for Plone?"
 msgstr ""
@@ -84,10 +84,10 @@
 
 #. Default: "[${organization_name}] New comment awaits moderation"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:186
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:193
 msgid "approve_notification_subject"
 msgstr ""
 
 #. Default: "Your comment on ${title} is now published"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:114
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:121
 msgid "approve_user_notification_subject"
 msgstr ""
@@ -97,4 +97,9 @@
 msgid "approvemail_new_comment_link"
 msgstr "Per favore modera il commento inserito nella pagina ' ${title} ': ${hete_url}"
+
+#. Default: "You can edit a comment by filling out the form below. Plain text formatting."
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:38
+msgid "description_edit_comment"
+msgstr ""
 
 #. Default: "Enable Manager moderation"
@@ -227,6 +232,11 @@
 msgstr "Prefisso del messaggio (nome dell' organizzazione)"
 
+#. Default: "[pending]"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:50
+msgid "label_pending_state"
+msgstr ""
+
 #. Default: "Report Abuse"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:100
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:107
 msgid "label_report_abuse"
 msgstr ""
@@ -235,4 +245,9 @@
 #: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/prefs_comments_setup_form.cpt:96
 msgid "label_require_anonym_email"
+msgstr ""
+
+#. Default: "Edit comment"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:36
+msgid "legend_edit_comment"
 msgstr ""
 
@@ -273,5 +288,5 @@
 
 #. Default: "[${organization_name}] New comment added"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:171
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:178
 msgid "published_notification_subject"
 msgstr ""
@@ -293,10 +308,10 @@
 
 #. Default: "Your comment on ${title} was not approved"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:129
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:136
 msgid "rejected_user_notification_subject"
 msgstr ""
 
 #. Default: "Someone replied to your comment on ${title}"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:145
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:152
 msgid "reply_user_notification_subject"
 msgstr ""
@@ -308,5 +323,5 @@
 
 #. Default: "[${organization_name}] A comment on ${title} has been reported for abuse."
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:211
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:218
 msgid "report_abuse_subject"
 msgstr ""
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/nl/LC_MESSAGES/quintagroup.plonecomments.po
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/nl/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/nl/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2087)
@@ -4,5 +4,5 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-11 16:40+0000\n"
+"POT-Creation-Date: 2010-04-08 15:31+0000\n"
 "PO-Revision-Date: 2006-12-29 11:01+0100\n"
 "Last-Translator: Kees Hink\n"
@@ -35,5 +35,5 @@
 msgstr ""
 
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:228
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:235
 msgid "Could not send the email notification. Have you configured an email server for Plone?"
 msgstr ""
@@ -83,10 +83,10 @@
 
 #. Default: "[${organization_name}] New comment awaits moderation"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:186
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:193
 msgid "approve_notification_subject"
 msgstr ""
 
 #. Default: "Your comment on ${title} is now published"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:114
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:121
 msgid "approve_user_notification_subject"
 msgstr ""
@@ -96,4 +96,9 @@
 msgid "approvemail_new_comment_link"
 msgstr "Bekijk alstublieft het commentaar op de volgende pagina ' ${title} ': ${here_url} "
+
+#. Default: "You can edit a comment by filling out the form below. Plain text formatting."
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:38
+msgid "description_edit_comment"
+msgstr ""
 
 #. Default: "Enable Manager moderation"
@@ -226,6 +231,11 @@
 msgstr "Voorvoegsel in onderwerp van email (naam van organisatie)"
 
+#. Default: "[pending]"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:50
+msgid "label_pending_state"
+msgstr ""
+
 #. Default: "Report Abuse"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:100
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:107
 msgid "label_report_abuse"
 msgstr ""
@@ -236,4 +246,9 @@
 msgstr "Anonieme inzenders moeten hun e-mailadres opgeven."
 
+#. Default: "Edit comment"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:36
+msgid "legend_edit_comment"
+msgstr ""
+
 #. Default: "Email Notification Options"
 #: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/prefs_comments_setup_form.cpt:255
@@ -272,5 +287,5 @@
 
 #. Default: "[${organization_name}] New comment added"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:171
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:178
 msgid "published_notification_subject"
 msgstr ""
@@ -292,10 +307,10 @@
 
 #. Default: "Your comment on ${title} was not approved"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:129
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:136
 msgid "rejected_user_notification_subject"
 msgstr ""
 
 #. Default: "Someone replied to your comment on ${title}"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:145
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:152
 msgid "reply_user_notification_subject"
 msgstr ""
@@ -307,5 +322,5 @@
 
 #. Default: "[${organization_name}] A comment on ${title} has been reported for abuse."
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:211
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:218
 msgid "report_abuse_subject"
 msgstr ""
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/pt-br/LC_MESSAGES/quintagroup.plonecomments.po
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/pt-br/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/pt-br/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2087)
@@ -3,5 +3,5 @@
 msgstr ""
 "Project-Id-Version: qPloneComments\n"
-"POT-Creation-Date: 2010-02-11 16:40+0000\n"
+"POT-Creation-Date: 2010-04-08 15:31+0000\n"
 "PO-Revision-Date: 2008-07-18 03:51-0300\n"
 "Last-Translator: Érico Andrei <erico@simplesconsultoria.com.br>\n"
@@ -33,5 +33,5 @@
 msgstr "Comentário(s) publicado(s)"
 
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:228
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:235
 msgid "Could not send the email notification. Have you configured an email server for Plone?"
 msgstr ""
@@ -81,10 +81,10 @@
 
 #. Default: "[${organization_name}] New comment awaits moderation"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:186
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:193
 msgid "approve_notification_subject"
 msgstr ""
 
 #. Default: "Your comment on ${title} is now published"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:114
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:121
 msgid "approve_user_notification_subject"
 msgstr ""
@@ -94,4 +94,9 @@
 msgid "approvemail_new_comment_link"
 msgstr "Por favor avalie o novo comentário adicionado à página ' ${title} ': ${here_url}"
+
+#. Default: "You can edit a comment by filling out the form below. Plain text formatting."
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:38
+msgid "description_edit_comment"
+msgstr ""
 
 #. Default: "Enable Manager moderation"
@@ -224,6 +229,11 @@
 msgstr "Prefixo do assunto do e-mail (nome do site)"
 
+#. Default: "[pending]"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:50
+msgid "label_pending_state"
+msgstr ""
+
 #. Default: "Report Abuse"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:100
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:107
 msgid "label_report_abuse"
 msgstr ""
@@ -234,4 +244,9 @@
 msgstr "Requerer e-mail de usuários anônimos."
 
+#. Default: "Edit comment"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:36
+msgid "legend_edit_comment"
+msgstr ""
+
 #. Default: "Email Notification Options"
 #: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/prefs_comments_setup_form.cpt:255
@@ -270,5 +285,5 @@
 
 #. Default: "[${organization_name}] New comment added"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:171
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:178
 msgid "published_notification_subject"
 msgstr ""
@@ -290,10 +305,10 @@
 
 #. Default: "Your comment on ${title} was not approved"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:129
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:136
 msgid "rejected_user_notification_subject"
 msgstr ""
 
 #. Default: "Someone replied to your comment on ${title}"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:145
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:152
 msgid "reply_user_notification_subject"
 msgstr ""
@@ -305,5 +320,5 @@
 
 #. Default: "[${organization_name}] A comment on ${title} has been reported for abuse."
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:211
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:218
 msgid "report_abuse_subject"
 msgstr ""
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/quintagroup.plonecomments.pot
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/quintagroup.plonecomments.pot	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/quintagroup.plonecomments.pot	(revision 2087)
@@ -5,5 +5,5 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-11 16:40+0000\n"
+"POT-Creation-Date: 2010-04-08 15:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -35,5 +35,5 @@
 msgstr ""
 
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:228
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:235
 msgid "Could not send the email notification. Have you configured an email server for Plone?"
 msgstr ""
@@ -83,10 +83,10 @@
 
 #. Default: "[${organization_name}] New comment awaits moderation"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:186
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:193
 msgid "approve_notification_subject"
 msgstr ""
 
 #. Default: "Your comment on ${title} is now published"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:114
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:121
 msgid "approve_user_notification_subject"
 msgstr ""
@@ -95,4 +95,9 @@
 #: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/approve_comment_template.pt:10
 msgid "approvemail_new_comment_link"
+msgstr ""
+
+#. Default: "You can edit a comment by filling out the form below. Plain text formatting."
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:38
+msgid "description_edit_comment"
 msgstr ""
 
@@ -226,6 +231,11 @@
 msgstr ""
 
+#. Default: "[pending]"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:50
+msgid "label_pending_state"
+msgstr ""
+
 #. Default: "Report Abuse"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:100
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:107
 msgid "label_report_abuse"
 msgstr ""
@@ -236,4 +246,9 @@
 msgstr ""
 
+#. Default: "Edit comment"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:36
+msgid "legend_edit_comment"
+msgstr ""
+
 #. Default: "Email Notification Options"
 #: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/prefs_comments_setup_form.cpt:255
@@ -272,5 +287,5 @@
 
 #. Default: "[${organization_name}] New comment added"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:171
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:178
 msgid "published_notification_subject"
 msgstr ""
@@ -291,10 +306,10 @@
 
 #. Default: "Your comment on ${title} was not approved"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:129
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:136
 msgid "rejected_user_notification_subject"
 msgstr ""
 
 #. Default: "Someone replied to your comment on ${title}"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:145
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:152
 msgid "reply_user_notification_subject"
 msgstr ""
@@ -306,5 +321,5 @@
 
 #. Default: "[${organization_name}] A comment on ${title} has been reported for abuse."
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:211
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:218
 msgid "report_abuse_subject"
 msgstr ""
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/uk/LC_MESSAGES/quintagroup.plonecomments.po
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/uk/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales/uk/LC_MESSAGES/quintagroup.plonecomments.po	(revision 2087)
@@ -7,5 +7,5 @@
 msgstr ""
 "Project-Id-Version: qPloneComments\n"
-"POT-Creation-Date: 2010-02-11 16:40+0000\n"
+"POT-Creation-Date: 2010-04-08 15:31+0000\n"
 "PO-Revision-Date: 2008-09-22 10:55+0300\n"
 "Last-Translator: Olha <olha.pelishok@gmail.com>\n"
@@ -39,5 +39,5 @@
 msgstr "Коментар(і) опубліковано."
 
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:228
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:235
 msgid "Could not send the email notification. Have you configured an email server for Plone?"
 msgstr "Не вдалося відправити повідомлення по електронній пошті. Ви налаштували сервер електронної пошти для Plone?"
@@ -87,10 +87,10 @@
 
 #. Default: "[${organization_name}] New comment awaits moderation"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:186
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:193
 msgid "approve_notification_subject"
 msgstr "[${organization_name}] Новий коментар очікує на модерацію"
 
 #. Default: "Your comment on ${title} is now published"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:114
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:121
 msgid "approve_user_notification_subject"
 msgstr "Ваш коментар на ${title} тепер опублікований"
@@ -100,4 +100,9 @@
 msgid "approvemail_new_comment_link"
 msgstr "Будь-ласка, перегляньте новий коментар, доданий до сторінки ' ${title} ': ${here_url}"
+
+#. Default: "You can edit a comment by filling out the form below. Plain text formatting."
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:38
+msgid "description_edit_comment"
+msgstr "Ви можете редагувати коментар, заповнивши форму нижче."
 
 #. Default: "Enable Manager moderation"
@@ -230,6 +235,11 @@
 msgstr "Префікс заголовка електронних листів (назва організації)"
 
+#. Default: "[pending]"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:50
+msgid "label_pending_state"
+msgstr "[в очікуванні]"
+
 #. Default: "Report Abuse"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:100
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/browser/comments.pt:107
 msgid "label_report_abuse"
 msgstr "Надіслати скаргу"
@@ -239,4 +249,9 @@
 msgid "label_require_anonym_email"
 msgstr "Вимагати електронну адресу від Анонімного користувача."
+
+#. Default: "Edit comment"
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:36
+msgid "legend_edit_comment"
+msgstr "Редагувати коментар"
 
 #. Default: "Email Notification Options"
@@ -290,5 +305,5 @@
 
 #. Default: "[${organization_name}] New comment added"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:171
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:178
 msgid "published_notification_subject"
 msgstr "[${organization_name}] Доданий новий коментар"
@@ -310,10 +325,10 @@
 
 #. Default: "Your comment on ${title} was not approved"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:129
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:136
 msgid "rejected_user_notification_subject"
 msgstr "Ваш коментар на ${title} відхилений"
 
 #. Default: "Someone replied to your comment on ${title}"
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:145
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:152
 msgid "reply_user_notification_subject"
 msgstr "Хтось відповів на ваш коментар на ${title}"
@@ -325,5 +340,5 @@
 
 #. Default: "[${organization_name}] A comment on ${title} has been reported for abuse."
-#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:211
+#: ./quintagroup.plonecomments/quintagroup/plonecomments/utils.py:218
 msgid "report_abuse_subject"
 msgstr "[${organization_name}] Коментар на ${title} повідомлений як образливий."
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt	(revision 2087)
@@ -34,6 +34,8 @@
         <fieldset>
 
-            <legend i18n:translate="legend_edit_comment">Edit comment</legend>
-            <p i18n:translate="description_edit_comment">
+            <legend i18n:domain="quintagroup.plonecomments"
+                    i18n:translate="legend_edit_comment">Edit comment</legend>
+            <p i18n:domain="quintagroup.plonecomments"
+               i18n:translate="description_edit_comment">
                 You can edit a comment by filling out the form below. Plain text
                 formatting.
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_reply_form.cpt
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_reply_form.cpt	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_reply_form.cpt	(revision 2087)
@@ -252,4 +252,9 @@
                        i18n:attributes="value label_save;"
                        tal:attributes="name string:discussion_reply:method;" />
+                <input class="standalone"
+                       type="submit"
+                       value="Cancel"
+                       name="form.button.Cancel"
+                       i18n:attributes="value label_cancel;" />
 
             </div>
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_reply_form.cpt.metadata
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_reply_form.cpt.metadata	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_reply_form.cpt.metadata	(revision 2087)
@@ -4,6 +4,8 @@
 [validators]
 validators = validate_talkback
+validators..Cancel=
 
 [actions]
-action.success = traverse_to:string:discussion_reply
+action.success = redirect_to:string:view
+action.success..Save = traverse_to:string:discussion_reply
 action.failure = traverse_to:string:discussion_reply_form
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/qcomments.js
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/qcomments.js	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/qcomments.js	(revision 2087)
@@ -1,34 +1,53 @@
-function render_abuse_report_form(comment_id) {
-    jq('form.report_abuse').bind("submit", function(event){
+function render_edit_form(comment_id, form_name) {
+    var cholder = jq("#"+comment_id).parent();
+    var cform = jq("form[name='"+form_name+"']",cholder);
+    var url = jq(cform).attr("action");
+    var cspan = jq("#span-forms-holder-"+comment_id);
+    cspan.hide().empty()
+    jq(cform).bind("submit", function(event){
         event.preventDefault();
     });
-    var render_button = 'input#input-render-abuse-cancel-' + comment_id;
-    jq(render_button).attr('disabled', 'disabled');
-    var form = 'span#span-reply-form-' + comment_id;
-    jq(form).slideToggle(500);
-    var holder = 'span#span-reply-form-holder-' + comment_id;
-    var cancel_button = holder + ' input#input-report-abuse-cancel';
-    var qq = jq(cancel_button);
-    jq(cancel_button).attr('comment_id', comment_id);
+    jq.get(url,
+    function(data){
+        jq("input", cform).attr("disabled", "disabled");
+        ddt = jq("form[name='edit_form']", data)[0];
+        cspan.append(ddt).slideToggle(1000);
+        jq("input[name='form.button.Cancel']",cspan).attr("onclick", "javascript:remove_edit_form("+comment_id+",'"+form_name+"')");
+    });
 }
 
-function remove_abuse_report_form(comment_id, html) {
-    jq('form.report_abuse').bind("submit", function(event){
+function remove_edit_form(comment_id, form_name) {
+    var cholder = jq("#"+comment_id).parent();
+    var cform = jq(cholder).find("form[name='"+form_name+"']");
+    var cspan = jq("#span-forms-holder-"+comment_id);
+    jq("form",cspan).bind("submit", function(event){
         event.preventDefault();
     });
-    var form = 'span#span-reply-form-' + comment_id;
-    jq(form).fadeOut();
-    var render_button = 'input#input-render-abuse-cancel-' + comment_id;
-    jq(render_button).attr('disabled', '');
-    if (html != undefined) {
-        var holder = 'span#span-abuse-count-holder-' + comment_id;
-        jq(holder).append(html);
-    }
+    jq("input", cform).attr("disabled", '');
+    cspan.fadeOut();
 }
 
-kukit.actionsGlobalRegistry.register("remove_abuse_report_form", function(oper) {
-    var comment_id = oper.parms.comment_id;
-    var html = oper.parms.html
-    remove_abuse_report_form(comment_id, html);
-});
-kukit.commandsGlobalRegistry.registerFromAction('remove_abuse_report_form', kukit.cr.makeSelectorCommand);
+function render_delete_comment(comment_id) {
+    var cholder = jq("#"+comment_id).parent();
+    var cform = jq("form[name='delete']",cholder);
+    var url = jq(cform).attr("action");
+    jq(cform).bind("submit", function(event){
+        event.preventDefault();
+    });
+    jq(cholder).detach()
+    jq.post(url);
+}
+
+function render_comment_form() {
+    var cform = jq("form#reply");
+    var url = jq(cform).attr("action");
+    jq(cform).bind("submit", function(event){
+        event.preventDefault();
+    });
+    jq.get(url,
+    function(data){
+        ddt = jq("form[name='edit_form']", data)[0];
+        jq(cform).replaceWith(ddt);
+    });
+}
+
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/report_abuse_form.cpt
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/report_abuse_form.cpt	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/report_abuse_form.cpt	(revision 2087)
@@ -21,5 +21,5 @@
                         Iterator python:modules['Products.CMFPlone'].IndexIterator;
                         tabindex python:Iterator(mainSlot=False);
-                        isAnon context/@@plone_portal_state/anonymous;
+                        isAnon context/@@plone_portal_state/anonymous|string:False;
                         member context/@@plone_portal_state/member;
                         thread python:putils.getDiscussionThread(here);
@@ -80,9 +80,9 @@
                                 comment_id context/id">
                     <metal:macro define-macro="form"
-                            tal:define="isAjaxReportAbuseEnabled view/ajax_report_abuse_enabled|python:portal.portal_properties.qPloneComments.enable_ajax_report_abuse;
+                            tal:define="isAjaxReportAbuseEnabled view/ajax_report_abuse_enabled|python:here.portal_properties.qPloneComments.enable_ajax_report_abuse;
                                         visible show_form|request/show_form|nothing;
                                         portal_url portal_url|view/portal_url;
-                                        tabindex tabindex|request/tabindex|view/tabindex;
-                                        member member|request/member|view/member;">
+                                        isAnon isAnon|context/@@plone_portal_state/anonymous;
+                                        member member|context/@@plone_portal_state/member;">
 
                         <span tal:define="email_from_address portal/email_from_address|view/email_from_address;
@@ -198,6 +198,7 @@
                                                 value="Send"
                                                 type="submit"
-                                                tal:attributes="comment_id comment_id;
-                                                                class python:isAjaxReportAbuseEnabled  and 'context input-report-abuse-send' or 'context'"
+                                                class="context"
+                                                name="form.button.Send"
+                                                tal:attributes="comment_id comment_id"
                                                 i18n:attributes="value label_send;"
                                                 />
@@ -207,7 +208,6 @@
                                                 class="destructive"
                                                 value="Cancel"
-                                                type="button"
-                                                tal:condition="isAjaxReportAbuseEnabled"
-                                                tal:attributes="onclick string:javascript:remove_abuse_report_form(${comment_id})"
+                                                type="submit"
+                                                name="form.button.Cancel"
                                                 i18n:attributes="value label_cancel;"
                                                 />
Index: quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/report_abuse_form.cpt.metadata
===================================================================
--- quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/report_abuse_form.cpt.metadata	(revision 2079)
+++ quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/report_abuse_form.cpt.metadata	(revision 2087)
@@ -4,6 +4,8 @@
 [validators]
 validators = validate_report_abuse
+validators..Cancel=
 
 [actions]
-action.success = traverse_to:string:report_abuse
+action.success = redirect_to:string:view
+action.success..Send = traverse_to:string:report_abuse
 action.failure = traverse_to:string:report_abuse_form
