Changeset - e8ff151b3085
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Sean Farley - 11 years ago 2015-02-23 06:52:23
sean.michael.farley@gmail.com
font: rename icon-arrow-right to icon-right
3 files changed with 5 insertions and 5 deletions:
kallithea/templates/changeset/changeset_range.html
2
2
kallithea/templates/changeset/diff_block.html
2
2
kallithea/templates/compare/compare_diff.html
1
1
0 comments (0 inline, 0 general)
kallithea/templates/changeset/changeset_range.html
➞
Show inline comments
 
## -*- coding: utf-8 -*-
 
<%inherit file="/base/base.html"/>
 

			




	
	
	
		
 
<%block name="title">

			




	
	
	
		
 
    ${_('%s Changesets') % c.repo_name} - ${h.show_id(c.cs_ranges[0])} &gt; ${h.show_id(c.cs_ranges[-1])}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Changesets')} -

			




	
	
	
		
 
    ${h.link_to(h.show_id(c.cs_ranges[0]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[0]))}</td>

			




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

			




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

			




	
	
	
		
 
    ${h.link_to(h.show_id(c.cs_ranges[-1]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[-1]))}</td>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="body" class="diffblock">

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.show_id(c.cs_ranges[0])}

			




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

			




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

			




	
	
	
		
 
                    ${h.show_id(c.cs_ranges[-1])}

			




	
	
	
		
 
                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-git-compare"></i> Compare Revisions</a>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
            <div class="container">

			




	
	
	
		
 
            <table class="compare_view_commits noborder">

			




	
	
	
		
 
            %for cnt,cs in enumerate(c.cs_ranges):

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                <td><div class="gravatar">${h.gravatar(h.email_or_none(cs.author), size=14)}</div></td>

			




	
	
	
		
 
                <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>

			




	
	
	
		
 
                <td><div class="author">${h.person(cs.author)}</div></td>

			




	
	
	
		
 
                <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




	
	
	
		
 
                <td>

			




	
	
	
		
 
                  %if c.statuses:

			




	
	
	
		
 
                    <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </td>

			




	
	
	
		
 
                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </table>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>

			




	
	
	
		
 
            <div class="cs_files">

			




	
	
	
		
 
                %for cs in c.cs_ranges:

			




	
	
	
		
 
                    <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                    %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():

			




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

			




	
	
	
		
 
                            <div class="node">

			




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

			




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

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    %for cs in c.cs_ranges:

			




	
	
	
		
 
          ##${comment.comment_inline_form(cs)}

			




	
	
	
		
 
          ## diff block

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,105 +36,105 @@

			




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

			




	
	
	
		
 
              %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 == 'M':

			




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

			




	
	
	
		
 
    <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_id(c.cs_ref_name) if c.cs_ref_type=='rev' else 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_id(c.a_ref_name) if c.a_ref_type=='rev' else c.a_ref_name}</a>

			




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

			




	
	
	
		
 
                    <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_id(c.cs_ref_name) if c.cs_ref_type=='rev' else 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_id(c.a_ref_name) if c.a_ref_type=='rev' else 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_id(c.a_ref_name) if c.a_ref_type=='rev' else c.a_ref_name}</a>

			




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

			




	
	
	
		
 
                    <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_id(c.cs_ref_name) if c.cs_ref_type=='rev' else 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="${h.tooltip(_('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">

			




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

			




	
	
	
		
 
              %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 == 'M':

			




	
	
	
		
 
                  <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':

			




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

			




	
	
	
		
 
                %endif

			




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

			




	
	
	
		
 
                })

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="title">

			




	
	
	
		
 
    %if c.compare_home:

			




	
	
	
		
 
        ${_('%s Compare') % c.repo_name}

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.a_repo.repo_name, c.a_ref_name)} &gt; ${'%s@%s' % (c.cs_repo.repo_name, c.cs_ref_name)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
  ${_('Compare Revisions')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="body" class="diffblock">

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.hidden('compare_org')} <i class="icon-arrow-right"></i> ${h.hidden('compare_other')}

			




	
	
	
		
 
                    ${h.hidden('compare_org')} <i class="icon-right"></i> ${h.hidden('compare_other')}

			




	
	
	
		
 
                    %if not c.compare_home:

			




	
	
	
		
 
                        <a class="btn btn-small" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                    <div id="compare_revs" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div>

			




	
	
	
		
 
                </div>

			




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

			




        

    



    


    



    



      

      





    
    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.