From: Ross Jones <rossdjones@gmail.com>
Date: Thu, 25 Oct 2012 11:17:04 +0000
Subject: Minor template tweaks
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=ae8ef255ba7b46ba15ab4f65a16ee5905c514aec
---
Minor template tweaks
---


--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,7 @@
 1. Activate you CKAN python environment and install this extension's software::
 
     $ pyenv/bin/activate
-    $ pip install -e  git+https://github.com/okfn/ckanext-ga-report.git#egg=ckanext-ga-report
+    $ pip install -e  git+https://github.com/datagovuk/ckanext-ga-report.git#egg=ckanext-ga-report
 
 2. Ensure you development.ini (or similar) contains the info about your Google Analytics account and configuration::
 

--- a/ckanext/ga_report/templates/ga_report/publisher/index.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/index.html
@@ -4,6 +4,12 @@
   py:strip="">
 
   <py:def function="page_title">Publisher Analytics for ${g.site_title}</py:def>
+
+  <py:match path="primarysidebar">
+    <li class="widget-container boxed widget_text">
+      <h4>Publishers</h4>
+    </li>
+  </py:match>
 
   <div py:match="content">
       <h1>Publisher Analytics</h1>

--- a/ckanext/ga_report/templates/ga_report/publisher/read.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/read.html
@@ -4,6 +4,22 @@
   py:strip="">
 
   <py:def function="page_title">Analytics for ${g.site_title}</py:def>
+
+ <py:match path="primarysidebar">
+    <li class="widget-container boxed widget_text">
+      <h4>${c.publisher.title}</h4>
+      <p>
+          The table shows the top 20 most viewed datasets belonging to ${c.publisher.title}.
+      </p>
+      <p>
+          As well as showing the number of views within ${c.month_desc}, it will also show the
+          number of visitors that viewed each dataset.
+      </p>
+      <p>
+       <p>The dataset list page for <a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController', action='read', id=c.publisher.name)}">${c.publisher.title}</a> was viewed ${c.publisher_page_views} times during ${c.month_desc}</p>
+      </p>
+    </li>
+  </py:match>
 
   <div py:match="content">
       <h1>Analytics for ${c.publisher.title}</h1>
@@ -21,8 +37,6 @@
            <input class="btn button" type='submit' value="Update"/>
           </div>
        </form>
-
-       <p><a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController', action='read', id=c.publisher.name)}">${c.publisher.title} dataset list</a> was viewed ${c.publisher_page_views} times in ${c.month_desc}</p>
 
        <table class="table table-condensed table-bordered table-striped">
 	 <tr>

--- a/ckanext/ga_report/templates/ga_report/site/index.html
+++ b/ckanext/ga_report/templates/ga_report/site/index.html
@@ -4,6 +4,14 @@
   py:strip="">
 
   <py:def function="page_title">Site analytics</py:def>
+
+  <py:match path="primarysidebar">
+    <li class="widget-container boxed widget_text">
+      <h4>Statistics</h4>
+    </li>
+        <p>It is possible to<a href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month)}">export the data</a> as CSV, which contains all of the information for ${c.month_desc}</p>
+
+  </py:match>
 
   <div py:match="content">
       <h1>Site statistics</h1>
@@ -18,8 +26,6 @@
            <input class="btn button" type='submit' value="Update"/>
           </div>
        </form>
-
-    <p><a href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month)}">Export data</a> as CSV</p>
 
     <div class="tabbable">
       <ul class="nav nav-tabs">

--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,7 @@
         [paste.paster_command]
         loadanalytics = ckanext.ga_report.command:LoadAnalytics
         initdb = ckanext.ga_report.command:InitDB
+        getauthtoken = ckanext.ga_report.command:GetAuthToken
 	""",
 )