--- a/ckanext/ga_report/templates/ga_report/publisher/read.html +++ b/ckanext/ga_report/templates/ga_report/publisher/read.html @@ -25,12 +25,9 @@ <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}" method="get"> <div class="controls"> - <select name="month"> - <option value='' py:attrs="{'selected': 'selected' if not c.month else None}">All months</option> - <py:for each="val,desc in c.months"> - <option value='${val}' py:attrs="{'selected': 'selected' if c.month == val else None}">${desc}</option> - </py:for> - </select> + + ${month_selector(c.month, c.months, c.day)} + <select name="publisher"> <option value='' py:attrs="{'selected': 'selected' if not c.publisher else None}">All publishers</option> <py:for each="val,desc in c.publishers"> @@ -47,15 +44,15 @@ <table py:if="c.top_packages" class="table table-condensed table-bordered table-striped"> <tr> <th>Dataset</th> - <th>Visits</th> <th>Views</th> + <th>Downloads</th> </tr> - <py:for each="package, views, visits in c.top_packages"> + <py:for each="package, views, visits,downloads in c.top_packages"> <tr> <td>${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))} </td> - <td>${visits}</td> <td>${views}</td> + <td>${downloads}</td> </tr> </py:for> </table>