Changeset - 150431aae9ba
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Jan Heylen - 10 years ago 2016-01-02 11:55:36
heyleke@gmail.com
diff: move looping over files into diff_block_simple

Make it slightly more like regular diff_block and make the next changes
possible.
3 files changed with 7 insertions and 9 deletions:
kallithea/templates/changeset/diff_block.html
5
3
kallithea/templates/compare/compare_diff.html
1
3
kallithea/templates/pullrequests/pullrequest_show.html
1
3
0 comments (0 inline, 0 general)
kallithea/templates/changeset/diff_block.html
➞
Show inline comments
 
@@ -20,99 +20,101 @@
 
                <div class="diff-actions">
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full diff for this file')}">
 
                      <i class="icon-file-code"></i>
 
                  </a>
 
                  <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">
 
                      <i class="icon-docs"></i>
 
                  </a>
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${_('Raw diff')}">
 
                      <i class="icon-diff"></i>
 
                  </a>
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${_('Download diff')}">
 
                      <i class="icon-floppy"></i>
 
                  </a>
 
                  ${c.ignorews_url(request.GET, h.FID(cs2,path))}
 
                  ${c.context_url(request.GET, h.FID(cs2,path))}
 
                </div>
 
                <span style="float:right;margin-top:-3px">
 
                  <label>
 
                  ${_('Show inline comments')}
 
                  ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(cs2,path))}
 
                  </label>
 
                </span>
 
            </div>
 
        </div>
 
        <div class="code-body full_f_path" data-f_path="${h.safe_unicode(path)}">
 
            ${diff|n}
 
            %if path.rsplit('.')[-1] in ['png', 'gif', 'jpg', 'bmp']:
 
              <div class="btn btn-image-diff-show">Show images</div>
 
              %if change =='M':
 
                <div id="${FID}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>
 
              %endif
 
              <div style="font-size: 0">
 
                %if change in 'DM':
 
                  <img id="${FID}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"
 
                      realsrc="${h.url('files_raw_home',repo_name=c.repo_name,revision=cs1,f_path=path)}" />
 
                %endif
 
                %if change in 'AM':
 
                  <img id="${FID}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"
 
                      realsrc="${h.url('files_raw_home',repo_name=c.repo_name,revision=cs2,f_path=path)}" />
 
                %endif
 
              </div>
 
            %endif
 
        </div>
 
    </div>
 
%endfor
 
</div>
 
</%def>
 

			




	
	
	
		
 
<%def name="diff_block_simple(change)">

			




	
	
	
		
 

			




	
	
	
		
 
  %for op,filenode_path,diff in change:

			




	
	
	
		
 
<%def name="diff_block_simple(files, changes)">

			




	
	
	
		
 
  %for fid, ch, f, stat in files:

			




	
	
	
		
 
    <%

			




	
	
	
		
 
    op, filenode_path, diff = changes[fid]

			




	
	
	
		
 
    %>

			




	
	
	
		
 
    <div id="${h.FID('',filenode_path)}_target" style="clear:both;margin-top:25px"></div>

			




	
	
	
		
 
    <div id="${h.FID('',filenode_path)}" class="diffblock  margined comm">

			




	
	
	
		
 
      <div class="code-header">

			




	
	
	
		
 
          <div class="changeset_header">

			




	
	
	
		
 
              <div class="changeset_file">

			




	
	
	
		
 
                  ${h.safe_unicode(filenode_path)} |

			




	
	
	
		
 
                  ## TODO: link to ancestor and head of other instead of exactly other

			




	
	
	
		
 
                  %if op == 'A':

			




	
	
	
		
 
                    ${_('Added')}

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filenode_path, revision=c.cs_rev)}">${h.short_ref(c.cs_ref_type, c.cs_ref_name)}</a>

			




	
	
	
		
 
                  %elif op == 'M':

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filenode_path, revision=c.a_rev)}">${h.short_ref(c.a_ref_type, c.a_ref_name)}</a>

			




	
	
	
		
 
                    <i class="icon-right"></i>

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filenode_path, revision=c.cs_rev)}">${h.short_ref(c.cs_ref_type, c.cs_ref_name)}</a>

			




	
	
	
		
 
                  %elif op == 'D':

			




	
	
	
		
 
                    ${_('Deleted')}

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filenode_path, revision=c.a_rev)}">${h.short_ref(c.a_ref_type, c.a_ref_name)}</a>

			




	
	
	
		
 
                  %elif op == 'R':

			




	
	
	
		
 
                    ${_('Renamed')}

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filenode_path, revision=c.a_rev)}">${h.short_ref(c.a_ref_type, c.a_ref_name)}</a>

			




	
	
	
		
 
                    <i class="icon-right"></i>

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filenode_path, revision=c.cs_rev)}">${h.short_ref(c.cs_ref_type, c.cs_ref_name)}</a>

			




	
	
	
		
 
                  %else:

			




	
	
	
		
 
                    ${op}???

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="diff-actions">

			




	
	
	
		
 
                <a href="${h.url('files_diff_2way_home',repo_name=c.cs_repo.repo_name,f_path=h.safe_unicode(filenode_path),diff1=c.a_rev,diff2=c.cs_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">

			




	
	
	
		
 
                  <i class="icon-docs"></i>

			




	
	
	
		
 
                </a>

			




	
	
	
		
 
                ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                ${c.context_url(request.GET)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
        <div class="code-body full_f_path" data-f_path="${h.safe_unicode(filenode_path)}">

			




	
	
	
		
 
            ${diff|n}

			




	
	
	
		
 
            %if filenode_path.rsplit('.')[-1] in ['png', 'gif', 'jpg', 'bmp']:

			




	
	
	
		
 
              <div class="btn btn-image-diff-show">Show images</div>

			




	
	
	
		
 
              %if op == 'M':

			




	
	
	
		
 
                <div id="${h.FID('',filenode_path)}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <div style="font-size: 0">

			




	
	
	
		
 
                %if op in 'DM':

			




	
	
	
		
 
                  <img id="${h.FID('',filenode_path)}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"

			




	
	
	
		
 
                      realsrc="${h.url('files_raw_home',repo_name=c.a_repo.repo_name,revision=c.a_rev,f_path=filenode_path) if op in 'DM' else ''}" />

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %if op in 'AM':

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -43,99 +43,97 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.compare_home:

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
         <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
                ##CS

			




	
	
	
		
 
                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

			




	
	
	
		
 
                <%include file="compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
                ## FILES

			




	
	
	
		
 
                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
                % if c.limited_diff:

			




	
	
	
		
 
                    ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

			




	
	
	
		
 
                % else:

			




	
	
	
		
 
                    ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
                %endif

			




	
	
	
		
 

			




	
	
	
		
 
                ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                ${c.context_url(request.GET)}

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="cs_files">

			




	
	
	
		
 
                  %if not c.files:

			




	
	
	
		
 
                     <span class="empty_data">${_('No files')}</span>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                  %for fid, change, f, stat in c.files:

			




	
	
	
		
 
                     <div class="cs_${change}">

			




	
	
	
		
 
                         <div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-${change}"></i>

			




	
	
	
		
 
                             ${h.link_to(h.safe_unicode(f), '#' + fid)}

			




	
	
	
		
 
                         </div>

			




	
	
	
		
 
                         <div class="changes">${h.fancy_file_stats(stat)}</div>

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                % if c.limited_diff:

			




	
	
	
		
 
                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>

			




	
	
	
		
 
                % endif

			




	
	
	
		
 
         </div>

			




	
	
	
		
 

			




	
	
	
		
 
        ## diff block

			




	
	
	
		
 
        <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
        ${diff_block.diff_block_js()}

			




	
	
	
		
 
        %for fid, change, f, stat in c.files:

			




	
	
	
		
 
          ${diff_block.diff_block_simple([c.changes[fid]])}

			




	
	
	
		
 
        %endfor

			




	
	
	
		
 
        ${diff_block.diff_block_simple(c.files, c.changes)}

			




	
	
	
		
 
        % if c.limited_diff:

			




	
	
	
		
 
          <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h4>

			




	
	
	
		
 
        % endif

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
</div>

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 

			




	
	
	
		
 
   $(document).ready(function(){

			




	
	
	
		
 
    var cache = {};

			




	
	
	
		
 

			




	
	
	
		
 
    function make_revision_dropdown(css_selector, placeholder, repo_name, cache_key) {

			




	
	
	
		
 
      $(css_selector).select2({

			




	
	
	
		
 
        placeholder: placeholder,

			




	
	
	
		
 
        formatSelection: function(obj){

			




	
	
	
		
 
            return '{0}@{1}'.format(repo_name, obj.text);

			




	
	
	
		
 
        },

			




	
	
	
		
 
        dropdownAutoWidth: true,

			




	
	
	
		
 
        query: function(query){

			




	
	
	
		
 
          var key = cache_key;

			




	
	
	
		
 
          var cached = cache[key] ;

			




	
	
	
		
 
          if(cached) {

			




	
	
	
		
 
            var data = {results: []};

			




	
	
	
		
 
            //filter results

			




	
	
	
		
 
            $.each(cached.results, function(){

			




	
	
	
		
 
                var section = this.text;

			




	
	
	
		
 
                var children = [];

			




	
	
	
		
 
                $.each(this.children, function(){

			




	
	
	
		
 
                    if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){

			




	
	
	
		
 
                        children.push(this);

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                });

			




	
	
	
		
 
                data.results.push({'text': section, 'children': children});

			




	
	
	
		
 
            });

			




	
	
	
		
 
            //push the typed in changeset

			




	
	
	
		
 
            data.results.push({'text':_TM['Specify changeset'],

			




	
	
	
		
 
                               'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]});

			




	
	
	
		
 
            query.callback(data);

			




	
	
	
		
 
          }else{

			




	
	
	
		
 
              $.ajax({

			




	
	
	
		
 
                url: pyroutes.url('repo_refs_data', {'repo_name': repo_name}),

			




	
	
	
		
 
                data: {},

			




	
	
	
		
 
                dataType: 'json',

			




	
	
	
		
 
                type: 'GET',

			




	
	
	
		
 
                success: function(data) {

			




	
	
	
		
 
                  cache[key] = data;

			




	
	
	
		
 
                  query.callback(data);

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -311,99 +311,97 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
              ${h.link_to(h.short_id(c.a_rev),h.url('changeset_home',repo_name=c.a_repo.repo_name,revision=c.a_rev))}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
              ## FILES

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                  ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

			




	
	
	
		
 
              % else:

			




	
	
	
		
 
                  ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
              %endif

			




	
	
	
		
 

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="cs_files">

			




	
	
	
		
 
                %if not c.files:

			




	
	
	
		
 
                   <span class="empty_data">${_('No files')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %for fid, change, f, stat in c.files:

			




	
	
	
		
 
                    <div class="cs_${change}">

			




	
	
	
		
 
                      <div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-${change}"></i>

			




	
	
	
		
 
                          ${h.link_to(h.safe_unicode(f),'#' + fid)}

			




	
	
	
		
 
                      </div>

			




	
	
	
		
 
                      <div class="changes">${h.fancy_file_stats(stat)}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <script>

			




	
	
	
		
 
    var _USERS_AC_DATA = ${c.users_array|n};

			




	
	
	
		
 
    var _GROUPS_AC_DATA = ${c.user_groups_array|n};

			




	
	
	
		
 
    // TODO: switch this to pyroutes

			




	
	
	
		
 
    AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";

			




	
	
	
		
 
    AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

			




	
	
	
		
 

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);

			




	
	
	
		
 

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <div class="commentable-diff">

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    %for fid, change, f, stat in c.files:

			




	
	
	
		
 
      ${diff_block.diff_block_simple([c.changes[fid]])}

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    ${diff_block.diff_block_simple(c.files, c.changes)}

			




	
	
	
		
 
    % if c.limited_diff:

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## main comment form and it status

			




	
	
	
		
 
    ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,

			




	
	
	
		
 
                              pull_request_id=c.pull_request.pull_request_id),

			




	
	
	
		
 
                       c.current_voting_result,

			




	
	
	
		
 
                       is_pr=True, change_status=c.allowed_to_change_status)}

			




	
	
	
		
 

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      $(document).ready(function(){

			




	
	
	
		
 
          PullRequestAutoComplete($('#user'), $('#reviewers_container'), _USERS_AC_DATA);

			




	
	
	
		
 
          SimpleUserAutoComplete($('#owner'), $('#owner_completion_container'), _USERS_AC_DATA);

			




	
	
	
		
 

			




	
	
	
		
 
          $('.code-difftable').on('click', '.add-bubble', function(e){

			




	
	
	
		
 
              show_comment_form($(this));

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          var avail_jsdata = ${c.avail_jsdata|n};

			




	
	
	
		
 
          var avail_r = new BranchRenderer('avail_graph_canvas', 'updaterevs-table', 'chg_available_');

			




	
	
	
		
 
          avail_r.render(avail_jsdata,40);

			




	
	
	
		
 

			




	
	
	
		
 
          move_comments($(".comments .comments-list-chunk"));

			




	
	
	
		
 

			




	
	
	
		
 
          $('#updaterevs input').change(function(e){

			




	
	
	
		
 
              var update = !!e.target.value;

			




	
	
	
		
 
              $('#pr-form-save').prop('disabled',update);

			




	
	
	
		
 
              $('#pr-form-clone').prop('disabled',!update);

			




	
	
	
		
 
          });

			




	
	
	
		
 
          var $org_review_members = $('#review_members').clone();

			




	
	
	
		
 
          $('#pr-form-reset').click(function(e){

			




	
	
	
		
 
              $('.pr-do-edit').hide();

			




	
	
	
		
 
              $('.pr-not-edit').show();

			




	
	
	
		
 
              $('#pr-form-save').prop('disabled',false);

			




	
	
	
		
 
              $('#pr-form-clone').prop('disabled',true);

			




	
	
	
		
 
              $('#review_members').html($org_review_members);

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          // hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload

			




	
	
	
		
 
          if (window.location.hash != "") {

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.