--- a/ckanext/ga_report/templates/ga_report/publisher/index.html +++ b/ckanext/ga_report/templates/ga_report/publisher/index.html @@ -6,11 +6,6 @@ <xi:include href="../ga_util.html" /> <py:def function="page_title">Usage by Publisher</py:def> - - - <py:match path="primarysidebar"> - ${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"/> @@ -23,38 +18,57 @@ <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:def function="page_heading">Site Usage ${usage_nav('Publishers')}</py:def> + + <py:match path="breadcrumbs"> + <li><a href="/data/site-usage">Site Analytics</a></li> + <li><a href="/data/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 class="boxed"> - - ${rickshaw_graph(c.top_publishers_graph,'publishers')} + <div class="row" style="background: #fff;"> + <div class="col-md-4"> + <div class="whitebox"> + <strong>Graph Legend</strong> + <div id="graph-legend-container"> + <div style="display: none;" id="legend_none">(No graph is loaded)</div> + </div> + </div> + </div> + <div class="col-md-8"> + <div class="whitebox"> + <strong>Publishers</strong> + ${rickshaw_graph(c.top_publishers_graph,'publishers')} + </div> + </div> + </div> <hr/> <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}" method="get"> <div class="controls"> - <h4 class="ga-reports-heading">Statistics for</h4> - ${month_selector(c.month, c.months, c.day)} + <h2 class="ga-reports-heading">Statistics for</h2> + ${month_selector(c.month, c.months, c.day)} </div> </form> - <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><!--/boxed--> + <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">