--- a/ckanext/ga_report/templates/ga_report/publisher/index.html +++ b/ckanext/ga_report/templates/ga_report/publisher/index.html @@ -7,62 +7,70 @@ <py:def function="page_title">Usage by Publisher</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" /> + <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?1"/> + <script type="text/javascript" src="/scripts/modernizr-2.6.2.custom.js"></script> + <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> + </py:def> + + <py:match path="breadcrumbs"> + <li><a href="/site-usage">Site Analytics</a></li> + <li><a href="/site-usage/publisher">Publishers</a></li> </py:match> + <div py:match="content"> + <py:with vars="download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publisher_csv',month=c.month or 'all')"> + <a class="btn button btn-primary btn-sm pull-right" href="${download_link}"><i class="icon-download"></i> Download as CSV</a> + </py:with> + <h1>Site Usage</h1> - <div py:match="content"> + <div class="row" style="background: #fff;"> + <div class="col-md-8"> + <div class="whitebox"> + <strong>Publishers</strong> + ${rickshaw_graph(c.top_publishers_graph,'publishers')} + </div> + </div> + </div> - <h1>Site Usage</h1> - - ${usage_nav('Publishers')} - - - <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}" method="get"> + <hr/> + <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"/> + <h2 class="ga-reports-heading">Statistics for</h2> + ${month_selector(c.month, c.months, c.day)} </div> </form> - <table class="table table-condensed table-bordered table-striped"> - <tr> - <th>Publisher</th> -<!-- <th>Dataset Visits</th>--> - <th>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))} - </td> -<!-- <td>${visits}</td> --> - <td>${views}</td> - </tr> - </py:for> - </table> - - - </div> - - <xi:include href="../../layout.html" /> + <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 class="td-numeric">${views}</td> + </tr> + </py:for> + </table> + </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="../site/layout.html" /> </html>