Add in <hr> to box titles, in line with DGU style change
[ckanext-ga-report.git] / ckanext / ga_report / templates / ga_report / publisher / read.html
blob:a/ckanext/ga_report/templates/ga_report/publisher/read.html -> blob:b/ckanext/ga_report/templates/ga_report/publisher/read.html
--- a/ckanext/ga_report/templates/ga_report/publisher/read.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/read.html
@@ -7,23 +7,46 @@
 
   <py:def function="page_title">Usage by Dataset</py:def>
 
+  <py:def function="content_class"><!----></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?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>
+  </py:def>
+
   <py:match path="primarysidebar">
     <li class="widget-container boxed widget_text">
       <h4>Download</h4>
-      <hr/>
       <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" />
   </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>
+
+     <py:if test="c.top_packages">
+       ${rickshaw_graph(c.graph_data,'dataset-downloads',debug=True)}
+     </py:if>
      <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='read')}" method="get">
         <div class="controls">
 
@@ -38,26 +61,26 @@
           <input class="btn button btn-primary" type='submit' value="Update"/>
         </div>
      </form>
+     <py:if test="c.top_packages">
+       <table class="ga-reports-table 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 class="td-numeric">${views}</td>
+             <td class="td-numeric">${downloads}</td>
+          </tr>
+        </py:for>
+      </table>
+    </py:if>
 
-     <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>Visits</th> -->
-	   <th>Views</th>
-	 </tr>
-        <py:for each="package, views, visits 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>${visits}</td> -->
-	    <td>${views}</td>
-	  </tr>
-        </py:for>
-     </table>
-
+  </div>
 
   </div>