--- a/ckanext/ga_report/templates/ga_report/publisher/index.html +++ b/ckanext/ga_report/templates/ga_report/publisher/index.html @@ -7,21 +7,19 @@ <py:def function="page_title">Usage by Publisher</py:def> + <py:def function="content_class"><!----></py:def> + + <py:match path="primarysidebar"> - <li class="widget-container boxed widget_text"> - <h4>Download</h4> - <p><center> - <a class="btn button btn-primary" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publisher_csv',month=c.month or 'all')}">Download as CSV</a></center> - </p> - </li> - <xi:include href="../notes.html" /> + ${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publisher_csv',month=c.month or 'all'))} </py:match> <py:def function="optional_head"> <link rel="stylesheet" type="text/css" href="/scripts/vendor/rickshaw.min.css"/> - <link rel="stylesheet" type="text/css" href="/css/ga_report.css"/> - <script type="text/javascript" src="/scripts/ckanext_ga_reports.js"></script> + <link rel="stylesheet" type="text/css" href="/css/ga_report.css?1"/> + <script type="text/javascript" src="/scripts/ckanext_ga_reports.js?1"></script> <script type="text/javascript" src="/scripts/vendor/jquery.sparkline.modified.js"></script> + <script type="text/javascript" src="/scripts/rickshaw_ie7_shim.js"></script> <script type="text/javascript" src="/scripts/vendor/d3.v2.js"></script> <script type="text/javascript" src="/scripts/vendor/d3.layout.min.js"></script> <script type="text/javascript" src="/scripts/vendor/rickshaw.min.js"></script> @@ -29,49 +27,43 @@ <div py:match="content"> - <h1>Site Usage</h1> + <h1>Site Usage ${usage_nav('Publishers')}</h1> - ${usage_nav('Publishers')} + <div class="boxed"> - - <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}" method="get"> + ${rickshaw_graph(c.top_publishers_graph,'publishers')} + <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}" method="get"> <div class="controls"> - - ${month_selector(c.month, c.months, c.day)} - - <input class="btn button btn-primary" type='submit' value="Update"/> + <label>Show stats table for:</label> + ${month_selector(c.month, c.months, c.day)} </div> </form> - ${rickshaw_graph(c.top_publishers_graph,'publishers')} - <table class="table table-condensed table-bordered table-striped"> - <tr> - <th>Publisher</th> - <th>Dataset Views</th> - </tr> + <table class="ga-reports-table table table-condensed table-bordered table-striped"> + <tr> + <th>Publisher</th> + <th class="td-numeric">Dataset Views</th> + </tr> <py:for each="publisher, views, visits in c.top_publishers"> - <tr> - <td> - ${h.link_to(publisher.title, h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport', action='read_publisher', id=publisher.name) + (("?month=" + c.month) if c.month else ''))} - </td> - <td>${views}</td> - </tr> + <tr> + <td> + ${h.link_to(publisher.title, h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport', action='read_publisher', id=publisher.name) + (("?month=" + c.month) if c.month else ''))} + </td> + <td class="td-numeric">${views}</td> + </tr> </py:for> </table> - - - </div> - - <xi:include href="../../layout.html" /> + </div><!--/boxed--> + </div><!--/content--> <py:def function="optional_footer"> - <script type='text/javascript'> - $('.nav-tabs li a').click(function (e) { - e.preventDefault(); - $(this).tab('show'); - }) + <script type="text/javascript"> + $(function() { + CKAN.GA_Reports.bind_month_selector(); + }); </script> </py:def> + <xi:include href="../../layout.html" /> </html>