##// END OF EJS Templates
merge branch codereview into beta
merge branch codereview into beta

File last commit:

r2430:9f372811 merge codereview
r2476:19d94d75 merge beta
Show More
branches.html
94 lines | 2.9 KiB | text/html | HtmlLexer
renamed project to rhodecode
r547 ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
Vincent Duvert
Better i18n for page titles.
r2417 ${_('%s Branches') % c.repo_name} - ${c.rhodecode_name}
renamed project to rhodecode
r547 </%def>
<%def name="breadcrumbs_links()">
added quick filters into branches and tags
r1654 <input class="q_filter_box" id="q_filter_branches" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
renamed project to rhodecode
r547 ${h.link_to(u'Home',h.url('/'))}
White-space cleanup
r1888 &raquo;
renamed project to rhodecode
r547 ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
&raquo;
${_('branches')}
</%def>
<%def name="page_nav()">
White-space cleanup
r1888 ${self.menu('branches')}
renamed project to rhodecode
r547 </%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
<!-- end box / title -->
Improved cross repos diffs...
r2362 %if c.repo_branches:
Added compare buttons into branch views
r2243 <div class="info_box" id="compare_branches" style="clear: both;padding: 10px 19px;vertical-align: right;text-align: right;"><a href="#" class="ui-btn small">${_('Compare branches')}</a></div>
Improved cross repos diffs...
r2362 %endif
renamed project to rhodecode
r547 <div class="table">
<%include file='branches_data.html'/>
</div>
added quick filters into branches and tags
r1654 </div>
<script type="text/javascript">
Added compare buttons into branch views
r2243 YUE.on('compare_branches','click',function(e){
YUE.preventDefault(e);
var org = YUQ('input[name=compare_org]:checked')[0];
var other = YUQ('input[name=compare_other]:checked')[0];
added sorting to bookmarks tags and branches
r1782
Added compare buttons into branch views
r2243 if(org && other){
Rewrote url routes to make all validations and parsing for compare view + added compare fork button into forked repos
r2363 var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref='__ORG__',other_ref_type='branch',other_ref='__OTHER__')}";
var u = compare_url.replace('__ORG__',org.value)
.replace('__OTHER__',other.value);
Added compare buttons into branch views
r2243 window.location=u;
}
})
added sorting to bookmarks tags and branches
r1782 // main table sorting
var myColumnDefs = [
{key:"name",label:"${_('Name')}",sortable:true},
{key:"date",label:"${_('Date')}",sortable:true,
sortOptions: { sortFunction: dateSort }},
{key:"author",label:"${_('Author')}",sortable:true},
{key:"revision",label:"${_('Revision')}",sortable:true,
sortOptions: { sortFunction: revisionSort }},
Added compare buttons into branch views
r2243 {key:"compare",label:"${_('Compare')}",sortable:false,},
added sorting to bookmarks tags and branches
r1782 ];
var myDataSource = new YAHOO.util.DataSource(YUD.get("branches_data"));
myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
myDataSource.responseSchema = {
fields: [
{key:"name"},
{key:"date"},
{key:"author"},
{key:"revision"},
Added compare buttons into branch views
r2243 {key:"compare"},
added sorting to bookmarks tags and branches
r1782 ]
};
var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataSource,
{
sortedBy:{key:"name",dir:"asc"},
MSG_SORTASC:"${_('Click to sort ascending')}",
MSG_SORTDESC:"${_('Click to sort descending')}",
MSG_EMPTY:"${_('No records found.')}",
MSG_ERROR:"${_('Data error.')}",
White-space cleanup
r1888 MSG_LOADING:"${_('Loading...')}",
added sorting to bookmarks tags and branches
r1782 }
);
myDataTable.subscribe('postRenderEvent',function(oArgs) {
tooltip_activate();
var func = function(node){
return node.parentNode.parentNode.parentNode.parentNode.parentNode;
}
White-space cleanup
r1888 q_filter('q_filter_branches',YUQ('div.table tr td .logtags .branchtag a'),func);
});
added sorting to bookmarks tags and branches
r1782
added quick filters into branches and tags
r1654 </script>
added sorting to bookmarks tags and branches
r1782
White-space cleanup
r1888 </%def>