Rework piwik configuration

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index eb5ce64f310b178126b5885186e6032a809ef8a4..5c555a25ac9e37908bace402cf5673d95387d108 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,7 +1,6 @@
 OSM = {
-<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>
-  PIWIK_LOCATION:        <%= PIWIK_LOCATION.to_json %>,
-  PIWIK_SITE:            <%= PIWIK_SITE.to_json %>,
+<% if defined?(PIWIK) %>
+  PIWIK:                 <%= PIWIK.to_json %>,
 <% end %>
 
   MAX_REQUEST_AREA:      <%= MAX_REQUEST_AREA.to_json %>,

diff --git a/app/assets/javascripts/piwik.js b/app/assets/javascripts/piwik.js
index d0443ae6d983ad9ee137f92eb66d8ed5cf15e3fe..d81a9ec630a97e2da3cf94c8152cb788a6ee1e17 100644 (file)
--- a/app/assets/javascripts/piwik.js
+++ b/app/assets/javascripts/piwik.js
@@ -1,13 +1,13 @@
-if (OSM.PIWIK_LOCATION && OSM.PIWIK_SITE) {
+if (OSM.PIWIK) {
   $(document).ready(function () {
-    var base = document.location.protocol + "//" + OSM.PIWIK_LOCATION + "/";
+    var base = document.location.protocol + "//" + OSM.PIWIK.location + "/";
 
     $.ajax({
       url: base + "piwik.js",
       dataType: "script",
       cache: true,
       success: function () {
-        var piwikTracker = Piwik.getTracker(base + "piwik.php", OSM.PIWIK_SITE);
+        var piwikTracker = Piwik.getTracker(base + "piwik.php", OSM.PIWIK.site);
       
         piwikTracker.trackPageView();
         piwikTracker.enableLinkTracking();

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index c3cd9fcf22f4cbf994555a00240895ffde9f3b52..a7822e47fd436188d703fe55493482d9649a92cb 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -86,7 +86,7 @@ class UserController < ApplicationController
         @user.openid_url = nil if @user.openid_url and @user.openid_url.empty?
 
         if @user.save
-          flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL)
+          flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)
 
           referer = welcome_path
 

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 12b5b82c5c358c9aa123e16c739b53fce0b61019..97bf062036dce8c615df6aed8fd29575fd8016a3 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -126,8 +126,8 @@
         <%= yield %>
       </div>
     </div>
-    <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
-    <noscript><p><img src="<%= request.protocol %><%= PIWIK_LOCATION %>/piwik.php?idsite=<%= PIWIK_SITE %>" style="border:0" alt="" /></p></noscript>
+    <% if defined?(PIWIK) -%>
+    <noscript><p><img src="<%= request.protocol %><%= PIWIK['location'] %>/piwik.php?idsite=<%= PIWIK['site'] %>" style="border:0" alt="" /></p></noscript>
     <% end -%>
   </body>
 </html>

diff --git a/config/example.application.yml b/config/example.application.yml
index c6c15bb1d4003eb79409536b53ee19ea320ae499..d6a855ef5003b68fb343298bac7b60fd2a1faa73 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -84,10 +84,6 @@ defaults: &defaults
   require_terms_seen: false
   # Whether to require users to agree to the CTs before editing
   require_terms_agreed: false
-  # Piwik details
-  #piwik_location: "piwik.openstreetmap.org"
-  #piwik_site: 1
-  #piwik_signup_goal: 1
 
 development:
   <<: *defaults

diff --git a/config/initializers/piwik.rb b/config/initializers/piwik.rb
new file mode 100644 (file)
index 0000000..1f054f7
--- /dev/null
+++ b/config/initializers/piwik.rb
@@ -0,0 +1,5 @@
+require "yaml"
+
+if File.exists?(piwik_file = File.expand_path("../../piwik.yml", __FILE__))
+  PIWIK = YAML.load_file(piwik_file)
+end