#167 Refactoring graph JS. Added mouseovers.
[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
@@ -12,6 +12,7 @@
     <link rel="stylesheet" type="text/css" href="/css/ga_report.css"/>
     <script type="text/javascript" src="/scripts/ckanext_ga_reports.js"></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>
@@ -24,6 +25,11 @@
           <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>
 
@@ -33,6 +39,14 @@
 
      ${usage_nav('Datasets')}
 
+
+     <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">
 
@@ -47,14 +61,8 @@
           <input class="btn button btn-primary" type='submit' value="Update"/>
         </div>
      </form>
-
-     <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)}
-       <table class="table table-condensed table-bordered table-striped">
+       <table class="ga-reports-table table table-condensed table-bordered table-striped">
          <tr>
            <th>Dataset</th>
            <th>Views</th>
@@ -65,8 +73,8 @@
              <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>
+             <td class="td-numeric">${views}</td>
+             <td class="td-numeric">${downloads}</td>
           </tr>
         </py:for>
       </table>