src/ztfy/myams/templates/fullpage-modal-layout.pt
changeset 223 662e8fc90c14
parent 101 8364fb15bfe5
--- a/src/ztfy/myams/templates/fullpage-modal-layout.pt	Mon Dec 14 09:14:30 2020 +0100
+++ b/src/ztfy/myams/templates/fullpage-modal-layout.pt	Mon Jan 15 11:58:06 2024 +0100
@@ -33,22 +33,20 @@
 		</div>
 	</div>
 
-	<tal:if condition="config/google_analytics_key">
-		<!-- Google Analytics -->
-		<script type="text/javascript" tal:content="python:'''
-
-		  var _gaq = _gaq || [];
-		  _gaq.push(['_setAccount', '%(key)s']);
-		  _gaq.push(['_trackPageview']);
-
-		  (function() {
-			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-		  })();
-
-		''' % {'key': config.google_analytics_key}"></script>
-		<!-- end Google Analytics -->
+	<!-- Google Analytics -->
+	<tal:if define="ga_key config/google_analytics_key"
+			condition="ga_key">
+		<script async
+				tal:attributes="src string:https://www.googletagmanager.com/gtag/js?id=${ga_key}"></script>
+		<script tal:content="python:'''
+			window.dataLayer = window.dataLayer || [];
+			function gtag() {
+				dataLayer.push(arguments);
+			}
+			gtag('js', new Date());
+			gtag('config', '%(key)s');
+		''' % {'key': ga_key}"></script>
 	</tal:if>
+	<!-- end Google Analytics -->
 </body>
 </html>