Files
@ 80ae9f5e9b32
Branch filter:
Location: kallithea/kallithea/templates/compare/compare_cs.html
80ae9f5e9b32
5.2 KiB
text/html
notifications: remove custom 'container' class to avoid conflict with Bootstrap ... and rewrite things to use plain Bootstrap
Most of the markup and styling turned out to be easy to replace with plain
Bootstrap markup.
Most of the markup and styling turned out to be easy to replace with plain
Bootstrap markup.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | ## Changesets table !
<div>
%if not c.cs_ranges:
<span class="empty_data">${_('No changesets')}</span>
%else:
%if c.ancestors:
<div class="ancestor">
%if len(c.ancestors) > 1:
<div class="text-danger">
${_('Criss cross merge situation with multiple merge ancestors detected!')}
</div>
<div>
${_('Please merge the target branch to your branch before creating a pull request.')}
</div>
%endif
<div>
${_('Merge Ancestor')}:
%for ancestor in c.ancestors:
${h.link_to(h.short_id(ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=ancestor), class_="changeset_hash")}
%endfor
</div>
</div>
%endif
<div id="graph_nodes">
<canvas id="graph_canvas"></canvas>
</div>
<div id="graph_content_pr">
<table class="table compare_view_commits">
%for cnt, cs in enumerate(reversed(c.cs_ranges)):
<tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
<td>
%if cs.raw_id in c.statuses:
<div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
<i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>
</div>
%endif
%if c.cs_comments.get(cs.raw_id):
<div class="comments-container">
<div class="comments-cnt" title="${_('Changeset has comments')}">
<a href="${c.cs_comments[cs.raw_id][0].url()}">
${len(c.cs_comments[cs.raw_id])}
<i class="icon-comment"></i>
</a>
</div>
</div>
%endif
</td>
<td class="changeset-logical-index">
<%
num_cs = len(c.cs_ranges)
index = num_cs - cnt
if index == 1:
title = _('First (oldest) changeset in this list')
elif index == num_cs:
title = _('Last (most recent) changeset in this list')
else:
title = _('Position in this list of changesets')
%>
<span data-toggle="tooltip" title="${title}">
${index}
</span>
</td>
<td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
<td class="author">
${h.gravatar(h.email_or_none(cs.author), size=16)}
<span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
</td>
<td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>
<td>
%if cs.branch:
<span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>
%endif
</td>
<td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
<i class="icon-align-left"></i>
</td>
<td class="mid">
<div class="pull-right">
%for tag in cs.tags:
<span class="tagtag" title="${_('Tag %s') % tag}">
${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
</span>
%endfor
</div>
<div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div>
</td>
</tr>
%endfor
</table>
</div>
%if c.is_ajax_preview:
<h5>
## links should perhaps use ('rev', c.a_rev) instead ...
${h.link_to(_('Show merge diff'),
h.url('compare_url',
repo_name=c.a_repo.repo_name,
org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name,
other_repo=c.cs_repo.repo_name,
other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,
merge='1')
)}
</h5>
%endif
%if c.cs_ranges_org is not None:
## TODO: list actual changesets?
<div>
${h.link_to_ref(c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}
${_('is')}
<a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>
${_('behind')}
${h.link_to_ref(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name)}
</div>
%endif
%endif
</div>
%if c.is_ajax_preview:
<div id="jsdata" style="display:none">${h.js(c.jsdata)}</div>
%else:
<script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>
%endif
<script type="text/javascript">
$(document).ready(function(){
var jsdata = ${h.js(c.jsdata)};
var r = new BranchRenderer('graph_canvas', 'graph_content_pr', 'chg_');
r.render(jsdata);
$('.expand_commit').click(function(e){
var cid = $(this).data('commit_id');
$('#C-'+cid).toggleClass('expanded');
r.render(jsdata);
});
$('.gravatar').click(function(e){
var cid = $(this).data('commit_id');
$('#row-'+cid).toggleClass('hl', !$('#row-'+cid).hasClass('hl'));
});
});
</script>
|