##// END OF EJS Templates
make "Open new pull request" option lower case like other options are
make "Open new pull request" option lower case like other options are

File last commit:

r3188:a51e5da0 beta
r3188:a51e5da0 beta
Show More
changelog.html
306 lines | 14.6 KiB | text/html | HtmlLexer
renamed project to rhodecode
r547 ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
Vincent Duvert
Better i18n for page titles.
r2417 ${_('%s Changelog') % c.repo_name} - ${c.rhodecode_name}
renamed project to rhodecode
r547 </%def>
<%def name="breadcrumbs_links()">
Takumi IINO
i18n 'Home' in breadcrumbs
r2492 ${h.link_to(_(u'Home'),h.url('/'))}
renamed project to rhodecode
r547 &raquo;
${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
&raquo;
Vincent Duvert
Improved i18n on changelog and user group administration pages.
r2312 <% 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)}
renamed project to rhodecode
r547 </%def>
<%def name="page_nav()">
White-space cleanup
r1888 ${self.menu('changelog')}
renamed project to rhodecode
r547 </%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">
Rewrote url routes to make all validations and parsing for compare view + added compare fork button into forked repos
r2363 <div class="info_box" style="clear: both;padding: 10px 6px;vertical-align: right;text-align: right;">
made compare button nicer on changelog view
r2885 <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
Don't allow cherry picking changesets from the changelog using checkboxes....
r2927 <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
whitespace cleanup
r2973
Rewrote url routes to make all validations and parsing for compare view + added compare fork button into forked repos
r2363 %if c.rhodecode_db_repo.fork:
Enabled compare engine for tags...
r3010 <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_ref_type='branch',other_ref='default',repo=c.rhodecode_db_repo.fork.repo_name)}" class="ui-btn small">${_('Compare fork with parent')}</a>
Rewrote url routes to make all validations and parsing for compare view + added compare fork button into forked repos
r2363 %endif
hide open pull request for git repos
r2773 %if h.is_hg(c.rhodecode_repo):
Mads Kiilerich
make "Open new pull request" option lower case like other options are
r3188 <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="ui-btn small">${_('open new pull request')}</a>
hide open pull request for git repos
r2773 %endif
Rewrote url routes to make all validations and parsing for compare view + added compare fork button into forked repos
r2363 </div>
renamed project to rhodecode
r547 <div class="container_header">
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 ${h.form(h.url.current(),method='get')}
implemented #44 - branch filtering in changelog, aka branch browser...
r1656 <div class="info_box" style="float:left">
UI !
r1756 ${h.submit('set',_('Show'),class_="ui-btn")}
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 ${h.text('size',size=1,value=c.size)}
Aras Pranckevicius
changelog: more commits by default; tweak top header layout
r1850 ${_('revisions')}
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 </div>
${h.end_form()}
implemented #44 - branch filtering in changelog, aka branch browser...
r1656 <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
renamed project to rhodecode
r547 </div>
White-space cleanup
r1888
renamed project to rhodecode
r547 %for cnt,cs in enumerate(c.pagination):
UI fixes...
r1865 <div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
renamed project to rhodecode
r547 <div class="left">
Aras Pranckevicius
changelog: more polish
r1853 <div>
fixed compare view for git (by changed to use raw_id)
r2512 ${h.checkbox(cs.raw_id,class_="changeset_range")}
Added h.tooltip to all places that tooltip_title is used....
r2427 <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>
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 </div>
renamed project to rhodecode
r547 <div class="author">
<div class="gravatar">
again #531 forgot to replace other occurences of h.email call
r2732 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>
renamed project to rhodecode
r547 </div>
wrap user name into shorter since super long names just break ui there
r2342 <div title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</div>
renamed project to rhodecode
r547 </div>
Vincent Duvert
Added a translatable date formatter for every date displayed.
r2416 <div class="date">${h.fmt_date(cs.date)}</div>
Aras Pranckevicius
changelog: making less noisy
r1849 </div>
<div class="mid">
removed wrap paragraphs from commit messages as it broke formatting....
r2426 <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>
Aras Pranckevicius
changelog: styling "show more" expander
r1882 <div class="expand"><span class="expandtext">&darr; ${_('show more')} &darr;</span></div>
White-space cleanup
r1888 </div>
renamed project to rhodecode
r547 <div class="right">
fixed small issue with changeset changed files details when clicking to load details via ajax removed info about comments
r2219 <div class="changes">
fixed changed details helper
r2744 <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>
Added number of comments in changelog for each changeset...
r1884 <div class="comments-container">
%if len(c.comments.get(cs.raw_id,[])) > 0:
ui touch ups
r1885 <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>
White-space cleanup
r1888 %endif
Added number of comments in changelog for each changeset...
r1884 </div>
Implemented initial code-review status of changesets
r2217 <div class="changeset-status-container">
%if c.statuses.get(cs.raw_id):
added changeset status into changelog view
r2239 <div title="${_('Changeset status')}" class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div>
- added commenting to pull requests...
r2443 <div class="changeset-status-ico">
%if c.statuses.get(cs.raw_id)[2]:
<a class="tooltip" title="${_('Click to open associated pull request')}" 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>
Implemented initial code-review status of changesets
r2217 %endif
</div>
Added number of comments in changelog for each changeset...
r1884 </div>
Aras Pranckevicius
css: merge/branch/tag blurbs
r1856 %if cs.parents:
renamed project to rhodecode
r547 %for p_cs in reversed(cs.parents):
Aras Pranckevicius
changelog: more polish
r1853 <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>
renamed project to rhodecode
r547 </div>
%endfor
White-space cleanup
r1888 %else:
<div class="parent">${_('No parents')}</div>
%endif
renamed project to rhodecode
r547 <span class="logtags">
Aras Pranckevicius
css: merge/branch/tag blurbs
r1856 %if len(cs.parents)>1:
<span class="merge">${_('merge')}</span>
%endif
display current heads of branches for git in changelog and shortlog
r2198 %if cs.branch:
renamed project to rhodecode
r547 <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
#421 bookmarks in changlog view
r2247 ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</span>
Code refactor for auth func, preparing for ldap support...
r699 %endif
#421 bookmarks in changlog view
r2247 %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))}
small issue fixes
r2269 </span>
%endfor
#421 bookmarks in changlog view
r2247 %endif
renamed project to rhodecode
r547 %for tag in cs.tags:
<span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
imported patch 2260
r2162 ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
renamed project to rhodecode
r547 %endfor
White-space cleanup
r1888 </span>
</div>
renamed project to rhodecode
r547 </div>
White-space cleanup
r1888
renamed project to rhodecode
r547 %endfor
<div class="pagination-wh pagination-left">
${c.pagination.pager('$link_previous ~2~ $link_next')}
White-space cleanup
r1888 </div>
renamed project to rhodecode
r547 </div>
</div>
White-space cleanup
r1888
removed obsolete _static flag from url, and fixed urls in webhelpers
r1050 <script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
renamed project to rhodecode
r547 <script type="text/javascript">
YAHOO.util.Event.onDOMReady(function(){
White-space cleanup
r1888
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 //Monitor range checkboxes and build a link to changesets
White-space cleanup
r1888 //ranges
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 var checkboxes = YUD.getElementsByClassName('changeset_range');
var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
Dan Sheridan
Recreate the pull request URL each time a checkbox is checked
r3116 var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}";
White-space cleanup
r1888 YUE.on(checkboxes,'click',function(e){
Don't allow cherry picking changesets from the changelog using checkboxes....
r2927 var clicked_cb = e.currentTarget;
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 var checked_checkboxes = [];
for (pos in checkboxes){
if(checkboxes[pos].checked){
checked_checkboxes.push(checkboxes[pos]);
}
}
new patch function, and urls schema....
r2996 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'];
White space cleanup
r3029
new patch function, and urls schema....
r2996 }else{
YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
}
Don't allow cherry picking changesets from the changelog using checkboxes....
r2927 }
whitespace cleanup
r2973
fixes #668 cherry picking of changeset should also work now on picking single changesets, and the ones from top
r3076 if(checked_checkboxes.length>0){
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 var rev_end = checked_checkboxes[0].name;
var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
White-space cleanup
r1888
Don't allow cherry picking changesets from the changelog using checkboxes....
r2927 // 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;
}
whitespace cleanup
r2973
Don't allow cherry picking changesets from the changelog using checkboxes....
r2927 }
whitespace cleanup
r2973
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 var url = url_tmpl.replace('__REVRANGE__',
rev_start+'...'+rev_end);
White-space cleanup
r1888
Don't allow cherry picking changesets from the changelog using checkboxes....
r2927 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','');
whitespace cleanup
r2973
Dan Sheridan
Recreate the pull request URL each time a checkbox is checked
r3116 YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end);
White space cleanup
r3029
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 }
else{
YUD.setStyle('rev_range_container','display','none');
Don't allow cherry picking changesets from the changelog using checkboxes....
r2927 YUD.setStyle('rev_range_clear','display','none');
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 }
White-space cleanup
r1888 });
Don't allow cherry picking changesets from the changelog using checkboxes....
r2927 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);
})
UI fixes...
r1865 var msgs = YUQ('.message');
Aras Pranckevicius
changelog: simplify row expansion and fix for Firefox (parentElement->parentNode)
r1879 // get first element height
fixes expand button on changeset
r1934 var el = YUQ('#graph_content .container')[0];
UI fixes...
r1865 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){
fixes expand button on changeset
r1934 var offset = row_h - (h+12);
UI fixes...
r1865 YUD.setStyle(m.nextElementSibling,'display','block');
fixes expand button on changeset
r1934 YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');
UI fixes...
r1865 };
}
YUE.on(YUQ('.expand'),'click',function(e){
Aras Pranckevicius
changelog: simplify row expansion and fix for Firefox (parentElement->parentNode)
r1879 var elem = e.currentTarget.parentNode.parentNode;
UI fixes...
r1865 YUD.setStyle(e.currentTarget,'display','none');
Aras Pranckevicius
changelog: simplify row expansion and fix for Firefox (parentElement->parentNode)
r1879 YUD.setStyle(elem,'height','auto');
White-space cleanup
r1888
Aras Pranckevicius
graph: fix counting of "heads" for graph, condense graph into more narrow lines instead of trying to increase its width (past certain width produces really bad html layout)
r2924 //redraw the graph, line_count and jsdata are global vars
set_canvas(100);
White-space cleanup
r1888
UI fixes...
r1865 var r = new BranchRenderer();
Aras Pranckevicius
graph: fix counting of "heads" for graph, condense graph into more narrow lines instead of trying to increase its width (past certain width produces really bad html layout)
r2924 r.render(jsdata,100,line_count);
White-space cleanup
r1888
UI fixes...
r1865 })
White-space cleanup
r1888
// Fetch changeset details
changelog uses lazy loading of affected files details, in some scenarios this can improve speed...
r1431 YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){
fixed changed details helper
r2744 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_',''));
fixed small issue with changeset changed files details when clicking to load details via ajax removed info about comments
r2219 ypjax(url,id,function(){tooltip_activate()});
changelog uses lazy loading of affected files details, in some scenarios this can improve speed...
r1431 });
White-space cleanup
r1888
implemented #44 - branch filtering in changelog, aka branch browser...
r1656 // 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;
}
White-space cleanup
r1888
implemented #44 - branch filtering in changelog, aka branch browser...
r1656 });
White-space cleanup
r1888
Aras Pranckevicius
graph: fix counting of "heads" for graph, condense graph into more narrow lines instead of trying to increase its width (past certain width produces really bad html layout)
r2924 function set_canvas(width) {
renamed project to rhodecode
r547 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);
Aras Pranckevicius
graph: fix counting of "heads" for graph, condense graph into more narrow lines instead of trying to increase its width (past certain width produces really bad html layout)
r2924 c.style.height=width+'px';
canvas.setAttribute('width',width);
renamed project to rhodecode
r547 };
improved rendering of dag (they are not trimmed anymore when number of heads exceeds 5)
r1429 var heads = 1;
Aras Pranckevicius
graph: fix counting of "heads" for graph, condense graph into more narrow lines instead of trying to increase its width (past certain width produces really bad html layout)
r2924 var line_count = 0;
renamed project to rhodecode
r547 var jsdata = ${c.jsdata|n};
White-space cleanup
r1888
Aras Pranckevicius
graph: fix counting of "heads" for graph, condense graph into more narrow lines instead of trying to increase its width (past certain width produces really bad html layout)
r2924 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;
}
improved rendering of dag (they are not trimmed anymore when number of heads exceeds 5)
r1429 }
Aras Pranckevicius
graph: fix counting of "heads" for graph, condense graph into more narrow lines instead of trying to increase its width (past certain width produces really bad html layout)
r2924 set_canvas(100);
White-space cleanup
r1888
renamed project to rhodecode
r547 var r = new BranchRenderer();
Aras Pranckevicius
graph: fix counting of "heads" for graph, condense graph into more narrow lines instead of trying to increase its width (past certain width produces really bad html layout)
r2924 r.render(jsdata,100,line_count);
White-space cleanup
r1888
renamed project to rhodecode
r547 });
</script>
%else:
${_('There are no changes yet')}
White-space cleanup
r1888 %endif
renamed project to rhodecode
r547 </div>
White-space cleanup
r1888 </div>
UI fixes...
r1865 </%def>