Commit Graph

180 Commits

Author SHA1 Message Date
Sean Hammond b9879ad28d Use g not config in templates
config is no longer available to templates (changed in CKAN core), use g
instead.

This means I have to rename googleanalytics.resource_prefix to
googleanalytics_resource_prefix, because it's now an attribute and can't
have a . in it.

Should probably be using g rather than config to access the setting in
the Python code as well..
2012-12-20 21:39:24 +00:00
Sean Hammond f2c0763fed Merge branch 'master' of github.com:okfn/ckanext-googleanalytics 2012-12-20 21:33:40 +00:00
Sean Hammond ffa86c010d Remove ckan.authz
It has been removed in CKAN 2.0, trying to import it makes CKAN crash on
startup.

This means that get_top_packages() is broken, and needs to be rewritten
to work with CKAN 2.0. At least by removing the import the plugin can
be loaded and its other functions used but if you try to use
get_top_packages() it will crash.
2012-12-20 21:32:53 +00:00
Ross Jones 13a57cd455 Fixed issue where add_resource was used regardless of ckan version 2012-10-23 17:42:04 +01:00
John Martin f254d1afd7 Tweaks to google analytics CKAN 2.0 JS module
1. Specified `resource_prefix` and `resource_url` context more tightly (could be global context)
2. Changed `this.href` to `jQuery(this).prop('href')` as it will never throw a syntax error when upon the condition of a `a.resource-url-analytics` not having a `href` attribute
3. Also added check so that if no `href` is present it doesn't send a blank link to google analytics
2012-10-23 10:21:41 +01:00
Sean Hammond e6bf938054 Update the README 2012-10-19 17:15:45 +02:00
Sean Hammond 70dc8c78d4 Add CKAN 2.0 resource download event tracking 2012-10-19 16:10:58 +02:00
Sean Hammond 58693e9d26 Remove a broken reference to googleanalytics_footer()
googleanalytics_footer() was removed by a previous commit
2012-10-18 19:52:24 +02:00
Sean Hammond e02ccc7438 Merge branch 'master' of github.com:okfn/ckanext-googleanalytics 2012-10-18 19:46:53 +02:00
Sean Hammond a1672cb0ad Remove googleanalytics_footer
It didn't do anything yet and I don't think it will be needed for Google
Analytics Event Tracking with CKAN 2.0 anyway.
2012-10-18 19:46:03 +02:00
Ross Jones c5b7121251 An example, but empty credentials file 2012-10-18 16:02:26 +01:00
Ross Jones c4a720840b Merge pull request #3 from okfn/v3support
V3support
2012-10-18 07:22:12 -07:00
Ross Jones b1585b5c24 Update readme with info about legacy templates 2012-10-18 15:18:14 +01:00
Ross Jones 5ad904400b Minor tidy up 2012-10-18 15:15:43 +01:00
Ross Jones 459ff608a6 Fixes to make sure that data collected for reports is working
Make sure we handle the changes to the API to ensure we collect the
dataset and resource information
2012-10-18 15:11:01 +01:00
Ross Jones 2283571562 Attempts to provide support for v3 of the Google Analytics API.
Since version 2 of the Google Analytics API was shelved the download
of previous data was broken.  This commit should, once the oauth dance
has been complete, allow it to work again by changing all of the calls.
See the README for instructions on setting up OAUTH.  Other bug fixes
are:

- Resources views are now clearly identified
- Package Ids are set for /dataset/edit requests
- Updated README
2012-10-18 13:47:30 +01:00
Sean Hammond 32e3556d26 Remove event tracking support from CKAN 2.0
I'm not going to finish implementing Google Analytics Event Tracking
support for CKAN 2.0 at this point, it can be implemented later if
needed (event tracking with CKAN 1.x should still work).
2012-10-17 17:39:43 +02:00
Sean Hammond 53a778161f Add CKAN 2.0 templates for Google Analytics tracking
Everything should still work as it did with CKAN 1.x templates _if_
ckan.legacy_templates is set in your ini file.

The event tracking javascript (ckanext-googleanalytics.js) still needs
to be updated for CKAN 2.0.

Also there is some code in plugin.py:filter() that adds something to the
package and group pages that I haven't implemented for CKAN 2.0 yet.

Tests need to be updated.

README needs to be updated.
2012-10-17 13:06:31 +02:00
Sean Hammond 8f5d60821f Add some docstrings
Make things slightly easier to follow.
2012-10-16 16:03:41 +02:00
Sean Hammond dcce83bb31 Fix up imports in plugin.py
Follow CKAN coding standards: don't use from foo import bar, but
standard library imports before all other imports and ckan imports after
all other imports.
2012-10-16 15:55:15 +02:00
Sean Hammond bdef9ea233 Move templates and public to legacy_templates and legacy_public
Making way for new CKAN 2.0 templates and scripts to be added.

This shouldn't break existing CKAN 1.x functionality.
2012-10-16 15:39:27 +02:00
John Glover 45a4e5b4d2 Update tests: gasnippet.gacode renamed to gasnippet.header_code.
JS should not be added on the dataset view page
any more so remove that test.
2012-07-23 12:11:09 +01:00
John Glover 0cb3944ccd Merge branch '2551-feature-track-events' 2012-07-23 11:53:00 +01:00
John Glover df3f575119 Add remaining track events. 2012-07-23 11:48:59 +01:00
John Glover ffd28f4619 Add first batch of Google Analytics track events. 2012-07-11 16:40:17 +01:00
John Glover 03b4023676 Add 'track_events' config option, tidy up config
reading.
2012-07-11 14:34:18 +01:00
John Glover 1fa09bae92 Tidy up imports a bit in plugin.py 2012-07-11 10:38:47 +01:00
amercader 1f534141ed [ui][xs] Show downloads instead of headers on table headers 2012-05-10 16:47:20 +01:00
amercader 7373e814fd Merge branch 'enhancement-2251-tracking' 2012-05-10 16:46:32 +01:00
amercader 02644f1d2d Merge branch 'master' into enhancement-2251-tracking 2012-05-10 15:56:40 +01:00
amercader a8747809d2 [ui] Update summary page design and links 2012-05-10 13:44:29 +01:00
amercader 8f22a3a3a0 [doc] Update README 2012-05-10 13:43:36 +01:00
Toby 143dafab45 summary_tracking renames and fixes 2012-04-20 14:46:00 +01:00
Toby db13b0b9cd changes for new internal tracking 2012-04-05 18:12:25 +01:00
John Glover deb99ebdc3 Change 'package' to 'dataset' in report 2011-12-21 11:45:45 +00:00
John Glover 16d5d11b86 Bug fix: download count style should only be added
once, at the end of the head section.
2011-12-20 13:16:28 +00:00
John Glover 8176247f10 [1451] Track downloads on resource view page.
Don't display download count on that page for now.
2011-12-20 10:56:05 +00:00
John Glover e104e7eb9e update genshi code for latest dataset view changes 2011-12-19 09:51:25 +00:00
John Glover 165a3fd055 remove unused import 2011-12-19 09:50:56 +00:00
John Glover c9e8a6b5d9 change summary page to use /dataset, not /package 2011-11-29 17:56:47 +00:00
John Glover 953b30c73c remove dead code 2011-11-29 17:46:40 +00:00
John Glover 8906260eb1 update plugin filter method and tests for latest
ckan (with dataset view changes)
2011-11-29 17:39:49 +00:00
John Glover 251f896bc6 update readme for ckan 1.5 version of extension 2011-11-29 17:36:35 +00:00
John Glover 97c8b91ec7 update test_analytics_snippet test for latest
CKAN master changes (setting map.explicit to true)
2011-11-29 13:32:03 +00:00
John Glover 1588fbb110 change pip install bitbucket link to github link 2011-11-29 11:04:34 +00:00
John Glover c2de764a95 change .hgignore to .gitignore 2011-11-29 11:02:09 +00:00
Seb Bacon 5cb20d1d45 cache table reflection (it was *very* slow) 2011-04-10 09:44:44 +01:00
Seb Bacon 11d3777a66 accept non-ascii IRIs 2011-04-10 09:20:49 +01:00
Seb Bacon ee15b29de8 use sqlalchemy expression language where practical 2011-04-08 11:00:28 +01:00
Seb Bacon b852e048c6 escape percents in query condition 2011-04-07 16:30:32 +01:00