upstream/kallithea Files · rhodecode/templates/changeset/diff_block.html

Imported some of the GPLv3'd changes from RhodeCode v2.2.5....

Imported some of the GPLv3'd changes from RhodeCode v2.2.5. This imports changes between changesets and in RhodeCode's original repository, including only changes to Python files and HTML. RhodeCode clearly licensed its changes to these files under GPLv3 in their /LICENSE file, which states the following: The Python code and integrated HTML are licensed under the GPLv3 license. (See: https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE or http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE for an online copy of that LICENSE file) Conservancy reviewed these changes and confirmed that they can be licensed as a whole to the Kallithea project under GPLv3-only. While some of the contents committed herein are clearly licensed GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the statement above from RhodeCode indicates that they intend GPLv3-only as their license, per GPLv3§14 and other relevant sections of GPLv3.

Bradley M. Kuhn - - Load All Authors

File last commit:

r4116:ffd45b18 rhodecode-2.2.5-gpl


                r4116:ffd45b18

rhodecode-2.2.5-gpl

Download file

             diff_block.html
        
                    81 lines
            
             | 4.7 KiB
            
                | text/html
            
             |
                HtmlLexer
            
             / rhodecode / templates / changeset / diff_block.html
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
code garden for changeset ranges and comments...

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

      ##usage:

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

        marcink
    
Implemented basic compare view(for pull requests) for mercurial.

              r2348
            
      ## ${diff_block.diff_block(change)}

        marcink
    
code garden for changeset ranges and comments...

              r1787
            
      ##

        marcink
    
Implemented basic compare view(for pull requests) for mercurial.

              r2348
            
      <%def name="diff_block(change)">

        marcink
    
collapsable diff container in changeset, makes quick review easier

              r3419
            
      <div class="diff-collapse">

        Mads Kiilerich
    
Fix a lot of casings - use standard casing in most places

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

        marcink
    
collapsable diff container in changeset, makes quick review easier

              r3419
            
      </div>

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

        marcink
    
Implemented generation of changesets based...

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

        marcink
    
code garden for changeset ranges and comments...

              r1787
            
              <div class="code-header">

                  <div class="changeset_header">

                      <div class="changeset_file">

        Mads Kiilerich
    
diff: don't link to removed files...

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

        marcink
    
Implemented generation of changesets based...

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

        marcink
    
code garden for changeset ranges and comments...

              r1787
            
                      </div>

        marcink
    
UI fixes...

              r1865
            
                      <div class="diff-actions">

        Bradley M. Kuhn
    
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....

              r4116
            
                        <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'))}">

                            <img class="icon" src="${h.url('/images/icons/page_white.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='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">

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

                        </a>

        marcink
    
Implemented generation of changesets based...

              r2995
            
                        ${c.ignorews_url(request.GET, h.FID(cs2,path))}

                        ${c.context_url(request.GET, h.FID(cs2,path))}

        marcink
    
UI fixes...

              r1865
            
                      </div>

        marcink
    
code garden for changeset ranges and comments...

              r1787
            
                      <span style="float:right;margin-top:-3px">

                        <label>

        Mads Kiilerich
    
Fix a lot of casings - use standard casing in most places

              r3654
            
                        ${_('Show inline comments')}

        marcink
    
Implemented generation of changesets based...

              r2995
            
                        ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(cs2,path))}

        marcink
    
code garden for changeset ranges and comments...

              r1787
            
                        </label>

                      </span>

                  </div>

              </div>

              <div class="code-body">

        marcink
    
Implemented generation of changesets based...

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

        marcink
    
implements #308 rewrote diffs to enable displaying full diff on each file...

              r1789
            
                  ${diff|n}

        marcink
    
code garden for changeset ranges and comments...

              r1787
            
              </div>

          </div>

      %endfor

        marcink
    
collapsable diff container in changeset, makes quick review easier

              r3419
            
      </div>

        marcink
    
White-space cleanup

              r1888
            
      </%def>

        marcink
    
Implemented basic compare view(for pull requests) for mercurial.

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

        marcink
    
white space cleanup

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

        marcink
    
Implemented basic compare view(for pull requests) for mercurial.

              r2348
            
            <div class="code-header">

                <div class="changeset_header">

                    <div class="changeset_file">

        marcink
    
show links to files on compare data at other and org refs

              r3357
            
                        ${h.safe_unicode(filenode_path)} |

        Bradley M. Kuhn
    
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....

              r4116
            
                        <a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('Show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a>

                        <i class="icon-arrow-right" style="font-size: 12px;color:#336699"></i>

        Mads Kiilerich
    
Fix a lot of casings - use standard casing in most places

              r3654
            
                        <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('Show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a>

        marcink
    
Implemented basic compare view(for pull requests) for mercurial.

              r2348
            
                    </div>

        Bradley M. Kuhn
    
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....

              r4116
            
                     <div class="diff-actions">

                      %if c.other_repo.repo_name == c.repo_name:

                        <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode_path),diff2=c.other_ref,diff1=c.org_ref,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

                      </div>

        marcink
    
Implemented basic compare view(for pull requests) for mercurial.

              r2348
            
                </div>

            </div>

              <div class="code-body">

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

                  ${diff|n}

              </div>

          </div>

        %endfor

        marcink
    
white space cleanup

              r2478
            
      </%def>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

marcink code garden for changeset ranges and comments...	r1787	## -- coding: utf-8 --
		##usage:
		## <%namespace name="diff_block" file="/changeset/diff_block.html"/>
marcink Implemented basic compare view(for pull requests) for mercurial.	r2348	## ${diff_block.diff_block(change)}
marcink code garden for changeset ranges and comments...	r1787	##
marcink Implemented basic compare view(for pull requests) for mercurial.	r2348	<%def name="diff_block(change)">
marcink collapsable diff container in changeset, makes quick review easier	r3419	<div class="diff-collapse">
Mads Kiilerich Fix a lot of casings - use standard casing in most places	r3654	<span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">↑ ${_('Collapse diff')} ↑</span>
marcink collapsable diff container in changeset, makes quick review easier	r3419	</div>
		<div class="diff-container" id="${'diff-container-%s' % (id(change))}">
marcink Implemented generation of changesets based...	r2995	%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">
marcink code garden for changeset ranges and comments...	r1787	<div class="code-header">
		<div class="changeset_header">
		<div class="changeset_file">
Mads Kiilerich diff: don't link to removed files...	r3816	${h.link_to_if(change!='D',h.safe_unicode(path),h.url('files_home',repo_name=c.repo_name,
marcink Implemented generation of changesets based...	r2995	revision=cs2,f_path=h.safe_unicode(path)))}
marcink code garden for changeset ranges and comments...	r1787	</div>
marcink UI fixes...	r1865	<div class="diff-actions">
Bradley M. Kuhn Imported some of the GPLv3'd changes from RhodeCode v2.2.5....	r4116	<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'))}">
		<img class="icon" src="${h.url('/images/icons/page_white.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='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">
		<img class="icon" src="${h.url('/images/icons/page_save.png')}"/>
		</a>
marcink Implemented generation of changesets based...	r2995	${c.ignorews_url(request.GET, h.FID(cs2,path))}
		${c.context_url(request.GET, h.FID(cs2,path))}
marcink UI fixes...	r1865	</div>
marcink code garden for changeset ranges and comments...	r1787	<span style="float:right;margin-top:-3px">
		<label>
Mads Kiilerich Fix a lot of casings - use standard casing in most places	r3654	${_('Show inline comments')}
marcink Implemented generation of changesets based...	r2995	${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(cs2,path))}
marcink code garden for changeset ranges and comments...	r1787	</label>
		</span>
		</div>
		</div>
		<div class="code-body">
marcink Implemented generation of changesets based...	r2995	<div class="full_f_path" path="${h.safe_unicode(path)}"></div>
marcink implements #308 rewrote diffs to enable displaying full diff on each file...	r1789	${diff\|n}
marcink code garden for changeset ranges and comments...	r1787	</div>
		</div>
		%endfor
marcink collapsable diff container in changeset, makes quick review easier	r3419	</div>
marcink White-space cleanup	r1888	</%def>
marcink Implemented basic compare view(for pull requests) for mercurial.	r2348
		<%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>
marcink white space cleanup	r2478	<div id="${h.FID('',filenode_path)}" class="diffblock margined comm">
marcink Implemented basic compare view(for pull requests) for mercurial.	r2348	<div class="code-header">
		<div class="changeset_header">
		<div class="changeset_file">
marcink show links to files on compare data at other and org refs	r3357	${h.safe_unicode(filenode_path)} \|
Bradley M. Kuhn Imported some of the GPLv3'd changes from RhodeCode v2.2.5....	r4116	<a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('Show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a>
		<i class="icon-arrow-right" style="font-size: 12px;color:#336699"></i>
Mads Kiilerich Fix a lot of casings - use standard casing in most places	r3654	<a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('Show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a>
marcink Implemented basic compare view(for pull requests) for mercurial.	r2348	</div>
Bradley M. Kuhn Imported some of the GPLv3'd changes from RhodeCode v2.2.5....	r4116	<div class="diff-actions">
		%if c.other_repo.repo_name == c.repo_name:
		<a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode_path),diff2=c.other_ref,diff1=c.org_ref,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
		</div>
marcink Implemented basic compare view(for pull requests) for mercurial.	r2348	</div>
		</div>
		<div class="code-body">
		<div class="full_f_path" path="${h.safe_unicode(filenode_path)}"></div>
		${diff\|n}
		</div>
		</div>
		%endfor
marcink white space cleanup	r2478	</%def>