diff --git a/rhodecode/templates/branches/branches.html b/rhodecode/templates/branches/branches.html --- a/rhodecode/templates/branches/branches.html +++ b/rhodecode/templates/branches/branches.html @@ -2,7 +2,10 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Branches') % c.repo_name} · ${c.rhodecode_name} + ${_('%s Branches') % c.repo_name} + %if c.rhodecode_name: + · ${c.rhodecode_name} + %endif <%def name="breadcrumbs_links()"> @@ -23,7 +26,7 @@ ${self.repo_context_bar('switch-to')} %if c.repo_branches: -
${_('Compare branches')}
+
${_('Compare Branches')}
%endif
<%include file='branches_data.html'/> @@ -44,7 +47,8 @@ YUE.on('compare_branches','click',functi }); // main table sorting var myColumnDefs = [ - {key:"name",label:"${_('Name')}",sortable:true}, + {key:"name",label:"${_('Name')}",sortable:true, + sortOptions: { sortFunction: nameSort }}, {key:"date",label:"${_('Date')}",sortable:true, sortOptions: { sortFunction: dateSort }}, {key:"author",label:"${_('Author')}",sortable:true}, @@ -59,9 +63,12 @@ myDataSource.responseType = YAHOO.util.D myDataSource.responseSchema = { fields: [ + {key:"raw_name"}, {key:"name"}, + {key:"raw_date"}, {key:"date"}, {key:"author"}, + {key:"last_rev_raw"}, {key:"revision"}, {key:"compare"}, ]