kallithea Changeset - f9a581561184

Changeset - f9a581561184

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2015-05-17 21:47:33
madski@unity3d.com

comments: inline pointless inline template function

It was badly named and required an explanation, it wasn't a function, it was
short, and it didn't really add much abstraction.

1 file changed with 16 insertions and 22 deletions:

kallithea/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -98,54 +98,48 @@ @@
 ## show comment count as "x comments (y inline, z general)"
 <%def name="comment_count(inline_cnt, general_cnt)">
     ${'%s (%s, %s)' % (
         ungettext("%d comment", "%d comments", inline_cnt + general_cnt) % (inline_cnt + general_cnt),
         ungettext("%d inline", "%d inline", inline_cnt) % inline_cnt,
         ungettext("%d general", "%d general", general_cnt) % general_cnt
     )}
     <span class="firstlink"></span>
 </%def>
 ## generates inlines taken from c.comments var
 <%def name="inlines()">
     <div class="comments-number">
         ${comment_count(c.inline_cnt, len(c.comments))}
     </div>
     %for path, lines in c.inline_comments:
         % for line,comments in lines.iteritems():
             <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
             %for co in comments:
                 ${comment_block(co)}
             %endfor
             </div>
         %endfor
     %endfor
 </%def>
 ## generate inline comments and the main ones
 <%def name="generate_comments()">
 <div class="comments">
     <div id="inline-comments-container">
     ## generate inlines for this changeset
      ${inlines()}
     </div>
   <div class="comments-number">
     ${comment_count(c.inline_cnt, len(c.comments))}
   </div>
   <div id="inline-comments-container">
     %for path, lines in c.inline_comments:
         %for line, comments in lines.iteritems():
           <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
             %for co in comments:
                 ${comment_block(co)}
             %endfor
           </div>
         %endfor
     %endfor
   </div>
-    %for co in c.comments:
   %for co in c.comments:
         <div id="comment-tr-${co.comment_id}">
           ${comment_block(co)}
         </div>
-    %endfor
   %endfor
 </div>
 </%def>
 ## MAIN COMMENT FORM
 <%def name="comments(post_url, cur_status, is_pr=False, change_status=True)">
 <div class="comments">
     %if c.authuser.username != 'default':
     <div class="comment-form ac">
       ${h.form(post_url, id="main_form")}
         <div id="edit-container" class="clearfix">
             <div class="comment-help">

0 comments (0 inline, 0 general)