--- a/ckanext/ga_report/templates/ga_report/publisher/read.html +++ b/ckanext/ga_report/templates/ga_report/publisher/read.html @@ -9,8 +9,8 @@ <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> @@ -19,27 +19,14 @@ </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='dataset_csv',id=c.publisher_name or 'all',month=c.month or 'all')}">Download as CSV</a></center> - </p> - </li> - <li class="widget-container boxed widget_text"> - <h4>Graph Legend</h4> - <div id="graph-legend-container"> - </div> - </li> - <xi:include href="../notes.html" /> + ${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='dataset_csv',id=c.publisher_name or 'all',month=c.month or 'all'))} </py:match> <div py:match="content"> - <h1>Site Usage</h1> + <h1>Site Usage ${usage_nav('Datasets')}</h1> - ${usage_nav('Datasets')} - - + <div class="boxed"> <h3 py:if="c.publisher"><a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController',action='read',id=c.publisher.name)}">${c.publisher.title}</a></h3> <p py:if="not c.top_packages">No page views in this period</p> @@ -80,6 +67,7 @@ </table> </py:if> + </div> </div>