changeset.html
283 lines
| 14.5 KiB
| text/html
|
HtmlLexer
r1130 | ## -*- coding: utf-8 -*- | |||
r547 | <%inherit file="/base/base.html"/> | |||
<%def name="title()"> | ||||
|
r4116 | ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)} | ||
%if c.rhodecode_name: | ||||
· ${c.rhodecode_name} | ||||
%endif | ||||
r547 | </%def> | |||
<%def name="breadcrumbs_links()"> | ||||
|
r3602 | ${_('Changeset')} - <span class='hash'>r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}</span> | ||
r547 | </%def> | |||
<%def name="page_nav()"> | ||||
|
r3603 | ${self.menu('repositories')} | ||
r547 | </%def> | |||
<%def name="main()"> | ||||
|
r3988 | ${self.repo_context_bar('changelog')} | ||
r547 | <div class="box"> | |||
<!-- box / title --> | ||||
<div class="title"> | ||||
${self.breadcrumbs()} | ||||
</div> | ||||
r2995 | <script> | |||
var _USERS_AC_DATA = ${c.users_array|n}; | ||||
|
r4116 | var _GROUPS_AC_DATA = ${c.user_groups_array|n}; | ||
r2995 | AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}"; | |||
AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"; | ||||
</script> | ||||
r547 | <div class="table"> | |||
|
r3197 | <div class="diffblock"> | ||
r3078 | <div class="parents"> | |||
|
r4116 | <div id="parent_link" class="changeset_hash"> | ||
<i style="color:#036185" class="icon-chevron-left"></i> <a href="#">${_('parent rev.')}</a> | ||||
</div> | ||||
r3078 | </div> | |||
|
r4116 | |||
r3078 | <div class="children"> | |||
|
r4116 | <div id="child_link" class="changeset_hash"> | ||
<a href="#">${_('child rev.')}</a> <i style="color:#036185" class="icon-chevron-right"></i> | ||||
</div> | ||||
r3149 | </div> | |||
|
r4116 | |||
|
r3197 | <div class="code-header banner"> | ||
r2239 | <div class="changeset-status-container"> | |||
%if c.statuses: | ||||
|
r4116 | <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[0])}" /></div> | ||
<div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div> | ||||
r2239 | %endif | |||
</div> | ||||
r1865 | <div class="diff-actions"> | |||
|
r4116 | <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"> | ||
<img class="icon" src="${h.url('/images/icons/page_white.png')}"/> | ||||
</a> | ||||
<a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('Patch diff'))}"> | ||||
<img class="icon" src="${h.url('/images/icons/page_add.png')}"/> | ||||
</a> | ||||
<a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"> | ||||
<img class="icon" src="${h.url('/images/icons/page_save.png')}"/> | ||||
</a> | ||||
r2161 | ${c.ignorews_url(request.GET)} | |||
${c.context_url(request.GET)} | ||||
r1865 | </div> | |||
|
r2310 | <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div> | ||
r3149 | </div> | |||
|
r3197 | </div> | ||
<div id="changeset_content"> | ||||
<div class="container"> | ||||
|
r4116 | |||
<div class="right"> | ||||
<div class="changes"> | ||||
r2996 | % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff: | |||
|
r3654 | <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span> | ||
<span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span> | ||||
<span class="added" title="${_('Added')}">${len(c.changeset.added)}</span> | ||||
|
r3197 | % else: | ||
|
r3654 | <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span> | ||
<span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span> | ||||
<span class="added" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span> | ||||
|
r3197 | % endif | ||
|
r4116 | </div> | ||
<span class="logtags"> | ||||
%if len(c.changeset.parents)>1: | ||||
<span class="merge">${_('merge')}</span> | ||||
%endif | ||||
r1888 | ||||
|
r4116 | %if h.is_hg(c.rhodecode_repo): | ||
%for book in c.changeset.bookmarks: | ||||
<span class="booktag" title="${_('Bookmark %s') % book}"> | ||||
${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} | ||||
</span> | ||||
%endfor | ||||
%endif | ||||
%for tag in c.changeset.tags: | ||||
|
r3654 | <span class="tagtag" title="${_('Tag %s') % tag}"> | ||
|
r3197 | ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> | ||
|
r4116 | %endfor | ||
%if c.changeset.branch: | ||||
r3727 | <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}"> | |||
${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} | ||||
</span> | ||||
|
r4116 | %endif | ||
</span> | ||||
</div> | ||||
<div class="left"> | ||||
<div class="author"> | ||||
<div class="gravatar"> | ||||
<img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.changeset.author),20)}"/> | ||||
</div> | ||||
<span><b>${h.person(c.changeset.author)}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/> | ||||
<span>${h.email_or_none(c.changeset.author)}</span><br/> | ||||
</div> | ||||
<div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div> | ||||
</div> | ||||
|
r3197 | </div> | ||
|
r4116 | <div class="changes_txt"> | ||
r2995 | % if c.limited_diff: | |||
r3014 | ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}: | |||
r2995 | % else: | |||
|
r3197 | ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}: | ||
%endif | ||||
|
r4116 | </div> | ||
|
r3197 | <div class="cs_files"> | ||
r2995 | %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems(): | |||
<div class="cs_${change}"> | ||||
<div class="node"> | ||||
<a href="#${FID}">${h.safe_unicode(path)}</a> | ||||
</div> | ||||
<div class="changes">${h.fancy_file_stats(stats)}</div> | ||||
</div> | ||||
%endfor | ||||
% if c.limited_diff: | ||||
|
r3654 | <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5> | ||
r2995 | % endif | |||
|
r3197 | </div> | ||
</div> | ||||
r1888 | ||||
r547 | </div> | |||
r2995 | ||||
r1888 | ## diff block | |||
r1787 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> | |||
r2995 | ${diff_block.diff_block(c.changes[c.changeset.raw_id])} | |||
% if c.limited_diff: | ||||
|
r3654 | <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h4> | ||
r2995 | % endif | |||
r1888 | ||||
r1787 | ## template for inline comment form | |||
r1670 | <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> | |||
r2489 | ${comment.comment_inline_form()} | |||
r1888 | ||||
r2608 | ## render comments and inlines | |||
${comment.generate_comments()} | ||||
## main comment form and it status | ||||
r2439 | ${comment.comments(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id), | |||
h.changeset_status(c.rhodecode_db_repo, c.changeset.raw_id))} | ||||
r2489 | ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS | |||
r1674 | <script type="text/javascript"> | |||
r1677 | YUE.onDOMReady(function(){ | |||
r1787 | YUE.on(YUQ('.show-inline-comments'),'change',function(e){ | |||
var show = 'none'; | ||||
var target = e.currentTarget; | ||||
|
r2723 | if(target == null){ | ||
target = this; | ||||
} | ||||
r1787 | if(target.checked){ | |||
var show = '' | ||||
} | ||||
var boxid = YUD.getAttribute(target,'id_for'); | ||||
var comments = YUQ('#{0} .inline-comments'.format(boxid)); | ||||
r1888 | for(c in comments){ | |||
r1787 | YUD.setStyle(comments[c],'display',show); | |||
} | ||||
var btns = YUQ('#{0} .inline-comments-button'.format(boxid)); | ||||
r1888 | for(c in btns){ | |||
r1772 | YUD.setStyle(btns[c],'display',show); | |||
r1888 | } | |||
r1787 | }) | |||
r1888 | ||||
r1677 | YUE.on(YUQ('.line'),'click',function(e){ | |||
r1787 | var tr = e.currentTarget; | |||
|
r2723 | if(tr == null){ | ||
tr = this; | ||||
} | ||||
r1787 | injectInlineForm(tr); | |||
r1682 | }); | |||
r1888 | ||||
r1682 | // inject comments into they proper positions | |||
var file_comments = YUQ('.inline-comment-placeholder'); | ||||
r2187 | renderInlineComments(file_comments); | |||
|
r4116 | |||
pyroutes.register('changeset_home', | ||||
"${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", | ||||
['repo_name', 'revision']); | ||||
//next links | ||||
$('#child_link').on('click', function(e){ | ||||
//fetch via ajax what is going to be the next link, if we have | ||||
//>1 links show them to user to choose | ||||
if(!$('#child_link').hasClass('disabled')){ | ||||
$.ajax({ | ||||
url: '${h.url('changeset_children',repo_name=c.repo_name, revision=c.changeset.raw_id)}', | ||||
success: function(data) { | ||||
if(data.results.length === 0){ | ||||
$('#child_link').addClass('disabled'); | ||||
$('#child_link').html('${_('no revisions')}'); | ||||
} | ||||
if(data.results.length === 1){ | ||||
var commit = data.results[0]; | ||||
window.location = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': commit.raw_id}); | ||||
} | ||||
else if(data.results.length === 2){ | ||||
$('#child_link').addClass('disabled'); | ||||
$('#child_link').addClass('double'); | ||||
var _html = ''; | ||||
_html +='<a title="__title__" href="__url__">__rev__</a> <i style="color:#036185" class="icon-chevron-right"></i>' | ||||
.replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6))) | ||||
.replace('__title__', data.results[0].message) | ||||
.replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id})); | ||||
_html +='<br/>' | ||||
_html +='<a title="__title__" href="__url__">__rev__</a> <i style="color:#036185" class="icon-chevron-right"></i>' | ||||
.replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6))) | ||||
.replace('__title__', data.results[1].message) | ||||
.replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[1].raw_id})); | ||||
$('#child_link').html(_html); | ||||
} | ||||
}, | ||||
}); | ||||
e.preventDefault(); | ||||
} | ||||
}) | ||||
//prev links | ||||
$('#parent_link').on('click', function(e){ | ||||
//fetch via ajax what is going to be the next link, if we have | ||||
//>1 links show them to user to choose | ||||
if(!$('#parent_link').hasClass('disabled')){ | ||||
$.ajax({ | ||||
url: '${h.url('changeset_parents',repo_name=c.repo_name, revision=c.changeset.raw_id)}', | ||||
success: function(data) { | ||||
if(data.results.length === 0){ | ||||
$('#parent_link').addClass('disabled'); | ||||
$('#parent_link').html('${_('no revisions')}'); | ||||
} | ||||
if(data.results.length === 1){ | ||||
var commit = data.results[0]; | ||||
window.location = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': commit.raw_id}); | ||||
} | ||||
else if(data.results.length === 2){ | ||||
$('#parent_link').addClass('disabled'); | ||||
$('#parent_link').addClass('double'); | ||||
var _html = ''; | ||||
_html +='<i style="color:#036185" class="icon-chevron-left"></i> <a title="__title__" href="__url__">__rev__</a>' | ||||
.replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6))) | ||||
.replace('__title__', data.results[0].message) | ||||
.replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id})); | ||||
_html +='<br/>' | ||||
_html +='<i style="color:#036185" class="icon-chevron-left"></i> <a title="__title__" href="__url__">__rev__</a>' | ||||
.replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6))) | ||||
.replace('__title__', data.results[1].message) | ||||
.replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[1].raw_id})); | ||||
$('#parent_link').html(_html); | ||||
} | ||||
}, | ||||
}); | ||||
e.preventDefault(); | ||||
} | ||||
}) | ||||
r1677 | }) | |||
r1888 | ||||
</script> | ||||
r1787 | </div> | |||
|
r1472 | </%def> | ||