--- a/ckanext/ga_report/templates/ga_report/ga_util.html +++ b/ckanext/ga_report/templates/ga_report/ga_util.html @@ -5,15 +5,6 @@ xmlns:xi="http://www.w3.org/2001/XInclude" py:strip="" > - - <table py:def="publisher_list(groups)" class="groups"> - <py:for each="group,title in groups"> - <tr> - <td><a href="/publisher/${group.name}">${title}</a></td> - </tr> - </py:for> - </table> - <table py:def="social_table(items, with_source=False)" class="table table-condensed table-bordered table-striped"> <tr> @@ -45,19 +36,18 @@ </table> -<div py:def="usage_nav(active_name,publisher)" id="minornavigation"> +<div py:def="usage_nav(active_name)" id="minornavigation"> <div id="minornavigation-bg-left"> <div id="minornavigation-bg-right"> - <ul class="nav nav-pills"> - <li py:attrs="{'class': 'active' if active_name=='Site-wide' else None}"><a py:attrs="{'class': 'active' if active_name=='Site-wide' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}"><img src="/images/icons/page_white_gear.png" height="16px" width="16px" alt="None" class="inline-icon "/> Site-wide</a></li> + <ul class="nav nav-pills"> + <li py:attrs="{'class': 'active' if active_name=='Site-wide' else None}"><a py:attrs="{'class': 'active' if active_name=='Site-wide' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/> Site-wide</a></li> <li py:attrs="{'class': 'active' if active_name=='Publishers' else None}"> - <a py:attrs="{'class': 'active' if active_name=='Publishers' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport',action='index')}"><img src="/images/icons/page_white_gear.png" height="16px" width="16px" alt="None" class="inline-icon "/> Publishers</a> + <a py:attrs="{'class': 'active' if active_name=='Publishers' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/> Publishers</a> </li> - <li py:if="publisher" class="active"> - <a class="active" href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport',action='read', id=publisher.name)}"><img src="/images/icons/page_white_gear.png" height="16px" width="16px" alt="None" class="inline-icon "/>${publisher.title}</a> + <li py:attrs="{'class': 'active' if active_name=='Datasets' else None}"> + <a py:attrs="{'class': 'active' if active_name=='Datasets' else None}" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/> Datasets</a> </li> - - </ul> + </ul> </div> </div> </div>