From: Ross Jones <rossdjones@gmail.com>
Date: Thu, 25 Oct 2012 14:48:13 +0000
Subject: Tidying up
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=fb9969ea4b29984460f9a7a209c98a07481bf4c2
---
Tidying up
---


--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -34,7 +34,6 @@
             filter(GA_Stat.period_name==month).\
             order_by('GA_Stat.stat_name, GA_Stat.key').all()
 
-        response.headers['Content-disposition'] = 'attachment; filename=dgu_analytics_%s.csv' % (month)
         response.headers['Content-Type'] = "text/csv; charset=utf-8"
 
         writer = csv.writer(response)
@@ -88,6 +87,7 @@
     """
 
     def index(self):
+
         # Get the month details by fetching distinct values and determining the
         # month names from the values.
         c.months = _month_details(GA_Url)

--- a/ckanext/ga_report/plugin.py
+++ b/ckanext/ga_report/plugin.py
@@ -18,7 +18,7 @@
 
     def after_map(self, map):
         map.connect(
-            '/data/analytics/publisher/',
+            '/data/analytics/publisher',
             controller='ckanext.ga_report.controller:GaPublisherReport',
             action='index'
         )
@@ -33,7 +33,7 @@
             action='index'
         )
         map.connect(
-            '/data/analytics_{month}.csv',
+            '/data/analytics/data_{month}.csv',
             controller='ckanext.ga_report.controller:GaReport',
             action='csv'
         )

--- a/ckanext/ga_report/templates/ga_report/publisher/read.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/read.html
@@ -16,7 +16,7 @@
           number of visitors that viewed each dataset.
       </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>Go back to <a href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport', action='index')}">publishers</a></p>
+       <p>View the <a href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport', action='index')}">publishers</a> leaderboard</p>
     </li>
   </py:match>