--- a/ckanext/ga_report/templates/ga_report/publisher/read.html +++ b/ckanext/ga_report/templates/ga_report/publisher/read.html @@ -6,6 +6,15 @@ <xi:include href="../ga_util.html" /> <py:def function="page_title">Usage by Dataset</py:def> + + <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/vendor/jquery.sparkline.modified.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> + </py:def> <py:match path="primarysidebar"> <li class="widget-container boxed widget_text"> @@ -41,21 +50,26 @@ <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> - <table py:if="c.top_packages" class="table table-condensed table-bordered table-striped"> - <tr> - <th>Dataset</th> - <th>Views</th> - <th>Downloads</th> - </tr> - <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>${views}</td> - <td>${downloads}</td> - </tr> + + <py:if test="c.top_packages"> + ${rickshaw_graph('[{name:"test series",data:[{x:1,y:200},{x:3,y:300},{x:5,y:100}]}]','dataset-downloads',debug=True)} + <table class="table table-condensed table-bordered table-striped"> + <tr> + <th>Dataset</th> + <th>Views</th> + <th>Downloads</th> + </tr> + <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>${views}</td> + <td>${downloads}</td> + </tr> </py:for> - </table> + </table> + </py:if> </div>