Files
@ a07296564f6b
Branch filter:
Location: kallithea/rhodecode/templates/journal/journal_data.html - annotation
a07296564f6b
2.3 KiB
text/html
compare: show aggregated diff of what will be merged to other repo, using merge ancestor
pull_request.get_compare_data will also now return the ancestor that would be
used for actual merging. Showing a diff from that ancestor instead of the first
'new' changeset will give a more realistic diff that doesn't include merges.
pull_request.get_compare_data will also now return the ancestor that would be
used for actual merging. Showing a diff from that ancestor instead of the first
'new' changeset will give a more realistic diff that doesn't include merges.
69e744932d22 69e744932d22 69e744932d22 69e744932d22 69e744932d22 98be43b888c4 b4f401524060 b4f401524060 b4f401524060 b4f401524060 44827c84dc66 b4f401524060 44827c84dc66 44827c84dc66 44827c84dc66 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 69e744932d22 69e744932d22 f91d3f9b7230 753aeb4a5c58 753aeb4a5c58 753aeb4a5c58 753aeb4a5c58 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 753aeb4a5c58 753aeb4a5c58 753aeb4a5c58 753aeb4a5c58 753aeb4a5c58 753aeb4a5c58 69e744932d22 753aeb4a5c58 753aeb4a5c58 f91d3f9b7230 f91d3f9b7230 | ## -*- coding: utf-8 -*-
%if c.journal_day_aggreagate:
%for day,items in c.journal_day_aggreagate:
<div class="journal_day">${day}</div>
% for user,entries in items:
<div class="journal_container">
<div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(user.email if user else 'anonymous@rhodecode.org',24)}"/>
</div>
%if user:
<div class="journal_user">${user.name} ${user.lastname}</div>
%else:
<div class="journal_user deleted">${entries[0].username}</div>
%endif
<div class="journal_action_container">
% for entry in entries:
<div class="journal_icon"> ${h.action_parser(entry)[2]()}</div>
<div class="journal_action">${h.action_parser(entry)[0]()}</div>
<div class="journal_repo">
<span class="journal_repo_name">
%if entry.repository is not None:
${h.link_to(entry.repository.repo_name,
h.url('summary_home',repo_name=entry.repository.repo_name))}
%else:
${entry.repository_name}
%endif
</span>
</div>
<div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div>
<div class="date"><span class="tooltip" title="${h.tooltip(h.fmt_date(entry.action_date))}">${h.age(entry.action_date)}</span></div>
%endfor
</div>
</div>
%endfor
%endfor
<div class="pagination-wh pagination-left">
<script type="text/javascript">
YUE.onDOMReady(function(){
YUE.delegate("journal","click",function(e, matchedEl, container){
ypjax(e.target.href,"journal",function(){
show_more_event();
tooltip_activate();
show_changeset_tooltip();
});
YUE.preventDefault(e);
},'.pager_link');
});
</script>
${c.journal_pager.pager('$link_previous ~2~ $link_next')}
</div>
%else:
<div style="padding:5px 0px 10px 10px;">
${_('No entries yet')}
</div>
%endif
|