From 8de51c1f3742da0c3ee3c5e590f5351c3bf0d269 Mon Sep 17 00:00:00 2001 From: "brent.bb" Date: Mon, 26 Sep 2016 22:24:53 -0400 Subject: [PATCH 1/5] Update Google Analytics UA Code (Fixes #182) Refresh Google Analytics tracking JavaScript code from Google. --- sigal/themes/default/templates/analytics.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sigal/themes/default/templates/analytics.html b/sigal/themes/default/templates/analytics.html index 889a824..ba2e6f9 100644 --- a/sigal/themes/default/templates/analytics.html +++ b/sigal/themes/default/templates/analytics.html @@ -1,13 +1,12 @@ {% if settings.google_analytics %} + ga('create', '{{ settings.google_analytics }}', 'auto'); + ga('send', 'pageview'); + + {% endif %} From 16598760466a05f4ac4e5e690e3fb0544d081c94 Mon Sep 17 00:00:00 2001 From: "brent.bb" Date: Mon, 26 Sep 2016 22:27:43 -0400 Subject: [PATCH 2/5] Add support for Google Tag Manager Add support for Google Tag Manager tracking code into the included themes and the configuration template. --- sigal/templates/sigal.conf.py | 3 +++ sigal/themes/colorbox/templates/base.html | 1 + sigal/themes/default/templates/gtm.html | 11 +++++++++++ sigal/themes/galleria/templates/index.html | 1 + sigal/themes/photoswipe/templates/index.html | 1 + 5 files changed, 17 insertions(+) create mode 100644 sigal/themes/default/templates/gtm.html diff --git a/sigal/templates/sigal.conf.py b/sigal/templates/sigal.conf.py index a733ecc..de39bd0 100644 --- a/sigal/templates/sigal.conf.py +++ b/sigal/templates/sigal.conf.py @@ -171,6 +171,9 @@ ignore_files = [] # Google Analytics tracking code (UA-xxxx-x) # google_analytics = '' +# Google Tag Manager tracking code (GTM-xxxxxx) +# google_tag_manager = '' + # Piwik tracking # tracker_url must not contain trailing slash. # Example : {'tracker_url': 'http://stats.domain.com', 'site_id' : 2} diff --git a/sigal/themes/colorbox/templates/base.html b/sigal/themes/colorbox/templates/base.html index fe9d226..a2cf886 100644 --- a/sigal/themes/colorbox/templates/base.html +++ b/sigal/themes/colorbox/templates/base.html @@ -20,6 +20,7 @@ {% endblock %} + {% include 'gtm.html' %}
diff --git a/sigal/themes/default/templates/gtm.html b/sigal/themes/default/templates/gtm.html new file mode 100644 index 0000000..f4f2c3c --- /dev/null +++ b/sigal/themes/default/templates/gtm.html @@ -0,0 +1,11 @@ +{% if settings.google_tag_manager %} + + + + +{% endif %} diff --git a/sigal/themes/galleria/templates/index.html b/sigal/themes/galleria/templates/index.html index 6046469..fddc642 100644 --- a/sigal/themes/galleria/templates/index.html +++ b/sigal/themes/galleria/templates/index.html @@ -29,6 +29,7 @@ {% endif %} + {% include 'gtm.html' %}

{{ index_title }}

diff --git a/sigal/themes/photoswipe/templates/index.html b/sigal/themes/photoswipe/templates/index.html index bc85964..cdf8bf6 100644 --- a/sigal/themes/photoswipe/templates/index.html +++ b/sigal/themes/photoswipe/templates/index.html @@ -16,6 +16,7 @@ {% endblock %} + {% include 'gtm.html' %}

{{ index_title }}

From beeb78177f49ec4bcd05ea4f96d81f70a5325868 Mon Sep 17 00:00:00 2001 From: "brent.bb" Date: Tue, 27 Sep 2016 19:52:20 -0400 Subject: [PATCH 3/5] Add default GTM config key Add the key for GTM and blank default value into the DEFAULT_CONFIG --- sigal/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sigal/settings.py b/sigal/settings.py index a384bd6..416fb91 100644 --- a/sigal/settings.py +++ b/sigal/settings.py @@ -39,6 +39,7 @@ _DEFAULT_CONFIG = { 'destination': '_build', 'files_to_copy': (), 'google_analytics': '', + 'google_tag_manager': '', 'ignore_directories': [], 'ignore_files': [], 'img_processor': 'ResizeToFit', From 66386b280dec8e0859f566819d4c9cc3cd998e8f Mon Sep 17 00:00:00 2001 From: "brent.bb" Date: Tue, 27 Sep 2016 19:53:30 -0400 Subject: [PATCH 4/5] Move new GA code into the head tag The new Google Analytics JavaScript is now placed at the end of the HTML HEAD tag in the included themes. --- sigal/themes/colorbox/templates/base.html | 2 +- sigal/themes/galleria/templates/index.html | 2 +- sigal/themes/photoswipe/templates/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sigal/themes/colorbox/templates/base.html b/sigal/themes/colorbox/templates/base.html index a2cf886..86d8227 100644 --- a/sigal/themes/colorbox/templates/base.html +++ b/sigal/themes/colorbox/templates/base.html @@ -18,6 +18,7 @@ {% endif %} {% endblock %} + {% include 'analytics.html' %} {% include 'gtm.html' %} @@ -46,7 +47,6 @@
{% block footer %}{% endblock %} - {% include 'analytics.html' %} {% include 'piwik.html' %} diff --git a/sigal/themes/galleria/templates/index.html b/sigal/themes/galleria/templates/index.html index fddc642..ad23537 100644 --- a/sigal/themes/galleria/templates/index.html +++ b/sigal/themes/galleria/templates/index.html @@ -27,6 +27,7 @@ {% endif %} + {% include 'analytics.html' %} {% include 'gtm.html' %} @@ -304,7 +305,6 @@ {% endif %} - {% include 'analytics.html' %} {% include 'piwik.html' %} diff --git a/sigal/themes/photoswipe/templates/index.html b/sigal/themes/photoswipe/templates/index.html index cdf8bf6..557d910 100644 --- a/sigal/themes/photoswipe/templates/index.html +++ b/sigal/themes/photoswipe/templates/index.html @@ -14,6 +14,7 @@ {% endblock %} + {% include 'analytics.html' %} {% include 'gtm.html' %} @@ -397,7 +398,6 @@ {% endif %} {% endblock %}
-{% include 'analytics.html' %} {% include 'piwik.html' %} From 1bce388b24acddc15692b0dfec59a7d6eb9aab4a Mon Sep 17 00:00:00 2001 From: "brent.bb" Date: Tue, 27 Sep 2016 19:55:52 -0400 Subject: [PATCH 5/5] Add self to AUTHORS Add self as a contributor --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 3a056a9..2430eed 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,6 +5,7 @@ alphabetical order): - Alexey Bazhin - Andreas Sieferlinger - Antoine Pitrou +- Brent Bandelgar (@brentbb) - Cédric Bosdonnat - Christophe-Marie Duquesne - @datro