Changeset - bf8cd958efa8
Parent rev.
Child rev.
[Not reviewed]
default
1 3 0
Sean Farley - 11 years ago 2014-07-15 22:50:36
sean.michael.farley@gmail.com
page_save.png: use new icon-floppy font
4 files changed with 3 insertions and 3 deletions:
kallithea/public/images/icons/page_save.png
bin+del
kallithea/templates/changeset/changeset.html
1
1
kallithea/templates/changeset/diff_block.html
1
1
kallithea/templates/files/diff_2way.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/images/icons/page_save.png
➞
Show inline comments
 
deleted file
 
binary diff not shown
Show images
kallithea/templates/changeset/changeset.html
➞
Show inline comments
 
@@ -38,49 +38,49 @@ ${self.repo_context_bar('changelog', c.c
 
                </div>
 
            </div>
 

			




	
	
	
		
 
            <div class="children">

			




	
	
	
		
 
                <div id="child_link" class="changeset_hash">

			




	
	
	
		
 
                    <a href="#">${_('child rev.')}</a> <i style="color:#036185" class="icon-right-open"></i>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="code-header banner">

			




	
	
	
		
 
                <div class="changeset-status-container">

			




	
	
	
		
 
                    %if c.statuses:

			




	
	
	
		
 
                        <div class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></div>

			




	
	
	
		
 
                        <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Raw diff'))}">

			




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

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Patch diff'))}">

			




	
	
	
		
 
                      <i class="icon-file-powerpoint"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">

			




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

			




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

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                  ${c.context_url(request.GET)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt} <span class="firstlink"></span> </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="changeset_content">

			




	
	
	
		
 
            <div class="container">

			




	
	
	
		
 

			




	
	
	
		
 
                <div class="right">

			




	
	
	
		
 
                    <div class="changes">

			




	
	
	
		
 
                        % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:

			




	
	
	
		
 
                         <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span>

			




	
	
	
		
 
                         <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>

			




	
	
	
		
 
                         <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span>

			




	
	
	
		
 
                        % else:

			




	
	
	
		
 
                         <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="added"   title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                        % endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 

			




	
	
	
		
 
                    <span class="logtags">

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,49 +7,49 @@

			




	
	
	
		
 
<div class="diff-collapse">

			




	
	
	
		
 
    <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">&uarr; ${_('Collapse Diff')} &uarr;</span>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<div class="diff-container" id="${'diff-container-%s' % (id(change))}">

			




	
	
	
		
 
%for FID,(cs1, cs2, change, path, diff, stats) in change.iteritems():

			




	
	
	
		
 
    <div id="${FID}_target" style="clear:both;margin-top:25px"></div>

			




	
	
	
		
 
    <div id="${FID}" class="diffblock  margined comm">

			




	
	
	
		
 
        <div class="code-header">

			




	
	
	
		
 
            <div class="changeset_header">

			




	
	
	
		
 
                <div class="changeset_file">

			




	
	
	
		
 
                    ${h.link_to_if(change!='D',h.safe_unicode(path),h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
                    revision=cs2,f_path=h.safe_unicode(path)))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <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="${h.tooltip(_('Show full diff for this file'))}">

			




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

			




	
	
	
		
 
                  </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="${h.tooltip(_('Show full side-by-side diff for this file'))}">

			




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

			




	
	
	
		
 
                  </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="${h.tooltip(_('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="${h.tooltip(_('Download diff'))}">

			




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

			




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

			




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

			




        

    


    
    

    

        

                

                    kallithea/templates/files/diff_2way.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -32,49 +32,49 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="diff-container" style="overflow-x: hidden">

			




	
	
	
		
 
        <div class="diffblock comm" style="margin:3px; padding:1px">

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div class="changeset_header">

			




	
	
	
		
 
                    <div class="changeset_file">

			




	
	
	
		
 
                        ${h.link_to(h.safe_unicode(c.node1.path),h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
                        revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    <div class="diff-actions">

			




	
	
	
		
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}">

			




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

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                      <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,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>

			




	
	
	
		
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" class="tooltip" title="${h.tooltip(_('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(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">

			




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

			




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

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                      ${h.checkbox('ignorews', label=_('Ignore whitespace'))}

			




	
	
	
		
 
                      ${h.checkbox('edit_mode', label=_('Edit'))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="compare"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
<script>

			




	
	
	
		
 
var orig1_url = '${h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),revision=c.cs1.raw_id)}';

			




	
	
	
		
 
var orig2_url = '${h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node2.path),revision=c.cs2.raw_id)}';

			




	
	
	
		
 

			




	
	
	
		
 
$(document).ready(function () {

			




	
	
	
		
 
    $('#compare').mergely({

			




	
	
	
		
 
        width: 'auto',

			




	
	
	
		
 
        height: '600',

			




	
	
	
		
 
        fgcolor: {a:'#ddffdd',c:'#cccccc',d:'#ffdddd'},

			




	
	
	
		
 
        bgcolor: '#fff',

			




	
	
	
		
 
        viewport: true,

			




	
	
	
		
 
        cmsettings: {mode: 'text/plain', readOnly: true, lineWrapping: false, lineNumbers: true},

			




	
	
	
		
 
        lhs: function(setValue) {

			




	
	
	
		
 
            if("${c.node1.is_binary}" == "True"){

			




        

    



    


    



    



      

      





    
    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.