Files
@ a91fa221a3b8
Branch filter:
Location: kallithea/rhodecode/templates/changelog/changelog.html - annotation
a91fa221a3b8
16.4 KiB
text/html
be more explicit about constructing compare url
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 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 76d156bef5a2 1e757ac98988 1e757ac98988 1e757ac98988 79818f546538 1e757ac98988 1e757ac98988 1e757ac98988 f6d57d055d1e f6d57d055d1e 1e757ac98988 1e757ac98988 1e757ac98988 b4f401524060 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 745dda7817ed 28d742d71d4e 58bb350bfef8 9937afa7f093 745dda7817ed b36285f90f89 745dda7817ed 1e5996308363 a51e5da0989b 1e5996308363 745dda7817ed b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 833f9dec0a06 b4f401524060 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 44f328d6f209 b4f401524060 b4f401524060 b80c2f617d44 496cfa1025e7 b4f401524060 b4f401524060 b4f401524060 94886e8432a2 0614862a20ec 0614862a20ec 350d95dece6f 350d95dece6f 350d95dece6f 350d95dece6f 350d95dece6f 350d95dece6f f91d3f9b7230 0614862a20ec 76947224bf27 76947224bf27 493e03a4d268 fd0a822481ec fd0a822481ec 54a596abfa65 fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec 76947224bf27 76947224bf27 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 f91d3f9b7230 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 99536f257644 b4f401524060 99536f257644 99536f257644 99536f257644 99536f257644 f1467dfcf093 f1467dfcf093 99536f257644 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 28524453bb76 f91d3f9b7230 28524453bb76 28524453bb76 bd8ef7119688 f91d3f9b7230 b4f401524060 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 28524453bb76 ebe3e388bbb3 ebe3e388bbb3 ebe3e388bbb3 ebe3e388bbb3 685ebc84c2e9 ebe3e388bbb3 ebe3e388bbb3 ebe3e388bbb3 58bb350bfef8 9937afa7f093 5deb16cd2802 b4f401524060 b4f401524060 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 58bb350bfef8 b4f401524060 b4f401524060 b4f401524060 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 b4f401524060 58bb350bfef8 58bb350bfef8 9937afa7f093 b4f401524060 9937afa7f093 28524453bb76 b4f401524060 f91d3f9b7230 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 9937afa7f093 bd8ef7119688 685ebc84c2e9 28524453bb76 28524453bb76 b4f401524060 b4f401524060 28524453bb76 f91d3f9b7230 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 58bb350bfef8 37b3c3244bbc 395dfc93fe73 af1fafcd5927 37b3c3244bbc 37b3c3244bbc b4f401524060 37b3c3244bbc b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 37b3c3244bbc 37b3c3244bbc b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 b4f401524060 fcbcef60be02 f91d3f9b7230 37b3c3244bbc fcbcef60be02 f91d3f9b7230 37b3c3244bbc f91d3f9b7230 f91d3f9b7230 d5d7c40e8591 b4f401524060 b4f401524060 b4f401524060 b4f401524060 d5d7c40e8591 f91d3f9b7230 833f9dec0a06 833f9dec0a06 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 833f9dec0a06 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 b4f401524060 fcbcef60be02 fcbcef60be02 fcbcef60be02 fcbcef60be02 fcbcef60be02 fcbcef60be02 b4f401524060 b4f401524060 f91d3f9b7230 b4f401524060 b4f401524060 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 1e757ac98988 f91d3f9b7230 37b3c3244bbc | ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
${_('%s Changelog') % c.repo_name} - ${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))}
»
<% size = c.size if c.size <= c.total_cs else c.total_cs %>
${_('Changelog')} - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
</%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">
% if c.pagination:
<div id="graph">
<div id="graph_nodes">
<canvas id="graph_canvas"></canvas>
</div>
<div id="graph_content">
<div class="info_box" style="clear: both;padding: 10px 6px;vertical-align: right;text-align: right;">
<a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
<a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
%if c.rhodecode_db_repo.fork:
<a title="${_('compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref=request.GET.get('branch') or 'default',other_repo=c.rhodecode_db_repo.fork.repo_name,other_ref_type='branch',other_ref='default')}" class="ui-btn small">${_('Compare fork with parent')}</a>
%endif
%if h.is_hg(c.rhodecode_repo):
<a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="ui-btn small">${_('open new pull request')}</a>
%endif
</div>
<div class="container_header">
${h.form(h.url.current(),method='get')}
<div class="info_box" style="float:left">
${h.submit('set',_('Show'),class_="ui-btn")}
${h.text('size',size=1,value=c.size)}
${_('revisions')}
</div>
${h.end_form()}
<div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
</div>
%for cnt,cs in enumerate(c.pagination):
<div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
<div class="left">
<div>
${h.checkbox(cs.raw_id,class_="changeset_range")}
<span class="tooltip" title="${h.tooltip(h.age(cs.date))}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>
</div>
<div class="author">
<div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>
</div>
<div title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</div>
</div>
<div class="date">${h.fmt_date(cs.date)}</div>
</div>
<div class="mid">
<div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
<div class="expand"><span class="expandtext">↓ ${_('show more')} ↓</span></div>
</div>
<div class="right">
<div class="changes">
<div id="changed_total_${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${h.tooltip(_('Affected number of files, click to show more details'))}">${len(cs.affected_files)}</div>
<div class="comments-container">
%if len(c.comments.get(cs.raw_id,[])) > 0:
<div class="comments-cnt" title="${('comments')}">
<a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
<div class="comments-cnt">${len(c.comments[cs.raw_id])}</div>
<img src="${h.url('/images/icons/comments.png')}">
</a>
</div>
%endif
</div>
<div class="changeset-status-container">
%if c.statuses.get(cs.raw_id):
<div title="${_('Changeset status')}" class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div>
<div class="changeset-status-ico">
%if c.statuses.get(cs.raw_id)[2]:
<a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /></a>
%else:
<img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
%endif
</div>
%endif
</div>
</div>
%if cs.parents:
%for p_cs in reversed(cs.parents):
<div class="parent">${_('Parent')}
<span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
</div>
%endfor
%else:
<div class="parent">${_('No parents')}</div>
%endif
<span class="logtags">
%if len(cs.parents)>1:
<span class="merge">${_('merge')}</span>
%endif
%if cs.branch:
<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</span>
%endif
%if h.is_hg(c.rhodecode_repo):
%for book in cs.bookmarks:
<span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</span>
%endfor
%endif
%for tag in cs.tags:
<span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
%endfor
</span>
</div>
</div>
%endfor
<div class="pagination-wh pagination-left">
${c.pagination.pager('$link_previous ~2~ $link_next')}
</div>
</div>
</div>
<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
<script type="text/javascript">
YAHOO.util.Event.onDOMReady(function(){
//Monitor range checkboxes and build a link to changesets
//ranges
var checkboxes = YUD.getElementsByClassName('changeset_range');
var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}";
YUE.on(checkboxes,'click',function(e){
var clicked_cb = e.currentTarget;
var checked_checkboxes = [];
for (pos in checkboxes){
if(checkboxes[pos].checked){
checked_checkboxes.push(checkboxes[pos]);
}
}
if(YUD.get('open_new_pr')){
if(checked_checkboxes.length>0){
// modify open pull request to show we have selected cs
YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
}else{
YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
}
}
if(checked_checkboxes.length>0){
var rev_end = checked_checkboxes[0].name;
var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
// now select all checkboxes in the middle.
var checked = false;
for (var i=0; i<checkboxes.length; i++){
var cb = checkboxes[i];
var rev = cb.name;
if (rev == rev_end){
checked = true;
}
if (checked){
cb.checked = true;
}
else{
cb.checked = false;
}
if (rev == rev_start){
checked = false;
}
}
var url = url_tmpl.replace('__REVRANGE__',
rev_start+'...'+rev_end);
var link = _TM['Show selected changes __S -> __E'];
link = link.replace('__S',rev_start.substr(0,6));
link = link.replace('__E',rev_end.substr(0,6));
YUD.get('rev_range_container').href = url;
YUD.get('rev_range_container').innerHTML = link;
YUD.setStyle('rev_range_container','display','');
YUD.setStyle('rev_range_clear','display','');
YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end);
}
else{
YUD.setStyle('rev_range_container','display','none');
YUD.setStyle('rev_range_clear','display','none');
}
});
YUE.on('rev_range_clear','click',function(e){
for (var i=0; i<checkboxes.length; i++){
var cb = checkboxes[i];
cb.checked = false;
}
YUE.preventDefault(e);
})
var msgs = YUQ('.message');
// get first element height
var el = YUQ('#graph_content .container')[0];
var row_h = el.clientHeight;
for(var i=0;i<msgs.length;i++){
var m = msgs[i];
var h = m.clientHeight;
var pad = YUD.getStyle(m,'padding');
if(h > row_h){
var offset = row_h - (h+12);
YUD.setStyle(m.nextElementSibling,'display','block');
YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');
};
}
YUE.on(YUQ('.expand'),'click',function(e){
var elem = e.currentTarget.parentNode.parentNode;
YUD.setStyle(e.currentTarget,'display','none');
YUD.setStyle(elem,'height','auto');
//redraw the graph, line_count and jsdata are global vars
set_canvas(100);
var r = new BranchRenderer();
r.render(jsdata,100,line_count);
})
// Fetch changeset details
YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){
var id = e.currentTarget.id;
var url = "${h.url('changelog_details',repo_name=c.repo_name,cs='__CS__')}";
var url = url.replace('__CS__',id.replace('changed_total_',''));
ypjax(url,id,function(){tooltip_activate()});
});
// change branch filter
YUE.on(YUD.get('branch_filter'),'change',function(e){
var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}";
var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}";
var url = url.replace('__BRANCH__',selected_branch);
if(selected_branch != ''){
window.location = url;
}else{
window.location = url_main;
}
});
function set_canvas(width) {
var c = document.getElementById('graph_nodes');
var t = document.getElementById('graph_content');
canvas = document.getElementById('graph_canvas');
var div_h = t.clientHeight;
c.style.height=div_h+'px';
canvas.setAttribute('height',div_h);
c.style.height=width+'px';
canvas.setAttribute('width',width);
};
var heads = 1;
var line_count = 0;
var jsdata = ${c.jsdata|n};
for (var i=0;i<jsdata.length;i++) {
var in_l = jsdata[i][2];
for (var j in in_l) {
var m = in_l[j][1];
if (m > line_count)
line_count = m;
}
}
set_canvas(100);
var r = new BranchRenderer();
r.render(jsdata,100,line_count);
});
</script>
%else:
${_('There are no changes yet')}
%endif
</div>
</div>
</%def>
|