Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update piwik url #441

Merged
merged 3 commits into from
Feb 5, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 0 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -415,7 +411,6 @@ DEPENDENCIES
mail_form (>= 1.7.0)
pg
pg_search
piwik_analytics (~> 1.0.2)
poltergeist
pry
rack-cors
Expand Down
1 change: 1 addition & 0 deletions app/views/layouts/_footer.html.haml
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

9 changes: 0 additions & 9 deletions app/views/layouts/_ga_tag.html.haml

This file was deleted.

2 changes: 2 additions & 0 deletions app/views/layouts/_head.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

14 changes: 14 additions & 0 deletions app/views/layouts/_piwik_tag.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!-- Matomo -->
:javascript
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trying to decide if I should guard this based on env. Probably...

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 -->
1 change: 0 additions & 1 deletion app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@
= yield
= render 'layouts/footer'

= render 'layouts/ga_tag'
2 changes: 0 additions & 2 deletions app/views/layouts/splash.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@
= render 'layouts/navigation'
.container
= yield
= render 'layouts/ga_tag'
= piwik_tracking_tag
33 changes: 0 additions & 33 deletions config/piwik.yml

This file was deleted.