[162] Force browers to refresh JS and CSS with revamp.
[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
@@ -10,6 +10,7 @@
   <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>
@@ -18,33 +19,32 @@
     <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>
-      <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:def function="sidebar">
+    ${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:def>
+
+ <py:match path="breadcrumbs">
+    <li><a href="/data/site-usage">Site Analytics</a></li>
+    <li><a href="/data/site-usage/publisher">Datasets</a></li>
+    <li py:if="c.publisher"><a href="/data/site-usage/publisher/${c.publisher.name}">${c.publisher.title}</a></li>
   </py:match>
 
 
+
   <div py:match="content">
-     <h1>Site Usage</h1>
-
-     ${usage_nav('Datasets')}
+    <h3 style='text-align:center;'>
+      <a href="/data/site-usage">Site-wide</a>
+      <span style="color: #bbb;margin:10px;">|</span>
+      <a href="/data/site-usage/publisher">Publishers</a>
+      <span style="color: #bbb;margin:10px;">|</span>
+      Datasets
+    </h3>
 
 
+    <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">
+     <py:if test="c.graph_data">
        ${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">
@@ -61,6 +61,13 @@
           <input class="btn button btn-primary" type='submit' value="Update"/>
         </div>
      </form>
+     <py:if test="c.month">
+       <h4>Statistics for ${h.month_option_title(c.month,c.months,c.day)}:</h4>
+     </py:if>
+     <py:if test="not c.month">
+       <h4>Statistics for all months:</h4>
+     </py:if>
+     <div class="alert alert-info" py:if="not c.top_packages">No page views in this period.</div>
      <py:if test="c.top_packages">
        <table class="ga-reports-table table table-condensed table-bordered table-striped">
          <tr>
@@ -80,6 +87,7 @@
       </table>
     </py:if>
 
+  </div>
 
   </div>