Fix bugs with new google analytics tracking (#145)

coderedcms/__init__.py

@@ -1,4 +1,4 @@
-release = ['0', '13', '0']
+release = ['0', '13', '1']
 
 __version__ = "{0}.{1}.{2}".format(release[0], release[1], release[2])
 __shortversion__ = "{0}.{1}".format(release[0], release[1])

coderedcms/static/js/codered-front.js

@@ -225,11 +225,11 @@ $(document).ready(function()
                 "event_category": "Link",
                 "event_label": $(this).text().trim().substring(0, 30)
             };
-            if ($(this).data('gtag-event_category')) {
-                gtag_data['event_category'] = $(this).data('gtag-event_category');
+            if ($(this).data('ga-event-category')) {
+                gtag_data['event_category'] = $(this).data('ga-event-category');
             }
-            if ($(this).data('gtag-event_label')) {
-                gtag_data['event_label'] = $(this).data('gtag-event_label');
+            if ($(this).data('ga-event-label')) {
+                gtag_data['event_label'] = $(this).data('ga-event-label');
             }
             gtag('event', 'click', gtag_data);
         });

coderedcms/templates/coderedcms/blocks/button_block.html

@@ -1,7 +1,7 @@
 <a href="{{self.url}}"
 	{% if settings.coderedcms.AnalyticsSettings.ga_track_button_clicks and not format == 'amp' %}
-        data-gtag-event_category='{{self.settings.ga_tracking_event_category|default:"Button"}}' 
-        data-gtag-event_label='{{self.settings.ga_tracking_event_label|default:self.button_title}}'
+        data-ga-event-category='{{self.settings.ga_tracking_event_category|default:"Button"}}'
+        data-ga-event-label='{{self.settings.ga_tracking_event_label|default:self.button_title}}'
 	{% endif %}
   title="{{ self.button_title|safe }}"
   class="btn {{ self.button_style }} {{ self.button_size }} {{ self.settings.custom_css_class }}"

coderedcms/templates/coderedcms/blocks/download_block.html

@@ -1,19 +1,17 @@
 {% load wagtailcore_tags %}
 
 <a href="{{self.downloadable_file.url}}" download="{{self.downloadable_file.url}}"
-	{% if settings.coderedcms.AnalyticsSettings.ga_track_button_clicks or self.onclick %}
-	{% if not format == 'amp' %}
-		onclick="{% if settings.coderedcms.AnalyticsSettings.ga_track_button_clicks %}ga('send', 'event', '{{self.settings.ga_tracking_event_category}}', 'click', '{{self.settings.ga_tracking_event_label}}');{% endif %}
-		{% if self.onclick %}{{ self.onclick }}{% endif %}"
-	{% endif %}
-	{% endif %}
-  title="{{ self.alt_text|safe }}"
-  class='btn {{ self.button_style }} {{ self.button_size }} {{ self.settings.custom_css_class }}'
-  {% if self.settings.custom_id %}id="{{ self.settings.custom_id }}"{% endif %}>
+    {% if settings.coderedcms.AnalyticsSettings.ga_track_button_clicks and not format == 'amp' %}
+        data-ga-event-category='{{self.settings.ga_tracking_event_category|default:"Download"}}'
+        data-ga-event-label='{{self.settings.ga_tracking_event_label|default:self.button_title}}'
+    {% endif %}
+    title="{{ self.alt_text|safe }}"
+    class='btn {{ self.button_style }} {{ self.button_size }} {{ self.settings.custom_css_class }}'
+    {% if self.settings.custom_id %}id="{{ self.settings.custom_id }}"{% endif %}>
 {% if self.button_title %}
-  {{ self.button_title|safe }}
+    {{ self.button_title|safe }}
 {% else %}
-  Download {{ self.downloadable_file.title }}
+    Download {{ self.downloadable_file.title }}
 {% endif %}
 </a>
 

coderedcms/templates/coderedcms/blocks/hero_block.html

@@ -1,4 +1,4 @@
-{% load wagtailimages_tags %}
+{% load wagtailcore_tags wagtailimages_tags %}
 
 {% if not self.fluid %}
 <div class="container">
@@ -11,7 +11,7 @@
 	{% if self.custom_css_id %}id="{{self.settings.custom_css_id}}"{% endif %}>
 	<div class="hero-fg"
 		style="{% if self.foreground_color %}color:{{self.foreground_color}};{% endif %}">
-		{{self.content}}
+		{% include_block self.content %}
 	</div>
 </div>
 

coderedcms/templates/coderedcms/blocks/image_link_block.html

@@ -1,11 +1,11 @@
 {% load wagtailimages_tags %}
 
 <a href="{{self.url}}"
-	{% if settings.coderedcms.AnalyticsSettings.ga_track_button_clicks and not format == 'amp' %}
-		onclick="ga('send', 'event', '{{self.settings.ga_tracking_event_category|default:'ImageLink'}}', 'click', '{{self.settings.ga_tracking_event_label|default:self.alt_text}}');"
-	{% endif %}
-  title="{{ self.alt_text|safe }}"
-  {% if self.settings.custom_id %}id="{{ self.settings.custom_id }}"{% endif %}>
-	{% image self.image max-1000x1000 as self_image %}
-	<img src="{{self_image.url}}" class="img-fluid {{self.settings.custom_css_class}}" alt="{{self.alt_text|safe}}" />
+    {% if settings.coderedcms.AnalyticsSettings.ga_track_button_clicks and not format == 'amp' %}
+        data-ga-event-category='{{self.settings.ga_tracking_event_category|default:"ImageLink"}}'
+        data-ga-event-label='{{self.settings.ga_tracking_event_label|default:self.alt_text}}'
+    {% endif %}
+    title="{{ self.alt_text|safe }}" {% if self.settings.custom_id %}id="{{ self.settings.custom_id }}" {% endif %}>
+    {% image self.image max-1000x1000 as self_image %}
+    <img src="{{self_image.url}}" class="img-fluid {{self.settings.custom_css_class}}" alt="{{self.alt_text|safe}}" />
 </a>

docs/releases/index.rst

@@ -17,6 +17,7 @@ CodeRed CMS follows the ``[major].[minor].[maintenance]`` versioning scheme.
 .. toctree::
     :maxdepth: 1
 
+    v0.13.1
     v0.13.0
     v0.12.1
     v0.12.0

docs/releases/v0.13.1.rst

@@ -0,0 +1,16 @@
+CodeRed CMS 0.13.1 release notes
+================================
+
+
+Bug fixes
+---------
+
+* Google Analytics now properly tracks event category and labels for
+  Button, ImageLink, and Download blocks.
+* Google Analytics now properly tracks clicks within hero units.
+
+
+Upgrade considerations
+----------------------
+
+None