Changeset - e457b951aabe
Parent rev.
Child rev.
[Not reviewed]
default
0 7 0
Mads Kiilerich - 12 years ago 2014-08-01 20:28:42
madski@unity3d.com
diff: option for showing images
7 files changed with 68 insertions and 3 deletions:
kallithea/public/css/style.css
11
kallithea/templates/changeset/changeset.html
1
kallithea/templates/changeset/changeset_range.html
4
3
kallithea/templates/changeset/diff_block.html
49
kallithea/templates/compare/compare_diff.html
1
kallithea/templates/files/file_diff.html
1
kallithea/templates/pullrequests/pullrequest_show.html
1
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -5113,24 +5113,35 @@ tr.line.unmod td.code:hover .add-bubble
 
    cursor: pointer;
 
}
 

			




	
	
	
		
 
div.comment:target>.comment-wrapp {

			




	
	
	
		
 
    border: solid 2px #ee0 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.lineno:target a {

			




	
	
	
		
 
    border: solid 2px #ee0 !important;

			




	
	
	
		
 
    margin: -2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.btn-image-diff-show,

			




	
	
	
		
 
.btn-image-diff-swap {

			




	
	
	
		
 
    margin: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.img-diff {

			




	
	
	
		
 
    max-width: 45%;

			




	
	
	
		
 
    height: auto;

			




	
	
	
		
 
    margin: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.img-preview {

			




	
	
	
		
 
    max-width: 100%;

			




	
	
	
		
 
    height: auto;

			




	
	
	
		
 
    margin: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.prev-next-comment div.prev-comment,

			




	
	
	
		
 
div.prev-next-comment div.next-comment {

			




	
	
	
		
 
    display: inline-block;

			




	
	
	
		
 
    min-width: 150px;

			




	
	
	
		
 
    margin: 3px 6px;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -148,24 +148,25 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              %endfor

			




	
	
	
		
 
              % 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>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




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

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes[c.changeset.raw_id])}

			




	
	
	
		
 

			




	
	
	
		
 
    % 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

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




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

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments()}

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -66,25 +66,26 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                                ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}

			




	
	
	
		
 
                            </div>

			




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

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    %endfor

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




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

			




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

			




	
	
	
		
 
     %for cs in c.cs_ranges:

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    %for cs in c.cs_ranges:

			




	
	
	
		
 
          ##${comment.comment_inline_form(cs)}

			




	
	
	
		
 
          ## diff block

			




	
	
	
		
 
          <div class="h3">

			




	
	
	
		
 
          <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a>

			




	
	
	
		
 
             <div class="gravatar">

			




	
	
	
		
 
                 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
             <div class="right">

			




	
	
	
		
 
              <span class="logtags">

			




	
	
	
		
 
                %if len(cs.parents)>1:

			




	
	
	
		
 
                <span class="merge">${_('merge')}</span>

			




	
	
	
		
 
                %endif

			




	
	
		
 
@@ -100,15 +101,15 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                    ${h.link_to(tag,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if cs.branch:

			




	
	
	
		
 
                <span class="branchtag" title="${_('Branch %s') % cs.branch}">

			




	
	
	
		
 
                   ${h.link_to(cs.branch,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
          ${diff_block.diff_block(c.changes[cs.raw_id])}

			




	
	
	
		
 

			




	
	
	
		
 
     %endfor

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -35,24 +35,35 @@

			




	
	
	
		
 
                </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">

			




	
	
	
		
 
            <div class="full_f_path" path="${h.safe_unicode(path)}"></div>

			




	
	
	
		
 
            ${diff|n}

			




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

			




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

			




	
	
	
		
 
              <div id="${FID}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
                <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) if change in 'DM' else ''}"

			




	
	
	
		
 
                /><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) if change in 'AM' else ''}"

			




	
	
	
		
 
                />

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
%endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
  %for op,filenode_path,diff in change:

			




	
	
	
		
 
    <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">

			




	
	
		
 
@@ -79,16 +90,54 @@

			




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

			




	
	
	
		
 
                      <img class="icon" src="${h.url('/images/icons/application_double.png')}"/>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                ${c.context_url(request.GET)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
        <div class="code-body">

			




	
	
	
		
 
            <div class="full_f_path" path="${h.safe_unicode(filenode_path)}"></div>

			




	
	
	
		
 
            ${diff|n}

			




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

			




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

			




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

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
                <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.repo_name,revision=c.org_rev,f_path=filenode_path) if op in 'DM' else ''}"

			




	
	
	
		
 
                /><img id="${h.FID('',filenode_path)}_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=c.other_rev,f_path=filenode_path) if op in 'AM' else ''}"

			




	
	
	
		
 
                />

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  %endfor

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="diff_block_js()">

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
$(document).ready(function(){

			




	
	
	
		
 
    $('.btn-image-diff-show').click(function(e){

			




	
	
	
		
 
        $('.btn-image-diff-show').hide();

			




	
	
	
		
 
        $('.btn-image-diff-swap').show();

			




	
	
	
		
 
        $('.img-diff-swapable')

			




	
	
	
		
 
            .each(function(i,e){

			




	
	
	
		
 
                    $(e).attr('src', $(e).attr('realsrc'));

			




	
	
	
		
 
                })

			




	
	
	
		
 
            .show();

			




	
	
	
		
 
        });

			




	
	
	
		
 
    

			




	
	
	
		
 
    $('.btn-image-diff-swap').mousedown(function(e){

			




	
	
	
		
 
        $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')

			




	
	
	
		
 
          .before($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));

			




	
	
	
		
 
    });

			




	
	
	
		
 
    var reset = function(e){

			




	
	
	
		
 
        $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')

			




	
	
	
		
 
          .after($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));

			




	
	
	
		
 
    };

			




	
	
	
		
 
    $('.btn-image-diff-swap').mouseup(reset);

			




	
	
	
		
 
    $('.btn-image-diff-swap').mouseleave(reset);

			




	
	
	
		
 
});

			




	
	
	
		
 
</script>

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -72,24 +72,25 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                        <div class="node">${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

			




	
	
	
		
 
        % 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">

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/files/file_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,16 +16,17 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div>

			




	
	
	
		
 
    ## diff block

			




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

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes)}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -298,24 +298,25 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
    // 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']);

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
    ## 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

			




	
	
	
		
 
    % 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

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




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

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-18177
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support