From: Thérèse Godefroy <godef.th@free.fr>
Date: Sat, 23 Sep 2017 14:14:55 +0000 (+0200)
Subject: en: use same JavaScript for all pages.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=57d582782b064ed5d4f95febf200084898632978;p=enc.git

en: use same JavaScript for all pages.
---

diff --git a/en/confirmation.html b/en/confirmation.html
index 623a8e75..23a21d2e 100644
--- a/en/confirmation.html
+++ b/en/confirmation.html
@@ -105,49 +105,22 @@ src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
 alt="Journalism++" /></a></p><!-- /.credits -->
 </div></footer><!-- End #footer -->
 
-		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
-		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
-
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
-
-	</body>
+<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
+<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
+
+<!-- Piwik -->
+<script type="text/javascript" >
+// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+try {
+	var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+	piwikTracker.trackPageView();
+	piwikTracker.enableLinkTracking();
+} catch( err ) {}
+// @license-end
+</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+</body>
 </html>
diff --git a/en/infographic.html b/en/infographic.html
index ee0703f5..c287cd18 100644
--- a/en/infographic.html
+++ b/en/infographic.html
@@ -102,49 +102,22 @@ src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
 alt="Journalism++" /></a></p><!-- /.credits -->
 </div></footer><!-- End #footer -->
 
-		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
-		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
-
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
-
-	</body>
+<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
+<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
+
+<!-- Piwik -->
+<script type="text/javascript" >
+// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+try {
+	var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+	piwikTracker.trackPageView();
+	piwikTracker.enableLinkTracking();
+} catch( err ) {}
+// @license-end
+</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+</body>
 </html>
diff --git a/en/next_steps.html b/en/next_steps.html
index 9bfc6424..ae86c6df 100644
--- a/en/next_steps.html
+++ b/en/next_steps.html
@@ -311,48 +311,22 @@ src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
 alt="Journalism++" /></a></p><!-- /.credits -->
 </div></footer><!-- End #footer -->
 
-		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
-		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
-
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
-	</body>
+<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
+<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
+
+<!-- Piwik -->
+<script type="text/javascript" >
+// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+try {
+	var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+	piwikTracker.trackPageView();
+	piwikTracker.enableLinkTracking();
+} catch( err ) {}
+// @license-end
+</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+</body>
 </html>