projects / enc-live.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
adjustments to piwik tracking
[enc-live.git] / en / infographic.html
diff --git a/en/infographic.html b/en/infographic.html
index 85ae0923ab797bd15ff6f7e00d445c3462b699d3..ab1bb2a500331f7ba55d55639b09eff611f85a91 100644 (file)
--- a/en/infographic.html
+++ b/en/infographic.html
@@ -5,38 +5,38 @@
 <title>Email Self-Defense - a guide to fighting surveillance with GnuPG
 encryption</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy,
-email, Enigmail" />
+email, security, GnuPG2, encryption" />
 <meta name="description" content="Email surveillance violates our fundamental
 rights and makes free speech risky. This guide will teach you email
 self-defense in 40 minutes with GnuPG." />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
+<link rel="stylesheet" href="../static/css/main.css" />
 <link rel="shortcut icon"
-href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
+href="../static/img/favicon.ico" />
 </head>
 
-<body><iframe src="//static.emailselfdefense.org/nosvn/banners/2018fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block;"></iframe>
+<body><iframe src="//static.fsf.org/nosvn/banners/202211fundraiser/" scrolling="no" style="width: 100%; height: 150px; display: block; margin: 0; border: 0 none; overflow: hidden;"></iframe>
+<!--<div style="text-align: center; padding: 2.5px; background-color: #a94442; color:#fcf8e3;"><p>Due to Enigmail's PGP functionality being migrated into Icedove and Thunderbird, steps 2 and 3 of the guide are currently out of date.</p><p> Thank you for your patience while we're working on a new round of updates.</p></div>-->
 
 <header class="row centered" id="header"><div>
 
 <p class="back">&larr; Read the <a href="index.html">full guide</a></p>
 
 <h3><a
-href="https://fsf.org/share?u=https://u.fsf.org/zc&amp;t=How&nbsp;public-key
-encryption works. Infographic via %40fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
+href="https://fsf.org/share?u=https://u.fsf.org/zc&amp;t=How%20public-key%20encryption%20works.%20Infographic%20via%20%40fsf"><img
+src="../static/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />&nbsp;
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="../static/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+src="../static/img/reddit-alien.png"
 class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
+src="../static/img/hacker-news.png"
 class="share-logo"
 alt="[Hacker News]" />&nbsp;
 Share our infographic
@@ -45,7 +45,7 @@ with the hashtag #EmailSelfDefense
 </h3>
 
 <p><img
-src="//static.fsf.org/nosvn/enc-dev0/img/en/full-infographic.png"
+src="../static/img/en/full-infographic.png"
 alt="View &amp; share our infographic" /></p>
 
 <p class="back">&larr; Read the <a href="index.html">full guide</a></p>
@@ -58,9 +58,9 @@ alt="View &amp; share our infographic" /></p>
 
 <h4><a href="https://u.fsf.org/ys"><img
 alt="Free Software Foundation"
-src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h4>
+src="../static/img/fsf-logo.png" /></a></h4>
 
-<p>Copyright &copy; 2014-2016 <a
+<p>Copyright &copy; 2014-2021 <a
 href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a
 href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please
 support our work by <a href="https://u.fsf.org/yr">joining us as an associate
@@ -71,18 +71,18 @@ href="https://creativecommons.org/licenses/by/4.0/">Creative Commons
 Attribution 4.0 license (or later version)</a>, and the rest of it is under
 a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons
 Attribution-ShareAlike 4.0 license (or later version)</a>. Download the <a
-href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">
+href="https://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">
 source code of Edward reply bot</a> by Andrew Engelbrecht
-&lt;sudoman@ninthfloor.org&gt; and Josh Drake &lt;zamnedix@gnu.org&gt;,
+&lt;andrew@engelbrecht.io&gt; and Josh Drake &lt;zamnedix@gnu.org&gt;,
 available under the GNU Affero General Public License. <a
-href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these
+href="https://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these
 licenses?</a></p>
 
 <p>Fonts used in the guide &amp; infographic: <a
 href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo
-Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a>
+Impallari, <a href="https://www.google.com/fonts/specimen/Signika">Signika</a>
 by Anna Giedry&#347;, <a
-href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo
+href="https://www.google.com/fonts/specimen/Archivo+Narrow">Archivo
 Narrow</a> by Omnibus-Type, <a
 href="https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls">PXL-2000</a>
 by Florian Cramer.</p>
@@ -93,37 +93,41 @@ messages.</p>
 
 <p>This site uses the Weblabels standard for labeling <a
 href="https://www.fsf.org/campaigns/freejs">free JavaScript</a>. View
-the JavaScript <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/"
+the JavaScript <a href="https://weblabels.fsf.org/emailselfdefense.fsf.org/"
 rel="jslicense">source code and license information</a>.</p>
 
 </div><!-- /#copyright -->
 
 <p class="credits">Infographic and guide design by <a rel="external"
-href="http://jplusplus.org"><strong>Journalism++</strong><img
-src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
+href="https://jplusplus.org"><strong>Journalism++</strong><img
+src="../static/img/jplusplus.png"
 alt="Journalism++" /></a></p><!-- /.credits -->
 </div></footer><!-- End #footer -->
 
 
 <script type="text/javascript"
-src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
+src="../static/js/jquery-1.11.0.min.js"></script>
 <script type="text/javascript"
-src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
+src="../static/js/scripts.js"></script>
 <!-- Piwik -->
-<script type="text/javascript" ><!--
-// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&amp;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 -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _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", "13"]);
+    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);
+  })();
+  // @license-end
+</script>
+<!-- End Piwik Code -->
+<!-- Piwik Image Tracker -->
+<!-- <noscript><img src="https://piwik.fsf.org//piwik.php?idsite=13&amp;rec=1" style="border:0" alt="" /></noscript> -->
+<!-- End Piwik -->
 </body>
 </html>