Updated footer (added jplusplus logo). Added illustrations to sections 3, 5 and 6.

diff --git a/index.html b/index.html
index 2061d68446f1d80ea32fd490ce5e482d37433109..7179f3e39b0bb422061257a4fbf4d98886a62fca 100644 (file)
--- a/index.html
+++ b/index.html
@@ -195,7 +195,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-3a" 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/section3-try-it-out.png" alt="Section 5: Use it Well" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 3.a</em> Send Adele your public key</h3>
@@ -307,7 +307,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>When should I encrypt?</h3>
@@ -319,7 +319,11 @@
                                        </div><!-- End .main -->
                                </div><!-- End #step-5a .step -->
 
+                               <!-- ~~~~~~~~~ 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>
+                                       </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Be wary of invalid keys</h3>
                                                <p>GnuPG makes email safer, but it's still important to watch out for invalid keys, which which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.</p>
@@ -328,6 +332,7 @@
                                        </div><!-- End .main -->
                                </div><!-- End #step-5b .step -->
 
+                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5c" class="step">
                                        <div class="main">
                                                <h3>Copy your revocation certificate to somewhere safe</h3>
@@ -366,6 +371,9 @@
 
                                <!-- ~~~~~~~~~ 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>
+                                       </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Go to a keysigning party</h3>
                                                <p>Keysigning parties are social events designed to build the Web of Trust. Participants match each others' photo IDs and Key IDs, and then get out their laptops and sign each other's public keys. They're a great way to meet likeminded people and learn about new privacy tools, as well as build up people's trust in your key. Look for keysigning at tech events, hackerspaces and nerdy parties.</p>
@@ -444,6 +452,9 @@
                                        <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 -->
+                               <p class="credits">
+                                       Infographic and full guide by <a rel="external" href="http://jplusplus.pt"><img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /> <strong>Journalism++</strong></a>
+                               </p><!-- /.credits -->
                        </div>
                </footer><!-- End #footer -->
 

diff --git a/infographic.html b/infographic.html
index 4bb0264d27a83f59b61341d4bb15d3ab607b80ab..47201d3afe480d73eecd60e7878e0c3d4901e605 100644 (file)
--- a/infographic.html
+++ b/infographic.html
@@ -17,12 +17,12 @@
        </head>
        <body>
 
-               <header class="row"  id="header">
+               <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">
+                                               <div class="infographics">
                                                        <p>Read the <a href="index.html">full guide.</a></p>
                                                </div>
                                
@@ -37,6 +37,9 @@
                                        <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 -->
+                               <p class="credits">
+                                       Infographic and full guide by <a rel="external" href="http://jplusplus.pt"><img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /> <strong>Journalism++</strong></a>
+                               </p><!-- /.credits -->
                        </div>
                </footer><!-- End #footer -->
 

diff --git a/static b/static
index a1aef0bb942f847084f6a0b1a45726896a66d5c5..ee7b6d56d9a0d46c49f642885c2b92eae0f872b9 160000 (submodule)
--- a/static
+++ b/static
@@ -1 +1 @@
-Subproject commit a1aef0bb942f847084f6a0b1a45726896a66d5c5
+Subproject commit ee7b6d56d9a0d46c49f642885c2b92eae0f872b9