aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-03-10 12:21:36 +0000
committerSeb Bacon <seb.bacon@gmail.com>2011-03-10 12:21:36 +0000
commit4068c20d3218165fd9db085c2fa0465db799ee8f (patch)
tree7f479e7401a9ea392cf4b083d603a8986b3e3a01
parentca683c4e9801dab4c7eee408f50032a504ee1a5b (diff)
fix bad merges from rebase with master
-rw-r--r--app/views/general/_before_body_end.rhtml16
-rw-r--r--app/views/general/_credits.rhtml5
2 files changed, 21 insertions, 0 deletions
diff --git a/app/views/general/_before_body_end.rhtml b/app/views/general/_before_body_end.rhtml
new file mode 100644
index 000000000..8d7ebeeb5
--- /dev/null
+++ b/app/views/general/_before_body_end.rhtml
@@ -0,0 +1,16 @@
+<% if MySociety::Config.get("DOMAIN", '127.0.0.1:3000') == 'www.whatdotheyknow.com' %>
+<!-- Piwik -->
+<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">
+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 %>
+
+
diff --git a/app/views/general/_credits.rhtml b/app/views/general/_credits.rhtml
new file mode 100644
index 000000000..a2f7a9cb2
--- /dev/null
+++ b/app/views/general/_credits.rhtml
@@ -0,0 +1,5 @@
+|
+ Built by <a href="http://www.mysociety.org/">mySociety</a> ...
+ <a href="/help/credits#helpus">and you</a>
+ |
+ Dedicated to <a href="http://mk.ucant.org/archives/000129.html">Chris Lightfoot</a>