[Scummvm-git-logs] scummvm-web master -> 9144ac5d1659cc24d45b05af6f9d465b59e05f8a

Thu Jan 24 02:04:55 CET 2019

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
9144ac5d16 WEB: Revert 6aacaeb919721c20f7071ee76333c14d122522d5


Commit: 9144ac5d1659cc24d45b05af6f9d465b59e05f8a
    https://github.com/scummvm/scummvm-web/commit/9144ac5d1659cc24d45b05af6f9d465b59e05f8a
Author: Matan Bareket (mataniko at gmail.com)
Date: 2019-01-23T20:04:39-05:00

Commit Message:
WEB: Revert 6aacaeb919721c20f7071ee76333c14d122522d5

Changed paths:
    templates/pages/index.tpl

diff --git a/templates/pages/index.tpl b/templates/pages/index.tpl
index 646f413..4a9be15 100644
--- a/templates/pages/index.tpl
+++ b/templates/pages/index.tpl
@@ -16,23 +16,25 @@
 	<link rel="alternate" type="application/rss+xml" title="{#indexRSSFeed#}" href="{$baseurl}feeds/rss/">
 	<link rel="apple-touch-icon" href="/images/scummvm.png">
 	<title>ScummVM :: {$title}</title>
-	<!-- Matomo -->
-	<script type="text/javascript">
-	var _paq = _paq || [];
-	/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-	_paq.push(["setCookieDomain", "*.scummvm.org"]);
-	_paq.push(['trackPageView']);
-	_paq.push(['enableLinkTracking']);
-	(function() {
-		var u="https://analytics.scummvm.org/";
-		_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);
-	})();
-	</script>
-	<noscript><p><img src="https://analytics.scummvm.org/piwik.php?idsite=1&rec=1" style="border:0;" alt="" /></p></noscript>
-	<!-- End Matomo Code -->
+	{if $smarty.cookies.cookie_consent == "true"}
+		<!-- Matomo -->
+		<script type="text/javascript">
+		var _paq = _paq || [];
+		/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+		_paq.push(["setCookieDomain", "*.scummvm.org"]);
+		_paq.push(['trackPageView']);
+		_paq.push(['enableLinkTracking']);
+		(function() {
+			var u="https://analytics.scummvm.org/";
+			_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);
+		})();
+		</script>
+		<noscript><p><img src="https://analytics.scummvm.org/piwik.php?idsite=1&rec=1" style="border:0;" alt="" /></p></noscript>
+		<!-- End Matomo Code -->
+	{/if}
 </head>
 <body>
 	<input type="checkbox" autocomplete="off" id="nav-trigger" class="nav-trigger" />
@@ -113,14 +115,19 @@
 				document.body.classList.remove('no-scroll');
 		});
 	</script>
-{* Google analytics javascript. *}
-	<script src="https://www.google-analytics.com/urchin.js" type="text/javascript"></script>
-	<script type="text/javascript">
-		_uacct = "UA-1455743-1";
-		_udn = "scummvm.org";
-		urchinTracker();
-	</script>
-{* End Google analytics javascript. *}
-
+	{if $smarty.cookies.cookie_consent == "true"}
+		{* Google analytics javascript. *}
+			<script src="https://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+			<script type="text/javascript">
+				_uacct = "UA-1455743-1";
+				_udn = "scummvm.org";
+				urchinTracker();
+			</script>
+		{* End Google analytics javascript. *}
+	{else if $smarty.cookies.cookie_consent == "false"}
+		{* Do nothing *}
+	{else}
+		{include file='components/cookie.tpl'}
+	{/if}
 	</body>
 </html>



