update piwik url (RefugeRestrooms#441)

* re-branch without docker * remove old files
DeeDeeG · Oct 15, 2018 · cefbadb · cefbadb
1 parent 8a1cd93
commit cefbadb
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 51 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,6 @@ gem 'coffee-rails', '~> 4.2'
 gem 'jquery-rails'
 gem 'turbolinks'
 gem 'jbuilder', '~> 2.5'
-gem 'piwik_analytics', '~> 1.0.2'
 gem 'geocoder', '~> 1.2.1'
 gem 'devise', '~> 4.3'
 gem 'rakismet'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -242,10 +242,6 @@ GEM
       activerecord (>= 4.2)
       activesupport (>= 4.2)
       arel (>= 6)
-    piwik_analytics (1.0.2)
-      actionpack
-      activesupport
-      rails (>= 3.0.0)
     poltergeist (1.16.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -416,7 +412,6 @@ DEPENDENCIES
   mail_form (>= 1.7.0)
   pg
   pg_search
-  piwik_analytics (~> 1.0.2)
   poltergeist
   pry
   puma

diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
@@ -18,3 +18,4 @@
     %a{:href => "https://patreon.com/refugerestrooms"} #{t('.on-patreon')}
     %br/
     = "\&copy; #{t('.copyleft')}  #{Date.today.year} #{t('.refuge-restrooms')}".html_safe
+
diff --git a/app/views/layouts/_ga_tag.html.haml b/app/views/layouts/_ga_tag.html.haml
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
@@ -10,3 +10,5 @@
 = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
 = javascript_include_tag "application", "data-turbolinks-track" => true
 = csrf_meta_tags
+= render 'layouts/piwik_tag'
+
diff --git a/app/views/layouts/_piwik_tag.html.haml b/app/views/layouts/_piwik_tag.html.haml
@@ -0,0 +1,14 @@
+<!-- Matomo -->
+:javascript
+  var _paq = _paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://refugerestrooms.innocraft.cloud/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '1']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+<!-- End Matomo Code -->
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -13,4 +13,3 @@
         = yield
         = render 'layouts/footer'
 
-    = render 'layouts/ga_tag'
diff --git a/app/views/layouts/splash.html.haml b/app/views/layouts/splash.html.haml
@@ -7,5 +7,3 @@
       = render 'layouts/navigation'
       .container
         = yield
-    = render 'layouts/ga_tag'
-    = piwik_tracking_tag
diff --git a/config/piwik.yml b/config/piwik.yml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@
		%a{:href => "https://patreon.com/refugerestrooms"} #{t('.on-patreon')}
		%br/
		= "\© #{t('.copyleft')} #{Date.today.year} #{t('.refuge-restrooms')}".html_safe
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,3 @@
		= yield
		= render 'layouts/footer'

		= render 'layouts/ga_tag'