##// END OF EJS Templates
pullrequest: use simple link for 'Change style'...
pullrequest: use simple link for 'Change style' This seems to be more obvious and not require any explanation. The checkbox is kept but made invisible - just to avoid controller changes.

File last commit:

r3517:f8daaaf1 beta
r3593:716ac765 beta
Show More
diff_block.html
66 lines | 3.6 KiB | text/html | HtmlLexer
code garden for changeset ranges and comments...
r1787 ## -*- coding: utf-8 -*-
##usage:
## <%namespace name="diff_block" file="/changeset/diff_block.html"/>
Implemented basic compare view(for pull requests) for mercurial.
r2348 ## ${diff_block.diff_block(change)}
code garden for changeset ranges and comments...
r1787 ##
Implemented basic compare view(for pull requests) for mercurial.
r2348 <%def name="diff_block(change)">
collapsable diff container in changeset, makes quick review easier
r3419 <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))}">
Implemented generation of changesets based...
r2995 %for FID,(cs1, cs2, change, path, diff, stats) in change.iteritems():
##%if op !='removed':
<div id="${FID}_target" style="clear:both;margin-top:25px"></div>
<div id="${FID}" class="diffblock margined comm">
code garden for changeset ranges and comments...
r1787 <div class="code-header">
<div class="changeset_header">
<div class="changeset_file">
Implemented generation of changesets based...
r2995 ${h.link_to_if(change!='removed',h.safe_unicode(path),h.url('files_home',repo_name=c.repo_name,
revision=cs2,f_path=h.safe_unicode(path)))}
code garden for changeset ranges and comments...
r1787 </div>
UI fixes...
r1865 <div class="diff-actions">
new patch function, and urls schema....
r2996 <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>
Implemented generation of changesets based...
r2995 <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>
new patch function, and urls schema....
r2996 <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>
Implemented generation of changesets based...
r2995 ${c.ignorews_url(request.GET, h.FID(cs2,path))}
${c.context_url(request.GET, h.FID(cs2,path))}
UI fixes...
r1865 </div>
code garden for changeset ranges and comments...
r1787 <span style="float:right;margin-top:-3px">
<label>
${_('show inline comments')}
Implemented generation of changesets based...
r2995 ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(cs2,path))}
code garden for changeset ranges and comments...
r1787 </label>
</span>
</div>
</div>
<div class="code-body">
Implemented generation of changesets based...
r2995 <div class="full_f_path" path="${h.safe_unicode(path)}"></div>
implements #308 rewrote diffs to enable displaying full diff on each file...
r1789 ${diff|n}
code garden for changeset ranges and comments...
r1787 </div>
</div>
Implemented generation of changesets based...
r2995 ##%endif
code garden for changeset ranges and comments...
r1787 %endfor
collapsable diff container in changeset, makes quick review easier
r3419 </div>
White-space cleanup
r1888 </%def>
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>
white space cleanup
r2478 <div id="${h.FID('',filenode_path)}" class="diffblock margined comm">
Implemented basic compare view(for pull requests) for mercurial.
r2348 <div class="code-header">
<div class="changeset_header">
<div class="changeset_file">
show links to files on compare data at other and org refs
r3357 ${h.safe_unicode(filenode_path)} |
Mads Kiilerich
diff_block: fix link to file revisions...
r3517 <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> -&gt;
use shorter revs in diff block
r3400 <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>
Implemented basic compare view(for pull requests) for mercurial.
r2348 </div>
</div>
</div>
<div class="code-body">
<div class="full_f_path" path="${h.safe_unicode(filenode_path)}"></div>
${diff|n}
</div>
</div>
%endfor
white space cleanup
r2478 </%def>