wagtail-cjkcms 23.2.4__tar.gz → 23.2.6__tar.gz

{wagtail-cjkcms-23.2.4 → wagtail-cjkcms-23.2.6}/CHANGELOG.md

@@ -152,4 +152,12 @@
 
 # 23.2.4 (2023-02-22)
 - Added .modal max-width: none to avoid problems with centering images in modals, both in Bootstrap and MDBootstrap
-- Fixed carousel prev/next not working with MDB & Plain Bootstrap 5.
+- Fixed carousel prev/next not working with MDB & Plain Bootstrap 5.
+
+# 23.2.5 (2023-02-23)
+- Google analytics script fix to respect cookie consent.
+- Fixed broken link tracking script.
+- Removed unnecessary requirement re: wagtail 4.2 from migration 0006
+
+# 23.2.6 (2023-02-23)
+- Fixed problem with migration broken by 23.2.5

{wagtail-cjkcms-23.2.4/wagtail_cjkcms.egg-info → wagtail-cjkcms-23.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 23.2.4
+Version: 23.2.6
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.x site. Based on Codered CRX.
 Home-page: https://github.com/cjkpl/wagtail-cjkcms
 Author: Grzegorz Krol

{wagtail-cjkcms-23.2.4 → wagtail-cjkcms-23.2.6}/cjkcms/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (23, 2, 4, "")
+VERSION = (23, 2, 6, "")
 
 __version_info__ = VERSION
 __version__ = ".".join(map(str, VERSION[:3])) + (f"-{VERSION[3]}" if VERSION[3] else "")

{wagtail-cjkcms-23.2.4 → wagtail-cjkcms-23.2.6}/cjkcms/static/cjkcms/js/cjkcms-front.js

@@ -101,58 +101,25 @@ document.addEventListener("DOMContentLoaded", function() {
         img.setAttribute('title', orig_ttl);
     }));
 
+    /** Tracking **/
+    
+    if (typeof cr_track_clicks !== "undefined" && cr_track_clicks) {
+        document.querySelectorAll("a").forEach(function (el) {
+            el.addEventListener("click", function (event) {
+            var el = event.currentTarget;
+            gtag_data = {
+                event_category: "Link",
+                event_label: el.textContent.trim().substring(0, 30),
+            };
+            if (el.dataset.gaEventCategory) {
+                gtag_data["event_category"] = el.dataset.gaEventCategory;
+            }
+            if (el.dataset.gaEventLabel) {
+                gtag_data["event_label"] = el.dataset.gaEventLabel;
+            }
+            gtag("event", "click", gtag_data);
+            });
+        });
+    }
 });
 
-// $(document).ready(function()
-// {
-//
-//     /*** AJAX Setup CSRF Setup ***/
-//     function getCookie(name) {
-//         var cookieValue = null;
-//         if (document.cookie && document.cookie !== '') {
-//             var cookies = document.cookie.split(';');
-//             for (var i = 0; i < cookies.length; i++) {
-//                 var cookie = jQuery.trim(cookies[i]);
-//                 // Does this cookie string begin with the name we want?
-//                 if (cookie.substring(0, name.length + 1) === (name + '=')) {
-//                     cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-//                     break;
-//                 }
-//             }
-//         }
-//         return cookieValue;
-//     }
-//     var csrftoken = getCookie('csrftoken');
-//
-//     function csrfSafeMethod(method) {
-//         // these HTTP methods do not require CSRF protection
-//         return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
-//     }
-//     $.ajaxSetup({
-//         beforeSend: function(xhr, settings) {
-//             if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
-//                 xhr.setRequestHeader("X-CSRFToken", csrftoken);
-//             }
-//         }
-//     });
-//
-//
-//     /*** Tracking ***/
-//     if(typeof cr_track_clicks !== 'undefined' && cr_track_clicks) {
-//         $('a').on('click', function(){
-//             gtag_data = {
-//                 "event_category": "Link",
-//                 "event_label": $(this).text().trim().substring(0, 30)
-//             };
-//             if ($(this).data('ga-event-category')) {
-//                 gtag_data['event_category'] = $(this).data('ga-event-category');
-//             }
-//             if ($(this).data('ga-event-label')) {
-//                 gtag_data['event_label'] = $(this).data('ga-event-label');
-//             }
-//             gtag('event', 'click', gtag_data);
-//         });
-//     }
-
-//
-// });

{wagtail-cjkcms-23.2.4 → wagtail-cjkcms-23.2.6}/cjkcms/templates/cjkcms/pages/base.html

@@ -161,7 +161,6 @@
                                 },
                                 settings_modal: {
                                     layout: '{{ settings.cjkcms.AnalyticsSettings.settings_modal_layout }}',
-                                    // position: 'left',           // left/right
                                     transition: 'slide'            // zoom/slide
                                 }
                             },

wagtail-cjkcms-23.2.6/cjkcms/templates/cjkcms/snippets/tracking_g3.html

@@ -0,0 +1 @@
+<script data-cookiecategory="analytics" async src="https://www.googletagmanager.com/gtag/js?id={{settings.cjkcms.AnalyticsSettings.ga_tracking_id}}"></script>

wagtail-cjkcms-23.2.6/cjkcms/templates/cjkcms/snippets/tracking_g4.html

@@ -0,0 +1,18 @@
+{% load wagtailsettings_tags %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script data-cookiecategory="analytics" async src="https://www.googletagmanager.com/gtag/js?id={{settings.cjkcms.AnalyticsSettings.g4_tracking_id}}"></script>
+<script data-cookiecategory="analytics">
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '{{settings.cjkcms.AnalyticsSettings.g4_tracking_id}}');
+</script>
+
+<script data-cookiecategory="analytics">
+  cr_track_clicks = {{settings.cjkcms.AnalyticsSettings.ga_track_button_clicks|yesno:"true,false"}};
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', '{{settings.cjkcms.AnalyticsSettings.ga_tracking_id}}');
+</script>

{wagtail-cjkcms-23.2.4 → wagtail-cjkcms-23.2.6/wagtail_cjkcms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 23.2.4
+Version: 23.2.6
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.x site. Based on Codered CRX.
 Home-page: https://github.com/cjkpl/wagtail-cjkcms
 Author: Grzegorz Krol

wagtail-cjkcms-23.2.4/cjkcms/templates/cjkcms/snippets/tracking_g3.html

@@ -1,8 +0,0 @@
-<script async src="https://www.googletagmanager.com/gtag/js?id={{settings.cjkcms.AnalyticsSettings.ga_tracking_id}}"></script>
-<script>
-  cr_track_clicks = {{settings.cjkcms.AnalyticsSettings.ga_track_button_clicks|yesno:"true,false"}};
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-  gtag('config', '{{settings.cjkcms.AnalyticsSettings.ga_tracking_id}}');
-</script>

wagtail-cjkcms-23.2.4/cjkcms/templates/cjkcms/snippets/tracking_g4.html

@@ -1,10 +0,0 @@
-{% load wagtailsettings_tags %}
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{settings.cjkcms.AnalyticsSettings.g4_tracking_id}}"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', '{{settings.cjkcms.AnalyticsSettings.g4_tracking_id}}');
-</script>