Removed Google Analytics, Integrated Check for Cookie consent before
displaying Twitter timeline
diff --git a/_projectCommon.php b/_projectCommon.php
index 2a4afb8..2911a0a 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -54,19 +54,47 @@
-
+$App->AddExtraHtmlHeader('<meta name="twitter:dnt" content="on">');
$App->AddExtraHtmlHeader("<link rel=\"stylesheet\" type=\"text/css\" href=\"/modeling/includes/common.css\"/>\n");
-$App->AddExtraHtmlHeader("
-<script>
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+$App->AddExtraHtmlHeader('<script src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>');
+$App->AddExtraHtmlHeader('<script>
+// via https://stackoverflow.com/questions/5968196/check-cookie-if-cookie-exists
+function getCookie(name) {
+var dc = document.cookie;
+var prefix = name + "=";
+var begin = dc.indexOf("; " + prefix);
+if (begin === -1) {
+ begin = dc.indexOf(prefix);
+ if (begin !== 0) return null;
+} else {
+ begin += 2;
+ var end = document.cookie.indexOf(";", begin);
+ if (end === -1) {
+ end = dc.length;
+ }
+}
- ga('create', 'UA-55011482-1', 'auto');
- ga('send', 'pageview');
+return decodeURI(dc.substring(begin + prefix.length, end));
+}
-</script>");
+function createTimeline() {
+var twitterContainer = document.getElementById("twitter-timeline");
+twttr.widgets.createTimeline(
+ "503883842478809088",
+ twitterContainer,
+ {
+ height: 400
+ }
+);
+twitterContainer.innerText = '';
+}
+
+(function() {
+if (getCookie("eclipse_cookieconsent_status") === "allow") {
+ createTimeline();
+ }
+})()
+</script>');
diff --git a/download.php b/download.php
index b9c4e8b..2827d9f 100644
--- a/download.php
+++ b/download.php
@@ -11,25 +11,6 @@
$html = <<<EOHTML
<html>
<body onload="document.location.href='/downloads/download.php?${QS}';">
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-910670-2"); // www.eclipse.org
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-2566337-8"); // www.eclipse.org/modeling
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
<noscript>
<p><blockquote style="margin:30px; border:2px purple dashed"><blockquote style="margin:30px">
diff --git a/emf/docs/index.php b/emf/docs/index.php
index b8e9210..1e51fef 100755
--- a/emf/docs/index.php
+++ b/emf/docs/index.php
@@ -430,7 +430,7 @@
</div>
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/emf/gettingstarted.php b/emf/gettingstarted.php
index 7a21345..edf5beb 100644
--- a/emf/gettingstarted.php
+++ b/emf/gettingstarted.php
@@ -51,7 +51,7 @@
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/emf/index.php b/emf/index.php
index 66eeadd..1558cc2 100644
--- a/emf/index.php
+++ b/emf/index.php
@@ -130,7 +130,7 @@
</div>
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/emf/indexold.php b/emf/indexold.php
index 84f9812..eaf39ce 100644
--- a/emf/indexold.php
+++ b/emf/indexold.php
@@ -56,7 +56,7 @@
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
diff --git a/graphical.php b/graphical.php
index 7bf5cb1..e4c64fc 100644
--- a/graphical.php
+++ b/graphical.php
@@ -95,7 +95,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/includes/downloads-common.php b/includes/downloads-common.php
index 594b0b2..b22b5b6 100644
--- a/includes/downloads-common.php
+++ b/includes/downloads-common.php
@@ -254,7 +254,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/index.php b/index.php
index d40e911..ea47afe 100644
--- a/index.php
+++ b/index.php
@@ -84,7 +84,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/more.php b/more.php
index 16e7147..3f58508 100644
--- a/more.php
+++ b/more.php
@@ -97,7 +97,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/server.php b/server.php
index 4d02cac..3f3b0f1 100644
--- a/server.php
+++ b/server.php
@@ -95,7 +95,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/support.php b/support.php
index fdaa3a7..8573f6a 100644
--- a/support.php
+++ b/support.php
@@ -84,7 +84,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/textual.php b/textual.php
index 4fe7df8..d8d1fa0 100644
--- a/textual.php
+++ b/textual.php
@@ -75,7 +75,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/tools.php b/tools.php
index 68c10f5..6a8fc69 100644
--- a/tools.php
+++ b/tools.php
@@ -116,7 +116,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/transformation.php b/transformation.php
index eb556a5..751c5fb 100644
--- a/transformation.php
+++ b/transformation.php
@@ -100,7 +100,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/ui.php b/ui.php
index 537b0f4..73c6472 100644
--- a/ui.php
+++ b/ui.php
@@ -85,7 +85,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
diff --git a/web.php b/web.php
index 5e77e9c..56b45a1 100644
--- a/web.php
+++ b/web.php
@@ -76,7 +76,7 @@
<div id="rightcolumn">
<div class="sideitem">
<h6>News on Twitter</h6>
- <a class="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
+ <a id="twitter-timeline" href="https://twitter.com/hashtag/eclipsemf" data-widget-id="503883842478809088">#eclipsemf Tweets</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</div>
