Fixed link to infographic. Changed screenshots in step 1b.
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 23:26:35 +0000 (00:26 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 23:26:35 +0000 (00:26 +0100)
index.html
infographic.html [new file with mode: 0644]
static

index 366adb542aa180d6a2996b57cbeb7465201915e5..58722371db1c11fa716cbe2885028eafe80dc523 100644 (file)
                                <!-- ~~~~~~~~~ Guide Introduction ~~~~~~~~~ -->
                                <div class="intro">
                                        <p id="infographic">
-                                               <a class="img-link" href="http://emailselfdefense.fsf.org/infographic"><img src="//static.fsf.org/nosvn/enc-dev0/img/infographic-button.png" alt="Email Self-Defense, Infographic" /></a>
-                                               <a class="text-link" href="http://emailselfdefense.fsf.org/infographic">View &amp; share our infographic &rarr;</a>
+                                               <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>
                                        </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>-->
                                        <p>All you need is a computer with an Internet connection, an email account and about half an hour. You can use your existing email account for this without affecting it.</p>
-
-<p>This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This makes it safer from surveillance than proprietary software (like Windows). Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
+                                       <p>This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This makes it safer from surveillance than proprietary software (like Windows). Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
 
                                </div>
                                
                                <div id="step-1b" class="step">
                                        <div class="sidebar">
                                                <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-01-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
-                                               <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
-
                                                <ul class="images">
                                                        <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-02-search.png" alt="Step 1.B: Search Add-ons" /></li><li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-03-install.png" alt="Step 1.B: Install Add-ons" /></li>
                                                </ul>
 
+                                       </div><!-- /.sidebar -->
+                                       <div class="main">
+                                               <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
+                                               <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
                                                <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                <div class="troubleshooting">
diff --git a/infographic.html b/infographic.html
new file mode 100644 (file)
index 0000000..4bb0264
--- /dev/null
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html>
+       <head>
+                       <meta charset="utf-8">
+                       
+                       <title>Email Self-Defense - a guide to fighting surveillance with GnuPG</title>
+                       <meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+      <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG.">
+
+      <meta name="viewport" content="width=device-width, initial-scale=1">
+                       <link rel="stylesheet" href="http://static.fsf.org/nosvn/enc-dev0/css/main.css">
+               <link rel="shortcut icon" href="http://static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
+
+                       <!-- our local static folder url -->
+                       <link rel="stylesheet" href="static/css/main.css">
+
+       </head>
+       <body>
+
+               <header class="row"  id="header">
+                       <div>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/full-infographic.png" alt="Email Self-Defense, infographic" /></p>
+
+                                               <!-- ~~~~~~~~~ Additional text and links ~~~~~~~~~ -->
+                                               <div class="intro">
+                                                       <p>Read the <a href="index.html">full guide.</a></p>
+                                               </div>
+                               
+                       </div>
+               </header><!-- End #header -->
+
+<!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
+               <footer class="row" id="footer">
+                       <div>
+                               <div id="copyright">
+                                       <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>
+                               </div><!-- /#copyright -->
+                       </div>
+               </footer><!-- End #footer -->
+
+               <script src="http://static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
+               <script src="http://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>
+</html>
diff --git a/static b/static
index e115212ff168b1ef7faef3511055108f7e292952..a1aef0bb942f847084f6a0b1a45726896a66d5c5 160000 (submodule)
--- a/static
+++ b/static
@@ -1 +1 @@
-Subproject commit e115212ff168b1ef7faef3511055108f7e292952
+Subproject commit a1aef0bb942f847084f6a0b1a45726896a66d5c5