--- a/ckanext/ga_report/templates/ga_report/ga_util.html +++ b/ckanext/ga_report/templates/ga_report/ga_util.html @@ -6,19 +6,26 @@ 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 py:def="social_table(items, with_source=False)" class="table table-condensed table-bordered table-striped"> + <tr> + <th>Name</th> + <th py:if="with_source">Source</th> + <th>Visits</th> + </tr> + <py:for each="name, url, source, count in items"> + <tr> + <td><a href="${url}">${name}</a></td> + <td py:if="with_source">${source}</td> + <td>${count}</td> + </tr> + </py:for> </table> -<table py:def="stat_table(items)" class="table table-condensed table-bordered table-striped"> +<table py:def="stat_table(items, title='Views')" class="table table-condensed table-bordered table-striped"> <tr> <th>Name</th> - <th>% Views</th> + <th>% ${title}</th> </tr> <py:for each="name, value in items"> <tr> @@ -33,12 +40,12 @@ <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> + <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:GaPublisherReport',action='index')}"><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> + <a class="active" href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport',action='read', id=publisher.name)}"><img src="/images/icons/page_white.png" height="16px" width="16px" alt="None" class="inline-icon "/>${publisher.title}</a> </li> </ul>