Changeset 1221 in products


Ignore:
Timestamp:
Aug 7, 2009 1:01:03 PM (10 years ago)
Author:
mylan
Message:

Merged revisions 1894-1897,1903 via svnmerge from
http://svn.quintagroup.com/products/qPloneComments/branches/plone3_extend

........

r1894 | mylan | 2009-03-25 21:44:18 +0200 (Wed, 25 Mar 2009) | 1 line


Insert Add comment form into comment viewlet

........

r1895 | mylan | 2009-03-25 21:45:56 +0200 (Wed, 25 Mar 2009) | 1 line


Remove 'add comment' button from comment viewlet

........

r1896 | mylan | 2009-03-25 22:09:36 +0200 (Wed, 25 Mar 2009) | 1 line


Wrap add comment form into macros. Use the macros in comment viewlet

........

r1897 | mylan | 2009-03-26 11:18:04 +0200 (Thu, 26 Mar 2009) | 1 line


Add edit comment functionality

........

r1903 | mylan | 2009-03-27 13:24:05 +0200 (Fri, 27 Mar 2009) | 1 line


Fix not saving in editing comment

........

Location:
qPloneComments/trunk
Files:
4 edited
3 copied

Legend:

Unmodified
Added
Removed
  • qPloneComments/trunk

    • Property svnmerge-integrated changed from /qPloneComments/branches/plone3_extend:1-1893 /qPloneComments/branches/jcbrand-abuseFeature:1-2225 to /qPloneComments/branches/plone3_extend:1-2259 /qPloneComments/branches/jcbrand-abuseFeature:1-2225
  • qPloneComments/trunk/HISTORY.txt

    r1190 r1221  
    55------------------ 
    66 
    7 - Nothing changed yet. 
     7- Move add comment form in comments viewlet 
     8  [mylan] 
     9 
     10- Added edit comment functionality 
     11  [mylan] 
    812 
    913 
  • qPloneComments/trunk/browser/comments.pt

    r1187 r1221  
    88                   isAjaxReportAbuseEnabled view/ajax_report_abuse_enabled; 
    99                   isAnonymousReportAbuseEnabled view/anonymous_report_abuse_enabled; 
    10                    isReportAbuseEnabled python:isAnonymousReportAbuseEnabled or not isAnon and isAuthenticatedReportAbuseEnabled" 
     10                   isReportAbuseEnabled python:isAnonymousReportAbuseEnabled or not isAnon and isAuthenticatedReportAbuseEnabled; 
     11                   foo context/@@plone/globalize; 
     12                   props_sheet here/portal_properties/qPloneComments; 
     13                   require_email python:props_sheet.getProperty('require_email');" 
    1114                   i18n:domain="plone"> 
    1215    <div class="discussion" 
    1316         tal:condition="python:replies or (userHasReplyPermission and isDiscussionAllowed) or (isAnon and not userHasReplyPermission and isDiscussionAllowed)"> 
    14         <form name="reply" 
    15               action="" 
    16               method="post" 
    17               tal:condition="python:userHasReplyPermission and isDiscussionAllowed" 
    18               tal:attributes="action string:${context/absolute_url}/discussion_reply_form#discussion"> 
    19  
    20               <input class="standalone" 
    21                      style="margin-bottom: 1.25em;" 
    22                      type="submit" 
    23                      value="Add Comment" 
    24                      i18n:attributes="value label_add_comment;" 
    25                      /> 
    26         </form> 
    27         <form tal:condition="python:isAnon and not userHasReplyPermission and isDiscussionAllowed" 
    28               tal:attributes="action view/login_action"> 
    29             <input class="standalone" 
    30                    style="margin-bottom: 1.25em;" 
    31                    type="submit" 
    32                    value="Log in to add comments" 
    33                    i18n:attributes="value label_login_to_add_comments;" 
    34                    /> 
    35         </form> 
    3617 
    3718        <tal:getreplies repeat="reply_dict replies"> 
     
    8364                           /> 
    8465                </form> 
     66                <form name="edit" 
     67                      action="discussion_edit_form" 
     68                      method="post" 
     69                      style="display: inline;" 
     70                      tal:attributes="action string:${reply/absolute_url}/discussion_edit_form" 
     71                      tal:condition="isModerationAllowed"> 
     72                    <input class="standalone" 
     73                           type="submit" 
     74                           value="Edit" 
     75                           i18n:attributes="value label_edit;" 
     76                           /> 
     77                </form> 
    8578                <form name="delete" 
    8679                      action="" 
     
    135128                     i18n:domain="plonecomments" 
    136129                     tal:condition="not:isPublished">Comment must be approved before replies to comment accepted.</div> 
     130 
    137131            </div> 
    138132        </tal:getreplies> 
     133 
     134        <!-- Start of Adding comment form--> 
     135        <tal:addcomment define="template_id string:discussion_reply_form;"> 
     136            <metal:block metal:use-macro="here/discussion_reply_form/macros/add-comment-form" /> 
     137        </tal:addcomment> 
     138        <!-- End of Adding comment form --> 
     139 
     140        <form tal:condition="python:isAnon and not userHasReplyPermission and isDiscussionAllowed" 
     141              tal:attributes="action view/login_action"> 
     142            <input class="standalone" 
     143                   style="margin-bottom: 1.25em;" 
     144                   type="submit" 
     145                   value="Log in to add comments" 
     146                   i18n:attributes="value label_login_to_add_comments;" 
     147                   /> 
     148        </form> 
     149 
    139150    </div> 
    140151</tal:block> 
  • qPloneComments/trunk/skins/qplonecomments/discussion_reply_form.cpt

    r841 r1221  
    6262    <a name="discussion"></a> 
    6363 
     64    <metal:block metal:define-macro="add-comment-form"> 
     65 
    6466    <form name="edit_form" 
    6567          class="enableAutoFocus" 
     
    254256    </form> 
    255257 
     258    </metal:block> 
     259 
    256260</div> 
    257261 
Note: See TracChangeset for help on using the changeset viewer.