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 @@ -3,11 +3,13 @@ <%inherit file="/base/base.html"/> <%def name="title()"> -${_('%s Changelog') % c.repo_name} · -%if c.changelog_for_path: - /${c.changelog_for_path} · -%endif -${c.rhodecode_name} + ${_('%s Changelog') % c.repo_name} + %if c.changelog_for_path: + /${c.changelog_for_path} + %endif + %if c.rhodecode_name: + · ${c.rhodecode_name} + %endif <%def name="breadcrumbs_links()"> @@ -34,32 +36,34 @@ ${self.repo_context_bar('changelog')} % if c.pagination:
-
- - +
+
${h.select('branch_filter',c.branch_name,c.branch_filters)}
+
+ + - %if c.rhodecode_db_repo.fork: - ${_('Compare fork with parent')} - %endif - %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.end_form()} -
${h.select('branch_filter',c.branch_name,c.branch_filters)}
+ %if c.rhodecode_db_repo.fork: + ${_('Compare fork with Parent(%s)' % c.rhodecode_db_repo.fork.repo_name)} + %endif + ${_('Open new pull request')} +
+ + ${h.form(h.url.current(),method='get')} +
+ ${h.submit('set',_('Show'),class_="btn btn-mini")} + ${h.text('size',size=1,value=c.size)} + ${_('revisions')} +
+ ${h.end_form()}
-
+
@@ -98,16 +102,19 @@ ${self.repo_context_bar('changelog')} +
${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')} ↓
+
${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
%if c.comments.get(cs.raw_id): @@ -152,8 +159,6 @@ ${self.repo_context_bar('changelog')} var checkboxes = YUD.getElementsByClassName('changeset_range'); // register our routes needed for this view pyroutes.register('changeset_home', "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']); - pyroutes.register('changelog_home', "${h.url('changelog_home', repo_name='%(repo_name)s')}", ['repo_name']); - pyroutes.register('pullrequest_home', "${h.url('pullrequest_home', repo_name='%(repo_name)s')}", ['repo_name']); var checkbox_checker = function(e){ var checked_checkboxes = []; @@ -239,17 +244,16 @@ ${self.repo_context_bar('changelog')} YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px'); }; } - YUE.on(YUQ('.expand'),'click',function(e){ - var elem = e.currentTarget.parentNode.parentNode; - YUD.setStyle(e.currentTarget,'display','none'); - YUD.setStyle(elem,'height','auto'); + $('.expand_commit').on('click',function(e){ + $(this).children('i').hide(); + var cid = $(this).attr('commit_id'); + $('#C-'+cid).css({'height': 'auto', 'margin': '4px 0px 4px 0px'}) //redraw the graph, line_count and jsdata are global vars set_canvas(100); var r = new BranchRenderer(); r.render(jsdata,100,line_count); - }); // change branch filter @@ -289,6 +293,7 @@ ${self.repo_context_bar('changelog')} r.render(jsdata,100,line_count); }); + %else: ${_('There are no changes yet')}