##// END OF EJS Templates
Tests updates, Session refactoring
Tests updates, Session refactoring

File last commit:

r1705:5e4827a8 beta
r1713:54687aa0 beta
Show More
changeset.html
252 lines | 11.0 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()">
Fixes for raw_id, needed for git...
r636 ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name}
renamed project to rhodecode
r547 </%def>
<%def name="breadcrumbs_links()">
${h.link_to(u'Home',h.url('/'))}
&raquo;
${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
&raquo;
Fixes for raw_id, needed for git...
r636 ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
renamed project to rhodecode
r547 </%def>
<%def name="page_nav()">
${self.menu('changelog')}
</%def>
#71 code review...
r1682 <%def name="fid(raw_id,path)" filter="strip">
<%
return 'C-%s-%s' % (h.short_id(raw_id),h.safeid(h.safe_unicode(path)))
%>
</%def>
renamed project to rhodecode
r547 <%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<div class="table">
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
r977 <div class="diffblock">
renamed project to rhodecode
r547 <div class="code-header">
<div>
notification fixes and improvements
r1703 <span>${h.link_to(_('raw diff'),
Fixes for raw_id, needed for git...
r636 h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show'))}</span>
renamed project to rhodecode
r547 &raquo; <span>${h.link_to(_('download diff'),
Fixes for raw_id, needed for git...
r636 h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download'))}</span>
notification fixes and improvements
r1703 <div class="comments-number" style="float:right;padding-right:5px">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
</div>
renamed project to rhodecode
r547 </div>
</div>
<div id="changeset_content">
<div class="container">
<div class="left">
Fixes for raw_id, needed for git...
r636 <div class="date">${_('commit')} ${c.changeset.revision}: ${h.short_id(c.changeset.raw_id)}@${c.changeset.date}</div>
renamed project to rhodecode
r547 <div class="author">
<div class="gravatar">
<img alt="gravatar" src="${h.gravatar_url(h.email(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>
Fixes for raw_id, needed for git...
r636 <div class="message">${h.link_to(h.wrap_paragraphs(c.changeset.message),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</div>
renamed project to rhodecode
r547 </div>
<div class="right">
<div class="changes">
fixed some limits in changesets and changelogs
r1130 % if len(c.changeset.affected_files) <= c.affected_files_cut_off:
renamed project to rhodecode
r547 <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>
fixed some limits in changesets and changelogs
r1130 % else:
<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>
% endif
renamed project to rhodecode
r547 </div>
%if len(c.changeset.parents)>1:
<div class="merge">
fixed some anchor id problems for changeset ranges
r1676 ${_('merge')}<img alt="merge" src="${h.url('/images/icons/arrow_join.png')}"/>
renamed project to rhodecode
r547 </div>
fixed initial commit missing parents div,...
r551 %endif
%if c.changeset.parents:
renamed project to rhodecode
r547 %for p_cs in reversed(c.changeset.parents):
Fixes for raw_id, needed for git...
r636 <div class="parent">${_('Parent')} ${p_cs.revision}: ${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)}
renamed project to rhodecode
r547 </div>
%endfor
fixed initial commit missing parents div,...
r551 %else:
<div class="parent">${_('No parents')}</div>
%endif
renamed project to rhodecode
r547 <span class="logtags">
<span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
Fixes for raw_id, needed for git...
r636 ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
renamed project to rhodecode
r547 %for tag in c.changeset.tags:
<span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
Fixes for raw_id, needed for git...
r636 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
renamed project to rhodecode
r547 %endfor
</span>
</div>
</div>
Implemented --stat for changelog
r1257 <span style="font-size:1.1em;font-weight: bold">
${_('%s files affected with %s additions and %s deletions.') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}
</span>
renamed project to rhodecode
r547 <div class="cs_files">
Implemented --stat for changelog
r1257 %for change,filenode,diff,cs1,cs2,stat in c.changes:
<div class="cs_${change}">
fixed issue with new files and removed files with using inline comments
r1687 <div class="node">
%if change != 'removed':
${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=self.fid(filenode.changeset.raw_id,filenode.path)))}
%else:
${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=self.fid('',filenode.path)))}
%endif
</div>
Implemented --stat for changelog
r1257 <div class="changes">${h.fancy_file_stats(stat)}</div>
</div>
renamed project to rhodecode
r547 %endfor
fixed some limits in changesets and changelogs
r1130 % if c.cut_off:
Augusto Herrmann
Added pt_BR localization, added i18n wrappers on some places missing, fixed css in settings screen for longer labels.
r1472 ${_('Changeset was too big and was cut off...')}
fixed some limits in changesets and changelogs
r1130 % endif
renamed project to rhodecode
r547 </div>
</div>
</div>
Implemented --stat for changelog
r1257 %for change,filenode,diff,cs1,cs2,stat in c.changes:
renamed project to rhodecode
r547 %if change !='removed':
<div style="clear:both;height:10px"></div>
fixed inline comment indicator....
r1701 <div class="diffblock margined comm" id="${self.fid(filenode.changeset.raw_id,filenode.path)}">
show inline comments option
r1686 <div class="code-header">
some small css fixes for changesets
r816 <div class="changeset_header">
<span class="changeset_file">
fixes for issues #137 and #116 safe_unicode is now default for handling file names
r1176 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
renamed project to rhodecode
r547 </span>
&raquo; <span>${h.link_to(_('diff'),
fixes for issues #137 and #116 safe_unicode is now default for handling file names
r1176 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span>
renamed project to rhodecode
r547 &raquo; <span>${h.link_to(_('raw diff'),
fixes for issues #137 and #116 safe_unicode is now default for handling file names
r1176 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>
renamed project to rhodecode
r547 &raquo; <span>${h.link_to(_('download diff'),
fixes for issues #137 and #116 safe_unicode is now default for handling file names
r1176 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>
show inline comments option
r1686 <span style="float:right">
<label>
${_('show inline comments')}
${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=self.fid(filenode.changeset.raw_id,filenode.path))}
</label>
</span>
renamed project to rhodecode
r547 </div>
</div>
#71 code-review...
r1677 <div class="code-body">
<div class="full_f_path" path="${filenode.path}"></div>
%if diff:
${diff|n}
%else:
${_('No changes in this file')}
%endif
renamed project to rhodecode
r547 </div>
</div>
%endif
#77 code review...
r1670 %endfor
<%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
#71 code-review...
r1677 ## template for inline comment form
${comment.comment_inline_form()}
#77 code review...
r1670
<div class="comments">
#71 code-review...
r1677 <div class="comments-number">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
%for path, lines in c.inline_comments:
#71 code review...
r1682 <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${self.fid(c.changeset.raw_id,path)}">
#71 code-review...
r1677 % for line,comments in lines.iteritems():
#71 code review...
r1682 <div class="inline-comment-placeholder-line" line="${line}" target_id="${h.safeid(h.safe_unicode(path))}">
#71 code-review...
r1677 %for co in comments:
${comment.comment_block(co)}
%endfor
</div>
%endfor
</div>
%endfor
#77 code review...
r1670 %for co in c.comments:
${comment.comment_block(co)}
%endfor
%if c.rhodecode_user.username != 'default':
<div class="comment-form">
${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))}
#71 code-review...
r1677 <strong>${_('Leave a comment')}</strong>
#77 code review...
r1670 <div class="clearfix">
fixes inline comments double entries
r1681 <div class="comment-help">
${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
</div>
#77 code review...
r1670 ${h.textarea('text')}
</div>
<div class="comment-button">
${h.submit('save', _('Comment'), class_='ui-button')}
</div>
${h.end_form()}
</div>
%endif
</div>
#71 code review...
r1674 <script type="text/javascript">
var deleteComment = function(comment_id){
var url = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}".replace('__COMMENT_ID__',comment_id);
var postData = '_method=delete';
var success = function(o){
var n = YUD.get('comment-'+comment_id);
n.parentNode.removeChild(n);
}
ajaxPOST(url,postData,success);
#71 code-review...
r1677 }
YUE.onDOMReady(function(){
show inline comments option
r1686
YUE.on(YUQ('.show-inline-comments'),'change',function(e){
var show = 'none';
var target = e.currentTarget;
if(target.checked){
var show = ''
}
var boxid = YUD.getAttribute(target,'id_for');
var comments = YUQ('#{0} .inline-comments'.format(boxid));
for(c in comments){
YUD.setStyle(comments[c],'display',show);
}
})
#71 code-review...
r1677
YUE.on(YUQ('.line'),'click',function(e){
var tr = e.currentTarget;
added reply comment button on top of inline comments...
r1705 injectInlineForm(tr);
#71 code review...
r1682 });
// inject comments into they proper positions
var file_comments = YUQ('.inline-comment-placeholder');
for (f in file_comments){
var box = file_comments[f];
var inlines = box.children;
for(var i=0; i<inlines.length; i++){
fixed issue with new files and removed files with using inline comments
r1687 try{
inline comment form is displayed now under all comments.
r1704
fixed issue with new files and removed files with using inline comments
r1687 var inline = inlines[i];
var lineno = YUD.getAttribute(inlines[i],'line');
var lineid = "{0}_{1}".format(YUD.getAttribute(inline,'target_id'),lineno);
var target_line = YUD.get(lineid);
added reply comment button on top of inline comments...
r1705
var add = createInlineAddButton(target_line.parentNode,'${_("add another comment")}');
YUD.insertAfter(add,target_line.parentNode);
inline comment form is displayed now under all comments.
r1704 var comment = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML))
YUD.insertAfter(comment,target_line.parentNode);
fixed issue with new files and removed files with using inline comments
r1687 }catch(e){}
#71 code review...
r1682 }
}
#71 code-review...
r1677 })
#71 code review...
r1674 </script>
#77 code review...
r1670 </div>
Augusto Herrmann
Added pt_BR localization, added i18n wrappers on some places missing, fixed css in settings screen for longer labels.
r1472 </%def>