Mercurial > kallithea
diff rhodecode/templates/changelog/changelog.html @ 1656:833f9dec0a06 beta
implemented #44 - branch filtering in changelog, aka branch browser
- changed GUI on tags/branches to not use images.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 05 Nov 2011 14:38:26 +0200 |
parents | 51063deaceb9 |
children | 60a00fd76d58 |
line wrap: on
line diff
--- a/rhodecode/templates/changelog/changelog.html Sat Nov 05 01:57:51 2011 +0200 +++ b/rhodecode/templates/changelog/changelog.html Sat Nov 05 14:38:26 2011 +0200 @@ -33,12 +33,13 @@ <div id="graph_content"> <div class="container_header"> ${h.form(h.url.current(),method='get')} - <div class="info_box"> + <div class="info_box" style="float:left"> ${h.submit('set',_('Show'),class_="ui-button-small")} ${h.text('size',size=1,value=c.size)} <span class="rev">${_('revisions')}</span> </div> ${h.end_form()} + <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div> <div id="rev_range_container" style="display:none"></div> </div> @@ -63,9 +64,7 @@ <span id="${cs.raw_id}" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</span> </div> %if len(cs.parents)>1: - <div class="merge"> - ${_('merge')}<img alt="merge" src="${h.url('/images/icons/arrow_join.png')}"/> - </div> + <div class="merge">${_('merge')}</div> %endif %if cs.parents: %for p_cs in reversed(cs.parents): @@ -131,7 +130,7 @@ } }); - //Fetch changeset details + // 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__')}" @@ -139,6 +138,20 @@ ypjax(url,id+'_changes_info',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; + console.log(selected_branch); + 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(heads) { var c = document.getElementById('graph_nodes'); @@ -165,7 +178,7 @@ var r = new BranchRenderer(); r.render(jsdata,max_w); - + }); </script> %else: