diff options
| author | Francis Irving <francis@mysociety.org> | 2010-05-18 10:55:07 +0100 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2010-05-18 10:55:07 +0100 |
| commit | fdb6362f7f3402cc671211909ffb8319739bf585 (patch) | |
| tree | 39ab50a50be8cb59247a515eb2cab41309f6d63d | |
| parent | ba0bf5c3feb038a3e93a46b3c6790d467d298357 (diff) | |
| parent | d33fdf1ce4a17eaa068cdcab00821444281056a0 (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/whatdotheyknow
| -rw-r--r-- | app/views/layouts/default.rhtml | 19 | ||||
| -rw-r--r-- | public/down.default.html | 19 |
2 files changed, 16 insertions, 22 deletions
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index aaf62a366..efbb3ae4d 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -159,17 +159,14 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/"); document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); -</script> -<script type="text/javascript"> -<!-- -piwik_action_name = ''; -piwik_idsite = 4; -piwik_url = pkBaseURL + "piwik.php"; -piwik_log(piwik_action_name, piwik_idsite, piwik_url); -//--> -</script> -<noscript><p><img src="http://piwik.mysociety.org/piwik.php?idsite=4" style="border:0" alt=""></p></noscript> -<!-- /Piwik --> +</script><script type="text/javascript"> +try { +var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4); +piwikTracker.trackPageView(); +piwikTracker.enableLinkTracking(); +} catch( err ) {} +</script><noscript><p><img src="http://piwik.mysociety.org/piwik.php?idsite=4" style="border:0" alt=""/></p></noscript> +<!-- End Piwik Tag --> <% end %> </body> diff --git a/public/down.default.html b/public/down.default.html index 58a28177a..5325c5243 100644 --- a/public/down.default.html +++ b/public/down.default.html @@ -62,17 +62,14 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/"); document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); -</script> -<script type="text/javascript"> -<!-- -piwik_action_name = ''; -piwik_idsite = 4; -piwik_url = pkBaseURL + "piwik.php"; -piwik_log(piwik_action_name, piwik_idsite, piwik_url); -//--> -</script> -<noscript><p><img src="http://piwik.mysociety.org/piwik.php?i=1" style="border:0" alt=""></p></noscript> -<!-- /Piwik --> +</script><script type="text/javascript"> +try { +var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4); +piwikTracker.trackPageView(); +piwikTracker.enableLinkTracking(); +} catch( err ) {} +</script><noscript><p><img src="http://piwik.mysociety.org/piwik.php?idsite=4" style="border:0" alt=""/></p></noscript> +<!-- End Piwik Tag --> </body> |