Mercurial > kallithea
changeset 4531:b0774d79c7c9
Align switch-to child pages, standardize on btn-small class, use jQuery and similar formatting.
author | Na'Tosha Bard <natosha@unity3d.com> |
---|---|
date | Fri, 19 Sep 2014 14:48:11 +0200 |
parents | 27dc67382cf6 |
children | 63c6386cf488 |
files | kallithea/templates/bookmarks/bookmarks.html kallithea/templates/branches/branches.html kallithea/templates/tags/tags.html |
diffstat | 3 files changed, 17 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/bookmarks/bookmarks.html Fri Sep 19 14:45:54 2014 +0200 +++ b/kallithea/templates/bookmarks/bookmarks.html Fri Sep 19 14:48:11 2014 +0200 @@ -26,7 +26,7 @@ </div> <!-- end box / title --> %if c.repo_bookmarks: - <div class="info_box" id="compare_bookmarks" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="btn btn-mini">${_('Compare Bookmarks')}</a></div> + <div class="info_box" id="compare_bookmarks" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="btn btn-small">${_('Compare Bookmarks')}</a></div> %endif <div class="table"> <%include file='bookmarks_data.html'/> @@ -34,10 +34,10 @@ </div> <script type="text/javascript"> -YUE.on('compare_bookmarks','click',function(e){ - YUE.preventDefault(e); - var org = YUQ('input[name=compare_org]:checked')[0]; - var other = YUQ('input[name=compare_other]:checked')[0]; +$('#compare_bookmarks','click',function(e){ + e.preventDefault(); + var org = $('input[name=compare_org]:checked')[0]; + var other = $('input[name=compare_other]:checked')[0]; if(org && other){ var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='book',org_ref_name='__ORG__',other_ref_type='book',other_ref_name='__OTHER__')}"; @@ -46,6 +46,7 @@ window.location=u; } }); + // main table sorting var myColumnDefs = [ {key:"name",label:"${_('Name')}",sortable:true, @@ -95,5 +96,4 @@ </script> - </%def>
--- a/kallithea/templates/branches/branches.html Fri Sep 19 14:45:54 2014 +0200 +++ b/kallithea/templates/branches/branches.html Fri Sep 19 14:48:11 2014 +0200 @@ -26,17 +26,18 @@ </div> <!-- end box / title --> %if c.repo_branches: - <div class="info_box" id="compare_branches" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="btn btn-mini">${_('Compare Branches')}</a></div> + <div class="info_box" id="compare_branches" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="btn btn-small">${_('Compare Branches')}</a></div> %endif <div class="table"> <%include file='branches_data.html'/> </div> </div> + <script type="text/javascript"> -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]; +$('#compare_branches','click',function(e){ + e.preventDefault(); + var org = $('input[name=compare_org]:checked')[0]; + var other = $('input[name=compare_other]:checked')[0]; if(org && other){ var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref_name='__ORG__',other_ref_type='branch',other_ref_name='__OTHER__')}"; @@ -45,6 +46,7 @@ window.location=u; } }); + // main table sorting var myColumnDefs = [ {key:"name",label:"${_('Name')}",sortable:true,
--- a/kallithea/templates/tags/tags.html Fri Sep 19 14:45:54 2014 +0200 +++ b/kallithea/templates/tags/tags.html Fri Sep 19 14:48:11 2014 +0200 @@ -32,6 +32,7 @@ <%include file='tags_data.html'/> </div> </div> + <script type="text/javascript"> $('#compare_tags').click(function(e){ e.preventDefault(); @@ -76,14 +77,14 @@ }; 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.')}", MSG_LOADING:"${_('Loading...')}" - } + } ); myDataTable.subscribe('postRenderEvent',function(oArgs) { tooltip_activate(); @@ -94,4 +95,5 @@ }); </script> + </%def>