Changeset 3106 in products for quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins

Timestamp:

Apr 13, 2011 1:55:55 PM (13 years ago)

Author:

kroman0

Message:

Merged changes from trunk and last fixes in templates

Location:

quintagroup.plonecomments/branches/jquery

Files:

• . (modified) (1 prop)
• quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt.metadata (modified) (1 diff)
• quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_reply_form.cpt (modified) (5 diffs)
• quintagroup/plonecomments/skins/quintagroup_plonecomments/qcomments.css (modified) (1 diff)
• quintagroup/plonecomments/skins/quintagroup_plonecomments/report_abuse_form.cpt (modified) (4 diffs)

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt.metadata

@@ -6 +6 @@
 
 [validators]
+validators= 
 validators..Cancel=
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_reply_form.cpt

@@ -50 +50 @@
                <div class="documentByLine"
                     tal:define="anonymous_creator python:reply.Creator()=='Anonymous User'">
-                   <span i18n:translate="label_comment_by">Posted by</span>
+                   <span i18n:domain="quintagroup.plonecomments"
+                         i18n:translate="label_comment_by">Posted by</span>
                    <span tal:content="reply/Creator"
                          tal:condition="not:anonymous_creator">Poster Name</span>
                    <span i18n:translate="label_anonymous_user"
                          tal:condition="anonymous_creator">Anonymous User</span>
-                   <span i18n:translate="label_commented_at">at</span>
+                   <span i18n:domain="quintagroup.plonecomments"
+                         i18n:translate="label_commented_at">at</span>
                    <span tal:replace="python:toLocalizedTime(reply.ModificationDate(),
                                       long_format=1)">8/23/2001 12:40:44 PM</span>
@@ -81 +83 @@
         <fieldset>
 
-            <legend i18n:translate="legend_add_comment">Add comment</legend>
-
-            <p i18n:translate="description_add_comment">
+            <legend i18n:domain="quintagroup.plonecomments"
+                    i18n:translate="legend_add_comment">Add comment</legend>
+
+            <p i18n:domain="quintagroup.plonecomments"
+               i18n:translate="description_add_comment">
                 You can add a comment by filling out the form below. Plain text
                 formatting.
@@ -102 +106 @@
                      tal:condition="isAnon"
                      tal:define="error errors/Creator|nothing;"
-                     tal:attributes="class python:test(error, 'field error', 'field');">
+                     tal:attributes="class python:test(error, 'field error', 'field');"
+                     i18n:domain="plone">
 
                     <label for="username" i18n:translate="label_name">Name</label>
@@ -123 +128 @@
                                value="" alt="Submitter" title="Name"
                                size="40"
-                               i18n:attributes="alt; title"
+                               i18n:attributes="alt; title label_name"
                                tal:attributes="value request/Creator | nothing" />
                     </div>
@@ -154 +159 @@
             </div>
 
-            <div tal:condition="python:(not isForAnonymous) and isAnon">
+            <div tal:condition="python:(not isForAnonymous) and isAnon"
+                 i18n:domain="plone">
                 <dl class="portalMessage warning">
                     <dt i18n:translate="">

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/qcomments.css

@@ -7 +7 @@
  width: 100%;
 }
+.discussion fieldset {
+ clear: both;
+}

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/report_abuse_form.cpt

@@ -49 +49 @@
                     <div class="documentByLine"
                             tal:define="anonymous_creator python:reply.Creator()=='Anonymous User'">
-                        <span i18n:translate="label_comment_by">Posted by</span>
+                        <span i18n:domain="quintagroup.plonecomments"
+                              i18n:translate="label_comment_by">Posted by</span>
                         <span tal:content="reply/Creator"
                                 tal:condition="not:anonymous_creator">Poster Name</span>
                         <span i18n:translate="label_anonymous_user"
                                 tal:condition="anonymous_creator">Anonymous User</span>
-                        <span i18n:translate="label_commented_at">at</span>
+                        <span i18n:domain="quintagroup.plonecomments"
+                              i18n:translate="label_commented_at">at</span>
                         <span tal:replace="python:toLocalizedTime(reply.ModificationDate(),
                                             long_format=1)">8/23/2001 12:40:44 PM</span>
@@ -78 +80 @@
                                 comment_id context/id">
                     <metal:macro define-macro="form"
-                            tal:define="isAjaxReportAbuseEnabled view/ajax_report_abuse_enabled|python:here.portal_properties.qPloneComments.enable_ajax_report_abuse;
-                                        visible show_form|request/show_form|nothing;
+                            tal:define="visible show_form|request/show_form|nothing;
                                         portal_url portal_url|view/portal_url;
                                         isAnon isAnon|context/@@plone_portal_state/anonymous;
@@ -114 +115 @@
                                             <div class="field"
                                                 tal:define="error errors/creator|nothing"
-                                                tal:attributes="class python:error and 'field error' or 'field'">
+                                                tal:attributes="class python:error and 'field error' or 'field'"
+                                                i18n:domain="plone">
                                                 <label for="creator" i18n:translate="label_name">
                                                     Name
@@ -166 +168 @@
                                             tal:attributes="class python:error and 'field error' or 'field'">
                                             <label for="message" i18n:translate="label_message">
-                                                Description
+                                                Message
                                             </label>
                                             <span class="fieldRequired" title="Required"