Images and sources
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Thu, 5 Jun 2014 00:46:26 +0000 (01:46 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Thu, 5 Jun 2014 00:46:26 +0000 (01:46 +0100)
index.html
infographic.html

index ea7281c3c6775608e928004c48a19fab6c093fc9..d9215e478add64ecb59fa9636cdaf4c909b46f0f 100644 (file)
 
        </head>
        <body>
+<!--
                <nav class="nav">
                        <div>
-                               <ul class="os">
-                                       <li><a href="index.html" class="current">GNU/Linux</a></li>
-                                       <li><a href="mac.html">Mac OS</a></li>
-                                       <li><a href="windows.html">Windows</a></li>
-                               </ul>
-                               <!--<ul class="lang">
+                               <ul class="lang">
                                        <li class="help"><a href="http://libreplanet.org/wiki/GPG_guide">Translate this guide!</a></li>
-                               </ul> -->
+                               </ul>
                        </div>
                </nav>
+-->
 
 <!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
 <!-- ~~~~~~~~~  Revision as of 18:53, 1 June 2014 by Zakkai ~~~~~~~~~ -->
 
                        <div>
                                <h1>Email Self-Defense</h1>
+                               <ul class="os">
+                                       <li><a href="index.html" class="current">GNU/Linux</a></li>
+                                       <li><a href="mac.html">Mac OS</a></li>
+                                       <li><a href="windows.html">Windows</a></li>
+                               </ul>
 
                                <!-- ~~~~~~~~~ FSF Introduction ~~~~~~~~~ -->
                                <div id="fsf-intro">
@@ -63,8 +65,7 @@
                                <!-- ~~~~~~~~~ Guide Introduction ~~~~~~~~~ -->
                                <div class="intro">
                                        <p id="infographic">
-                                               <a class="img-link" href="infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/infographic-button.png" alt="Email Self-Defense, Infographic" /></a>
-                                               <a class="text-link" href="infographic.html">View &amp; share our infographic &rarr;</a>
+                                               <a href="infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/infographic-button.png" alt="View &amp; share our infographic &rarr;" /></a>
                                        </p>
                                        <p>The goal of this guide is to make it easy to set up email encryption on your computer. Once you've finished, you'll be able to send and receive emails that are coded to make sure that a surveillance agent or thief can't intercept your email and read it. </p>
                                        <!--<p>You'll also be able to sign emails to show reliably that they are from you. Though the need for signing may be less obvious, you'll actually do it more often.</p>-->
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-4a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section4-web-of-trust.png" alt="Section 4: Web of Trust" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 4.a</em> Sign a key</h3>
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5b" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Be wary of invalid keys</h3>
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-keysigning_party" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section6-next-steps.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section6-next-steps.png" alt="Section 6: Next Steps" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Go to a keysigning party</h3>
                                        <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>
                                        <p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
                                        <p>The images on this page are under a <a 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>. &mdash; <a href="http://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> by Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                </div><!-- /#copyright -->
                                <p class="credits">
-                                       Infographic and full guide by <a rel="external" href="http://jplusplus.pt"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
+                                       Infographic and full guide by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
                                </p><!-- /.credits -->
                        </div>
                </footer><!-- End #footer -->
index 6de72a2b6c225487d01895ccae72660a7206fa9d..469480ae0093540295c21f0f62b22042ee8421cf 100644 (file)
@@ -38,7 +38,7 @@
                                        <p>The images on this page are under a <a 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>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
                                </div><!-- /#copyright -->
                                <p class="credits">
-                                       Infographic and full guide by <a rel="external" href="http://jplusplus.pt"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
+                                       Infographic and full guide by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
                                </p><!-- /.credits -->
                        </div>
                </footer><!-- End #footer -->