Files
@ eafe5ae429ea
Branch filter:
Location: kallithea/rhodecode/templates/changeset/changeset_range.html - annotation
eafe5ae429ea
3.2 KiB
text/html
Added compare view into journal, fixed wrong function call to show compare view
28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 134e169f11a4 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 | <%inherit file="/base/base.html"/>
<%def name="title()">
${c.repo_name} ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} - ${c.rhodecode_name}
</%def>
<%def name="breadcrumbs_links()">
${h.link_to(u'Home',h.url('/'))}
»
${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
»
${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
</%def>
<%def name="page_nav()">
${self.menu('changelog')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<div class="table">
<div id="body" class="diffblock">
<div class="code-header">
<div>
${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
##» <span>${h.link_to(_('raw diff'),
##h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show'))}</span>
##» <span>${h.link_to(_('download diff'),
##h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download'))}</span>
</div>
</div>
</div>
<div id="changeset_content">
<div class="container">
</div>
<span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span>
<div class="cs_files">
%for cs in c.cs_ranges:
<div class="cur_cs">r${cs}</div>
%for change,filenode,diff,cs1,cs2 in c.changes[cs.raw_id]:
<div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor=h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path))))}</div>
%endfor
%endfor
</div>
</div>
</div>
%for cs in c.cs_ranges:
%for change,filenode,diff,cs1,cs2 in c.changes[cs.raw_id]:
%if change !='removed':
<div style="clear:both;height:10px"></div>
<div class="diffblock">
<div id="${h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path))}" class="code-header">
<div class="changeset_header">
<span class="changeset_file">
${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name,
revision=filenode.changeset.raw_id,f_path=filenode.path))}
</span>
%if 1:
» <span>${h.link_to(_('diff'),
h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='diff'))}</span>
» <span>${h.link_to(_('raw diff'),
h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='raw'))}</span>
» <span>${h.link_to(_('download diff'),
h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='download'))}</span>
%endif
</div>
</div>
<div class="code-body">
%if diff:
${diff|n}
%else:
${_('No changes in this file')}
%endif
</div>
</div>
%endif
%endfor
%endfor
</div>
</%def>
|