##// END OF EJS Templates
Fix a lot of casings - use standard casing in most places
Fix a lot of casings - use standard casing in most places

File last commit:

r3603:eacd33e0 beta
r3654:ec635494 beta
Show More
compare_diff.html
89 lines | 3.5 KiB | text/html | HtmlLexer
Created base for diffing two repositories inside rhodecode
r2337 ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
improved title consistency...
r3582 ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} &middot; ${c.rhodecode_name}
Created base for diffing two repositories inside rhodecode
r2337 </%def>
<%def name="breadcrumbs_links()">
Mads Kiilerich
clean-up of breadcrumbs on pages with repo context bar
r3602 ${_('Compare revisions')}
Created base for diffing two repositories inside rhodecode
r2337 </%def>
<%def name="page_nav()">
Mads Kiilerich
use valid options for the top menu: repositories, journal, search and admin
r3603 ${self.menu('repositories')}
Created base for diffing two repositories inside rhodecode
r2337 </%def>
<%def name="main()">
Mads Kiilerich
repository pages: cleanup of use of repository context menu
r3601 ${self.context_bar('changelog')}
Created base for diffing two repositories inside rhodecode
r2337 <div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<div class="table">
<div id="body" class="diffblock">
Mads Kiilerich
repository pages: cleanup of use of repository context menu
r3601 <div class="code-header">
Created base for diffing two repositories inside rhodecode
r2337 <div>
Mads Kiilerich
html templates: escape '>' as '&gt;'
r3138 ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} <a href="${c.swap_url}">[swap]</a>
Created base for diffing two repositories inside rhodecode
r2337 </div>
</div>
</div>
<div id="changeset_compare_view_content">
created pull-request overview
r2395 ##CS
Multiple changes for compare system...
r3015 <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>
created pull-request overview
r2395 <%include file="compare_cs.html" />
## FILES
Multiple changes for compare system...
r3015 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
White space cleanup
r3029
Multiple changes for compare system...
r3015 % 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
White space cleanup
r3029
Multiple changes for compare system...
r3015 </div>
Created base for diffing two repositories inside rhodecode
r2337 <div class="cs_files">
Multiple changes for compare system...
r3015 %if not c.files:
<span class="empty_data">${_('No files')}</span>
%endif
Added basic models for saving open pull requests...
r2434 %for fid, change, f, stat in c.files:
Implemented basic compare view(for pull requests) for mercurial.
r2348 <div class="cs_${change}">
fixed anchor links on compare view
r3316 <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid, **request.GET.mixed()))}</div>
Implemented basic compare view(for pull requests) for mercurial.
r2348 <div class="changes">${h.fancy_file_stats(stat)}</div>
</div>
Created base for diffing two repositories inside rhodecode
r2337 %endfor
</div>
Optimized look of compare view of changesets....
r3011 % if c.limited_diff:
show full diff option should preserve current GET params
r3312 <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h5>
White space cleanup
r3029 % endif
Created base for diffing two repositories inside rhodecode
r2337 </div>
</div>
Added basic models for saving open pull requests...
r2434
Implemented basic compare view(for pull requests) for mercurial.
r2348 ## diff block
<%namespace name="diff_block" file="/changeset/diff_block.html"/>
%for fid, change, f, stat in c.files:
${diff_block.diff_block_simple([c.changes[fid]])}
%endfor
Optimized look of compare view of changesets....
r3011 % if c.limited_diff:
show full diff option should preserve current GET params
r3312 <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h4>
Optimized look of compare view of changesets....
r3011 % endif
Created base for diffing two repositories inside rhodecode
r2337 <script type="text/javascript">
YUE.onDOMReady(function(){
YUE.on(YUQ('.diff-menu-activate'),'click',function(e){
var act = e.currentTarget.nextElementSibling;
if(YUD.hasClass(act,'active')){
YUD.removeClass(act,'active');
YUD.setStyle(act,'display','none');
}else{
YUD.addClass(act,'active');
YUD.setStyle(act,'display','');
}
});
})
</script>
</div>
</%def>