diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -16,7 +16,7 @@ ${_('%s Changelog') % c.repo_name} - ${c <%def name="main()"> - ${self.context_bar('changelog')} +${self.context_bar('changelog')}
@@ -25,11 +25,7 @@ ${_('%s Changelog') % c.repo_name} - ${c
% if c.pagination:
-
- -
-
-
+
@@ -39,246 +35,267 @@ ${_('%s Changelog') % c.repo_name} - ${c %if h.is_hg(c.rhodecode_repo): ${_('Open new pull request')} %endif +
+
+ ${h.form(h.url.current(),method='get')} +
+ ${h.submit('set',_('Show'),class_="ui-btn")} + ${h.text('size',size=1,value=c.size)} + ${_('revisions')}
-
- ${h.form(h.url.current(),method='get')} -
- ${h.submit('set',_('Show'),class_="ui-btn")} - ${h.text('size',size=1,value=c.size)} - ${_('revisions')} -
- ${h.end_form()} + ${h.end_form()}
${h.select('branch_filter',c.branch_name,c.branch_filters)}
-
+
+
+ +
+
+ + %for cnt,cs in enumerate(c.pagination): -
-
-
+
+ + + + + + + + %endfor + +
${h.checkbox(cs.raw_id,class_="changeset_range")} - ${cs.revision}:${h.short_id(cs.raw_id)} - -
-
- gravatar -
-
${h.shorter(h.person(cs.author),22)}
-
-
${h.fmt_date(cs.date)}
- -
+
+ gravatar + ${h.shorter(h.person(cs.author),22)} + + + + ${cs.revision} : + ${h.short_id(cs.raw_id)} + + + +
${h.age(cs.date,True)}
+
${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
↓ ${_('Show more')} ↓
- -
-
-
${len(cs.affected_files)}
-
- %if len(c.comments.get(cs.raw_id,[])) > 0: -
- -
${len(c.comments[cs.raw_id])}
- - -
+ %if cs.branch: +
+
+ ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} +
+
+ %endif +
+
+
+ ${len(cs.affected_files)} +
+ +
+ %if c.statuses.get(cs.raw_id): +
${c.statuses.get(cs.raw_id)[1]}
+
+ %if c.statuses.get(cs.raw_id)[2]: + + %else: + %endif -
-
- %if c.statuses.get(cs.raw_id): -
${c.statuses.get(cs.raw_id)[1]}
-
- %if c.statuses.get(cs.raw_id)[2]: - - %else: - - %endif -
- %endif -
+
+ %endif +
+ + %if cs.parents: + %for p_cs in reversed(cs.parents): +
${_('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)}
- %if cs.parents: - %for p_cs in reversed(cs.parents): -
${_('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)} -
- %endfor - %else: -
${_('No parents')}
- %endif - - - %if len(cs.parents)>1: + %endfor + %else: +
${_('No parents')}
+ %endif +
+ %if len(c.comments.get(cs.raw_id,[])) > 0: +
+ + ${len(c.comments[cs.raw_id])} + +
+ %endif +
+
+ %if len(cs.parents)>1: ${_('merge')} - %endif - %if cs.branch: - - ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + %endif + + %if h.is_hg(c.rhodecode_repo): + %for book in cs.bookmarks: + + ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + + %endfor + %endif + %for tag in cs.tags: + + ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} - %endif - %if h.is_hg(c.rhodecode_repo): - %for book in cs.bookmarks: - - ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} - - %endfor - %endif - %for tag in cs.tags: - - ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} - %endfor - -
- + %endfor + +
+ +
${c.pagination.pager('$link_previous ~2~ $link_next')}
-
+
- - + + + // 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 line_count) + line_count = m; + } + } + set_canvas(100); + + var r = new BranchRenderer(); + r.render(jsdata,100,line_count); + + }); + %else: ${_('There are no changes yet')} %endif