##// END OF EJS Templates
fixed VCS tests after executable big issue was fixed
fixed VCS tests after executable big issue was fixed

File last commit:

r3728:938e3079 default
r3854:d7a5da0d default
Show More
changeset.html
206 lines | 10.1 KiB | text/html | HtmlLexer
fixed some limits in changesets and changelogs
r1130 ## -*- coding: utf-8 -*-
renamed project to rhodecode
r547 <%inherit file="/base/base.html"/>
<%def name="title()">
improved title consistency...
r3582 ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)} &middot; ${c.rhodecode_name}
renamed project to rhodecode
r547 </%def>
<%def name="breadcrumbs_links()">
Mads Kiilerich
clean-up of breadcrumbs on pages with repo context bar
r3602 ${_('Changeset')} - <span class='hash'>r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}</span>
renamed project to rhodecode
r547 </%def>
<%def name="page_nav()">
Mads Kiilerich
use valid options for the top menu: repositories, journal, search and admin
r3603 ${self.menu('repositories')}
renamed project to rhodecode
r547 </%def>
<%def name="main()">
Leonardo
Adding context bar to the changeset page
r3533 ${self.context_bar('changelog')}
renamed project to rhodecode
r547 <div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
Implemented generation of changesets based...
r2995 <script>
var _USERS_AC_DATA = ${c.users_array|n};
var _GROUPS_AC_DATA = ${c.users_groups_array|n};
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>
renamed project to rhodecode
r547 <div class="table">
Mads Kiilerich
html: don't use tabs
r3197 <div class="diffblock">
Reordered parents/children links ref #650
r3078 <div class="parents">
%if c.changeset.parents:
fix enumerate call for python2.5
r3079 %for n, p_cs in enumerate(reversed(c.changeset.parents)):
Reordered parents/children links ref #650
r3078 <span class="changeset_hash">&laquo; ${h.link_to('%s:%s' % (p_cs.revision,p_cs.raw_id[:6]),h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span>
<br>
%endfor
%else:
<span>${_('No parents')}</span>
white space cleanup
r3149 %endif
Reordered parents/children links ref #650
r3078 </div>
<div class="children">
%if c.changeset.children:
fix enumerate call for python2.5
r3079 %for n, p_cs in enumerate(reversed(c.changeset.children)):
Reordered parents/children links ref #650
r3078 <span class="changeset_hash">${h.link_to('%s:%s' % (p_cs.revision,p_cs.raw_id[:6]),h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)} &raquo;</span>
<br>
%endfor
%else:
<span>${_('No children')}</span>
white space cleanup
r3149 %endif
</div>
Mads Kiilerich
html: don't use tabs
r3197 <div class="code-header banner">
white space cleanup
r3149
user lowercase (copy safe) hash in changeset
r1949 <div class="hash">
r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
</div>
white space cleanup
r1963 <div class="date">
Vincent Duvert
Added a translatable date formatter for every date displayed.
r2416 ${h.fmt_date(c.changeset.date)}
user lowercase (copy safe) hash in changeset
r1949 </div>
added changeset status into changelog view
r2239 <div class="changeset-status-container">
%if c.statuses:
<div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div>
<div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[0])}" /></div>
%endif
</div>
UI fixes...
r1865 <div class="diff-actions">
Mads Kiilerich
Fix a lot of casings - use standard casing in most places
r3654 <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>
added hidden fulldiff GET param for disabling big diff cut off limit....
r2161 ${c.ignorews_url(request.GET)}
${c.context_url(request.GET)}
UI fixes...
r1865 </div>
Vincent Duvert
Improved i18n for the comment count (use of ngettext for pluralisation).
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>
white space cleanup
r3149 </div>
Mads Kiilerich
html: don't use tabs
r3197 </div>
<div id="changeset_content">
<div class="container">
<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>${h.person(c.changeset.author)}</span><br/>
<span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>
</div>
<div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div>
</div>
<div class="right">
<div class="changes">
new patch function, and urls schema....
r2996 % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:
Mads Kiilerich
Fix a lot of casings - use standard casing in most places
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>
Mads Kiilerich
html: don't use tabs
r3197 % else:
Mads Kiilerich
Fix a lot of casings - use standard casing in most places
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>
Mads Kiilerich
html: don't use tabs
r3197 % endif
</div>
White-space cleanup
r1888
Mads Kiilerich
html: don't use tabs
r3197 <span class="logtags">
Aras Pranckevicius
css: merge/branch/tag blurbs
r1856 %if len(c.changeset.parents)>1:
<span class="merge">${_('merge')}</span>
%endif
#818: Bookmarks Do Not Display on Changeset View...
r3728 %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
Mads Kiilerich
html: don't use tabs
r3197 %for tag in c.changeset.tags:
Mads Kiilerich
Fix a lot of casings - use standard casing in most places
r3654 <span class="tagtag" title="${_('Tag %s') % tag}">
Mads Kiilerich
html: don't use tabs
r3197 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
%endfor
#818: Bookmarks Do Not Display on Changeset View...
r3728 %if c.changeset.branch:
<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>
%endif
Mads Kiilerich
html: don't use tabs
r3197 </span>
</div>
</div>
<span>
Implemented generation of changesets based...
r2995 % if c.limited_diff:
Changed affected to changed, sounds better, and added ungettext translations for this
r3014 ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}:
Implemented generation of changesets based...
r2995 % else:
Mads Kiilerich
html: don't use tabs
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
Implemented generation of changesets based...
r2995 </span>
Mads Kiilerich
html: don't use tabs
r3197 <div class="cs_files">
Implemented generation of changesets based...
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:
Mads Kiilerich
Fix a lot of casings - use standard casing in most places
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>
Implemented generation of changesets based...
r2995 % endif
Mads Kiilerich
html: don't use tabs
r3197 </div>
</div>
White-space cleanup
r1888
renamed project to rhodecode
r547 </div>
Implemented generation of changesets based...
r2995
White-space cleanup
r1888 ## diff block
code garden for changeset ranges and comments...
r1787 <%namespace name="diff_block" file="/changeset/diff_block.html"/>
Implemented generation of changesets based...
r2995 ${diff_block.diff_block(c.changes[c.changeset.raw_id])}
% if c.limited_diff:
Mads Kiilerich
Fix a lot of casings - use standard casing in most places
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>
Implemented generation of changesets based...
r2995 % endif
White-space cleanup
r1888
code garden for changeset ranges and comments...
r1787 ## template for inline comment form
#77 code review...
r1670 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
Enabled inline comments in pull-requests
r2489 ${comment.comment_inline_form()}
White-space cleanup
r1888
Added option to close pull requests, in future that will be close & merge
r2608 ## render comments and inlines
${comment.generate_comments()}
## main comment form and it status
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
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))}
Enabled inline comments in pull-requests
r2489 ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS
#71 code review...
r1674 <script type="text/javascript">
#71 code-review...
r1677 YUE.onDOMReady(function(){
code garden for changeset ranges and comments...
r1787 YUE.on(YUQ('.show-inline-comments'),'change',function(e){
var show = 'none';
var target = e.currentTarget;
Dies Koper
fixed comment addition and deletion functionality on IE9
r2723 if(target == null){
target = this;
}
code garden for changeset ranges and comments...
r1787 if(target.checked){
var show = ''
}
var boxid = YUD.getAttribute(target,'id_for');
var comments = YUQ('#{0} .inline-comments'.format(boxid));
White-space cleanup
r1888 for(c in comments){
code garden for changeset ranges and comments...
r1787 YUD.setStyle(comments[c],'display',show);
}
var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
White-space cleanup
r1888 for(c in btns){
- diff.css merge to main style.css...
r1772 YUD.setStyle(btns[c],'display',show);
White-space cleanup
r1888 }
code garden for changeset ranges and comments...
r1787 })
White-space cleanup
r1888
#71 code-review...
r1677 YUE.on(YUQ('.line'),'click',function(e){
code garden for changeset ranges and comments...
r1787 var tr = e.currentTarget;
Dies Koper
fixed comment addition and deletion functionality on IE9
r2723 if(tr == null){
tr = this;
}
code garden for changeset ranges and comments...
r1787 injectInlineForm(tr);
#71 code review...
r1682 });
White-space cleanup
r1888
#71 code review...
r1682 // inject comments into they proper positions
var file_comments = YUQ('.inline-comment-placeholder');
#415: Adding comment to changeset causes reload...
r2187 renderInlineComments(file_comments);
#71 code-review...
r1677 })
White-space cleanup
r1888
</script>
code garden for changeset ranges and comments...
r1787 </div>
Augusto Herrmann
Added pt_BR localization, added i18n wrappers on some places missing, fixed css in settings screen for longer labels.
r1472 </%def>