Blocking out most of the major changes to the guide, especially adding new images.
authorZak Rogoff <zak@fsf.org>
Thu, 19 Nov 2015 19:11:40 +0000 (14:11 -0500)
committerZak Rogoff <zak@fsf.org>
Thu, 19 Nov 2015 19:11:40 +0000 (14:11 -0500)
README.md
givingguide-dev.html
stylesheet.css

index 356d715..592a7bc 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-# FSF Holiday Giving Guide
+# FSF Holiday Giving Guide README
+
+## Adding images
+Make sure that, for side-by-side comparisons, both images are a similar height
 
-Give freely this holiday season!
 
 ## Hacking
 
index 64fd8be..667234b 100755 (executable)
 
 <head>
 
-  <title> 2014 Holiday Giving Guide | Free Software Foundation | Working together for free software </title>
+    <title> Holiday Giving Guide | Free Software Foundation | Working together for free software </title>
 
-  <meta charset="UTF-8">
+    <meta charset="UTF-8">
 
-  <!--FIXME: Is this necessary?-->
-  <link rel="copyright" title="Copyright information" href="http://creativecommons.org/licenses/by-nd/3.0/rdf">
-  <link rel="author" title="Author information" href="http://www.fsf.org/about/staff">
+    <!--FIXME: Is this necessary?-->
+    <link rel="copyright" title="Copyright information" href="http://creativecommons.org/licenses/by-nd/3.0/rdf">
+    <link rel="author" title="Author information" href="http://www.fsf.org/about/staff">
 
-  <!--Stylesheets-->
-  <link rel="stylesheet" type="text/css" href="reset.css">
-  <link rel="stylesheet" type="text/css" href="stylesheet.css">
+    <!--Stylesheets-->
+    <link rel="stylesheet" type="text/css" href="reset.css">
+    <link rel="stylesheet" type="text/css" href="stylesheet.css">
 
 </head>
 
 <body>
-  <div class="header">
-    <div class="header_wrapper">
-
-      <div class="navbar_wrapper">
-        <span class="logo_wrapper">
-          <a href="https://www.fsf.org/"><img class="logo" src="//static.fsf.org/nosvn/images/givingguide/images/logo.png" alt="logo" /></a>
-        </span>
-
-        <div class="navbar">
-          <ul>
-            <li><a href="https://www.fsf.org/about/">About the FSF</a>
-            </li>
-            <li><a href="https://www.fsf.org/campaigns/">Campaigns</a>
-            </li>
-            <li><a href="https://www.fsf.org/donate/">Donate</a>
-            </li>
-            <li><a href="http://shop.fsf.org/">Shop</a>
-            </li>
-          </ul>
-        </div>
-        <!--end navbar-->
-
-        <span class="join_wrapper">
-          <a href="http://fsf.org/jfb"><img class="join" src="//static.fsf.org/nosvn/images/givingguide/images/join.png" alt="join" /></a>
-        </span>
-      </div>
-
-      <div class="intro">
-
-        <div class="intro_img">
-          <img src="//static.fsf.org/nosvn/images/givingguide/images/banner.png" alt="Giving Guide" />
-        </div>
-
-        <div class="intro_wrapper">
-          <h2>Are you giving your loved ones holiday gifts they can use freely, or gifts which put someone else in control?</h2>
-          <p>Electronics are popular gifts for the holidays, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more
-            than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive
-            counterparts.
-          </p>
-          <p>Like this guide? Download the <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">printable version</a> (translations welcome!) and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
-            Guide Giveaway</a> to share it with your community. And remember: donating to a <a href="#charities">charity</a> in someone's name is at least as meaningful as buying them an electronic device.</p>
-          </div>
-        </div>
-        <!--end intro -->
-      </div>
-    </div>
-    <!--end header-->
-
-    <!-- Sharing -->
-    <div class="share">
-      <span class="share_wrapper">
-        <a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/2014/&t=Check%20out%20the%20Free%20Software%20Foundation%20Holiday%20Giving%20Guide">Share (#givefreely)</a>
-      </span>
-    </div>
-    <!-- end sharing-->
-
-    <!--We compare different products from here-->
-
-    <div class="comparisons">
-
-
-
-
-      <div class="section_wrapper">
-        <h3 class="main_title">3D Printers</h3>
-
-        <div class="free">
-          <div class="product">
-            <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-            <img class="product_img" src="//static.fsf.org/nosvn/images/taz4.png" alt="TAZ 4.0" />
-          </div>
-
-          <h4 class="title">Lulzbot TAZ 4.0</h4>
-          <ul>
-
-
-            <li>
-              <a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.
-            </li>
-
-            <li>
-              Supports tetherless printing, optional Dual Extruder upgrade, and exotic filaments including wood-, rubber- and stone-like materials.
-            </li>
-            <li>Hardware designs available to make modification and improvement easy.</li>
-            <!--<li>
-              <span style="font-weight:bold">SAVE!</span> When you buy a TAZ, contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive an extra roll of filament and gratis shipping to the US, Canada or the EU (expires at the end of 2014).
-            </li>-->
-          </ul>
-
-        </div>
-
-        <div class="proprietary">
-          <div class="product">
-            <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-            <img class="product_img" src="//static.fsf.org/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2" />
-          </div>
-
-          <h4 class="title">Makerbot Replicator 2</h4>
-          <ul>
-            <li>
-              MakerWare software is proprietary, restricting freedom and stifling innovation.
-            </li>
-
-            <li>
-              Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
-            </li>
-          </ul>
-
-        </div>
-
-        <!-- 'buy/download' and 'avoid' buttons -->
-        <div class="buy_avoid">
-          <div class="buy_avoid_wrapper">
-            <div class="buy">
-              <a href="https://www.lulzbot.com/products/lulzbot-taz-4-3d-printer/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-              </a>
-            </div>
+    <div class="header">
+        <div class="header_wrapper">
+
+            <div class="navbar_wrapper">
+                <span class="logo_wrapper">
+                    <a href="https://www.fsf.org/"><img class="logo" src="//static.fsf.org/nosvn/images/givingguide/images/logo.png" alt="logo" /></a>
+                </span>
+
+                <div class="navbar">
+                    <ul>
+                        <li><a href="https://www.fsf.org/about/">About the FSF</a>
+                        </li>
+                        <li><a href="https://www.fsf.org/campaigns/">Campaigns</a>
+                        </li>
+                        <li><a href="https://www.fsf.org/donate/">Donate</a>
+                        </li>
+                        <li><a href="http://shop.fsf.org/">Shop</a>
+                        </li>
+                    </ul>
+                </div>
+                <!--end navbar-->
 
-            <div class="avoid">
-              <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                <span class="join_wrapper">
+                    <a href="http://fsf.org/jfb"><img class="join" src="//static.fsf.org/nosvn/images/givingguide/images/join.png" alt="join" /></a>
+                </span>
             </div>
-          </div>
-        </div>
-        <!-- end buy-avoid -->
 
-      </div>
+            <div class="intro">
 
+                <div class="intro_img">
+                    <img src="//static.fsf.org/nosvn/images/givingguide/images/banner.png" alt="Giving Guide" />
+                </div>
 
-
-
-      <div class="section_wrapper">
-        <h3 class="main_title">Ebooks</h3>
-
-        <div class="free">
-          <div class="product">
-            <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-            <img class="product_img" src="//static.fsf.org/fsforg/img/ProjectGutenbergPrepped.png" alt="Project Gutenberg" />
-          </div>
-
-          <h4 class="title">Project Gutenberg</h4>
-
-          <ul>
-            <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
-            <li>The original purveyor of eBooks free of <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> (Digital Restrictions Management), <a href="https://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
-            <li>Enjoy the freedom to read your ebooks on any device.</li>
-          </ul>
-
-        </div>
-
-        <div class="proprietary">
-          <div class="product">
-            <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-            <img class="product_img" src="//static.fsf.org/fsforg/img/amazon.jpg" alt="Amazon" />
-          </div>
-
-          <h4 class="title">Amazon</h4>
-          <ul>
-            <li>
-              Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done
-                it before</a>).
-              </li>
-
-              <li>
-                Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
-                to prevent you from sharing your favorite books with friends or moving them between readers.
-              </li>
-
-              <li>
-                Amazon openly claims
-                <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
-                  you don't actually own or control your
-                  ebooks.
-                </a>
-              </li>
-            </ul>
-
-          </div>
-
-          <!-- 'buy/download' and 'avoid' buttons -->
-          <div class="buy_avoid">
-            <div class="buy_avoid_wrapper">
-              <div class="buy">
-                <a href="https://www.gutenberg.org/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-                </a>
-              </div>
-
-              <div class="avoid">
-                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-              </div>
+                <div class="intro_wrapper">
+                    <h2>Are you giving your loved ones holiday gifts they can use freely, or gifts which put someone else in control?</h2>
+                    <p>Electronics are popular gifts for the holidays, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more
+                        than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive
+                        counterparts.
+                    </p>
+                    <p>Like this guide? Download the <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">printable version</a> (translations welcome!) and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
+                        Guide Giveaway</a> to share it with your community. And remember: donating to a <a href="#charities">charity</a> in someone's name is at least as meaningful as buying them an electronic device.</p>
+                    </div>
+                </div>
+                <!--end intro -->
             </div>
-          </div>
-          <!-- end buy-avoid -->
-
         </div>
+        <!--end header-->
 
-        <div class="comparisons">
-          <div class="section_wrapper">
-            <h3 class="main_title">Laptops</h3>
-
-            <div class="free">
-              <div class="product">
-                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/givingguidethinkpenguin.png" alt="ThinkPenguin GNU/Linux Notebook" />
-              </div>
-
-              <h4 class="title">ThinkPenguin GNU/Linux Notebook</h4>
-
-              <ul>
-
-                <li>
-                  Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="https://www.gnu.org/distros/free-distros.html">fully free GNU/Linux distribution</a>.
-                </li>
-
-                <li> While its proprietary boot firmware means it's <a href="https://www.fsf.org/campaigns/free-bios.html">not fully free</a>, this laptop is one of the most freedom-supporting available. Browse more companies that sell <a href="https://www.gnu.org/links/companies">free software-compatible computers</a>.</li>
-                <!--<li><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</li>-->
-              </ul>
-
-            </div>
-
-            <div class="proprietary">
-              <div class="product">
-                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
-
-              </div>
-
-              <h4 class="title">Apple Macbook Pro</h4>
-              <ul>
-                <li>
-                  Runs on proprietary software that restricts the user's freedoms.
-                </li>
-
-                <li>
-                  Apple's App Store uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to restrict what you can do with your purchases.
-                </li>
-                <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
-                <li>
-                  Planned obsolescence: business model forces you to buy new devices frequently.
-                </li>
-              </ul>
-            </div>
-          </div>
-
-          <!-- 'buy/download' and 'avoid' buttons -->
-          <div class="buy_avoid">
-            <div class="buy_avoid_wrapper">
-              <div class="buy">
-                <a href="https://www.thinkpenguin.com/catalog/notebook-computers-gnu-linux-2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                </a>
-              </div>
-
-              <div class="avoid">
-                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-              </div>
-            </div>
-          </div>
-          <!-- end buy-avoid -->
-
+        <!-- Sharing -->
+        <div class="share">
+            <span class="share_wrapper">
+                <a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/2014/&t=Check%20out%20the%20Free%20Software%20Foundation%20Holiday%20Giving%20Guide">Share (#givefreely)</a>
+            </span>
         </div>
+        <!-- end sharing-->
 
-
-
-
+        <!--We compare different products from here-->
 
         <div class="comparisons">
-          <div class="section_wrapper">
-            <h3 class="main_title">Graphic Design</h3>
-
-            <div class="free">
-              <div class="product">
-                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                <img class="product_img" src="//static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inkscape" />
-              </div>
-
-              <h4 class="title">GIMP and Inkscape</h4>
-
-              <ul>
-                <li>Free software, with thriving developer communities.</li>
-                <li>Designed for free formats, but can also open files created in other programs.</li>
-                <li>Wide variety of plugins grants limitless features.</li>
-                <li>Easy to install on all major operating systems.</li>
-              </ul>
-
-            </div>
-
-            <div class="proprietary">
-              <div class="product">
-                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                <img class="product_img" src="//static.fsf.org/nosvn/images/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
-              </div>
-
-              <h4 class="title">Photoshop and Illustrator</h4>
-              <ul>
-                <li>Proprietary software controlled by Adobe.</li>
-                <li>Prefers locked-down proprietary formats.</li>
-                <li>Requires costly upgrades to stay up to date.</li>
-              </ul>
-
-            </div>
-          </div>
-
-          <!-- 'buy/download' and 'avoid' buttons -->
-          <div class="buy_avoid">
-            <div class="buy_avoid_wrapper">
-              <div class="buy">
-                <a href="https://www.inkscape.org/en/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-                </a>
-              </div>
-
-              <div class="avoid">
-                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-              </div>
-            </div>
-          </div>
-          <!-- end buy-avoid -->
-
-        </div>
-        <div class="section_wrapper">
-          <h3 class="main_title">Operating Systems</h3>
-
-          <div class="free">
-            <div class="product">
-              <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-              <img class="product_img" src="//www.gnu.org/graphics/trisquel/trisquel.svg" alt="Trisquel GNU/Linux" />
-            </div>
-
-            <h4 class="title">Trisquel GNU/Linux</h4>
-            <ul>
-              <li>
-                <a href="http://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> completely free operating system: transparent and modifiable.
-              </li>
-
-              <li>
-                Break the cycle of forced upgrades and planned obsolescence.
-              </li>
-
-              <li>
-                Comes with all the software you need and an easy software manager to find more.
-              </li>
-              <li>Works great with the Wi-Fi adapters in this guide.</li>
-            </ul>
-
-
-
-          </div>
-
-          <div class="proprietary">
-            <div class="product">
-              <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-              <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/windows.png" alt="Windows" />
-            </div>
-
-            <h4 class="title">Windows</h4>
-            <ul>
-              <li>
-                Proprietary software that profits from controlling how you use your computer.
-              </li>
-
-              <li>
-                Invades privacy and exposes personal data to <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInWindows">Microsoft</a>, the NSA, and other malicious attackers.
-              </li>
-
-              <li>
-                Dependent on mandatory upgrades and devices that don't support older versions of Windows.
-              </li>
-            </ul>
 
+            <div class="section_wrapper">
+                <h3 class="main_title">3D Printers</h3>
 
-          </div>
+                <div class="free">
+                    <div class="product">
+                        <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/taz4.png" alt="TAZ 4.0" />
+                    </div>
 
-          <!-- 'buy/download' and 'avoid' buttons -->
-          <div class="buy_avoid">
-            <div class="buy_avoid_wrapper">
-              <div class="buy">
-                <a href="http://trisquel.info/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-                </a>
-              </div>
+                    <h4 class="title">Lulzbot TAZ 4.0</h4>
+                    <ul>
 
-              <div class="avoid">
-                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-              </div>
-            </div>
-          </div>
-          <!-- end buy-avoid -->
 
-        </div>
-        <div class="comparisons">
-          <div class="section_wrapper">
-            <h3 class="main_title">Gift Cards</h3>
+                        <li>
+                            <a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.
+                        </li>
 
-            <div class="free">
-              <div class="product">
-                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                <img class="product_img" src="//static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="FSF Membership Card" />
-              </div>
-
-              <h4 class="title">FSF Membership Card</h4>
-              <ul>
-                <li>Join over 3,000 active members working to make a better world built on free software.</li>
-                <li>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="http://libreplanet.org/wiki/LibrePlanet:Conference">yearly LibrePlanet conference</a>.</li>
-                <li>Membership donations are tax-deductible in the US. For a smaller gift, <a href="https://www.fsf.org/donate">donate in a friend's name</a>.</li>
-              </ul>
+                        <li>
+                            Supports tetherless printing, optional Dual Extruder upgrade, and exotic filaments including wood-, rubber- and stone-like materials.
+                        </li>
+                        <li>Hardware designs available to make modification and improvement easy.</li>
+                        <!--<li>
+                        <span style="font-weight:bold">SAVE!</span> When you buy a TAZ, contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive an extra roll of filament and gratis shipping to the US, Canada or the EU (expires at the end of 2014).
+                    </li>-->
+                </ul>
 
             </div>
 
             <div class="proprietary">
-              <div class="product">
-                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                <img class="product_img" src="//static.fsf.org/fsforg/img/iTunesCardPrepped.png" alt="iTunes Card" />
-              </div>
-
-              <h4 class="title">iTunes Card</h4>
-              <ul>
-                <li> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
-                  on everything (except music) controls what you can do with your purchases.
-                </li>
-
-                <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
-
-                <li> Requires proprietary software to use, even to download DRM-free music.</li>
-              </ul>
-
-            </div>
-          </div>
-
-          <!-- 'buy/download' and 'avoid' buttons -->
-          <div class="buy_avoid">
-            <div class="buy_avoid_wrapper">
-              <div class="buy">
-                <a href="https://my.fsf.org/associate/support_freedom/join_fsf?"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                </a>
-              </div>
-
-              <div class="avoid">
-                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-              </div>
-            </div>
-          </div>
-          <!-- end buy-avoid -->
-
-        </div>
-
-        <div class="section_wrapper">
-          <h3 class="main_title">Mobile OS</h3>
-
-          <div class="free">
-            <div class="product">
-              <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-              <img class="product_img" src="//static.fsf.org/nosvn/images/Replicant_logo.png" alt="Replicant" />
-            </div>
-
-            <h4 class="title">Replicant</h4>
-            <ul>
-              <li>
-                Fully free software, based on Android.
-              </li>
-
-              <li>
-                <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantStatus#Replicant-42">
-                  Supported devices
-                </a> include both phones and tablets.
-              </li>
-
-              <li>
-                Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially
-                available Android devices ship with some proprietary software.)
-              </li>
-            </ul>
+                <div class="product">
+                    <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                    <img class="product_img" src="//static.fsf.org/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2" />
+                </div>
 
+                <h4 class="title">Makerbot Replicator 2</h4>
+                <ul>
+                    <li>
+                        MakerWare software is proprietary, restricting freedom and stifling innovation.
+                    </li>
 
-          </div>
+                    <li>
+                        Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
+                    </li>
+                </ul>
 
-          <div class="proprietary">
-            <div class="product">
-              <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-              <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/iOS.png" alt="Apple iPhone, iPad and Watch" />
             </div>
 
-            <h4 class="title">Apple iPhone, iPad and Watch</h4>
-            <ul>
-              <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
-              <li>
-                iOS is a fully proprietary operating system, giving Apple control over the software on the devices.
-              </li>
-              <li>
-                Apple uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
-              </li>
-
-            </ul>
-          </div>
-
-          <!-- 'buy/download' and 'avoid' buttons -->
-          <div class="buy_avoid">
-            <div class="buy_avoid_wrapper">
-              <div class="buy">
-                <a href="http://www.replicant.us"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-                </a>
-              </div>
-
-              <div class="avoid">
-                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-              </div>
+            <!-- 'buy/download' and 'avoid' buttons -->
+            <div class="buy_avoid">
+                <div class="buy_avoid_wrapper">
+                    <div class="buy">
+                        <a href="https://www.lulzbot.com/products/lulzbot-taz-4-3d-printer/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                        </a>
+                    </div>
+
+                    <div class="avoid">
+                        <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                    </div>
+                </div>
             </div>
-          </div>
-          <!-- end buy-avoid -->
+            <!-- end buy-avoid -->
 
         </div>
 
-        <div class="comparisons">
-          <div class="section_wrapper">
-            <h3 class="main_title">Online Storage</h3>
+        <div class="section_wrapper">
+            <h3 class="main_title">Routers</h3>
 
             <div class="free">
-              <div class="product">
-                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/leastauthority.png" alt="Least Authority" />
-              </div>
-
-              <h4 class="title">Least Authority File System</h4>
-
-              <ul>
-                <li>
-                  Free software system guarantees that you control who sees your data.
-                </li>
-
-                <li>
-                  Decentralized infrastructure protects from attacks and give you flexibility in how your data is stored.
-                </li>
-
-                <li>
-                  Client side encryption to prevent snooping, unlike Google Drive, Dropbox, Apple iCloud, Microsoft SkyDrive, and Ubuntu One.
-                </li>
-              </ul>
-
-            </div>
+                <div class="product">
+                    <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                    <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/librecmc-router.jpg" alt="TAZ 4.0" />
+                </div>
 
-            <div class="proprietary">
-              <div class="product">
-                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                <img class="product_img" src="//static.fsf.org/nosvn/images/googledrive.png" alt="Google Drive" />
-              </div>
+                <h4 class="title">ThinkPenguin Router</h4>
+                <ul>
+                    <li>
+                        High speed wireless router running <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system.
+                    </li>
 
-              <h4 class="title">Google Drive</h4>
-              <ul>
+                    <li>
+                        Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>.     </li>
+                    </ul>
 
-                <li>
-                  Requires granting Google a virtually unlimited license to any public data, and also having your public and personal data mined for ads.
-                </li>
+                </div>
 
-                <li>
-                  Data may be accessed by <a href="http://arstechnica.com/information-technology/2013/10/how-the-nsas-muscular-tapped-googles-and-yahoos-private-networks/">
-                    intelligence agencies.</a>
-                  </li>
+                <div class="proprietary">
+                    <div class="product">
+                        <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/linksys-WRT1900AC.png" alt="Linksys WRT1900AC Wireless AC Router" />
+                    </div>
 
-                </ul>
+                    <h4 class="title">Linksys WRT1900AC Wireless AC Router</h4>
+                    <ul>
+                        <li>
+                            PLACEHOLDER bullets that are bad.
+                        </li>
 
-              </div>
-            </div>
+                        <li>
+                            Angry, angry placeholder bullets.                        </li>
+                    </ul>
 
-            <!-- 'buy/download' and 'avoid' buttons -->
-            <div class="buy_avoid">
-              <div class="buy_avoid_wrapper">
-                <div class="buy">
-                  <a href="https://leastauthority.com/"><img src="//static.fsf.org/nosvn/images/givingguide/images/try.png" alt="Try" />
-                  </a>
                 </div>
 
-                <div class="avoid">
-                  <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                <!-- 'buy/download' and 'avoid' buttons -->
+                <div class="buy_avoid">
+                    <div class="buy_avoid_wrapper">
+                        <div class="buy">
+                            <a href="https://www.lulzbot.com/products/lulzbot-taz-4-3d-printer/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
+                        </div>
+
+                        <div class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                        </div>
+                    </div>
                 </div>
-              </div>
-            </div>
-            <!-- end buy-avoid -->
+                <!-- end buy-avoid -->
 
-          </div>
+            </div>
 
-          <div class="comparisons">
             <div class="section_wrapper">
-              <h3 class="main_title">Media Hosting</h3>
-
-              <div class="free">
-                <div class="product">
-                  <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                  <img class="product_img" src="//static.fsf.org/nosvn/images/mediagoblin.png" alt="GNU MediaGoblin" />
-                </div>
-
-                <h4 class="title">GNU MediaGoblin</h4>
-
-                <ul>
-                  <li>
-                    Soon-to-be federated to allow decentralized sharing.
-                  </li>
+                <h3 class="main_title">Ebooks</h3>
 
-                  <li>Supports free video formats and grants the ability to choose a <a href="https://www.gnu.org/copyleft/">copyleft license</a>.</li>
+                <div class="free">
+                    <div class="product">
+                        <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                        <img class="product_img" src="//static.fsf.org/fsforg/img/ProjectGutenbergPrepped.png" alt="Project Gutenberg" />
+                    </div>
 
-                  <li>Source files can be attached to an upload, making it easy to remix people's work.</li>
+                    <h4 class="title">Project Gutenberg</h4>
 
+                    <ul>
+                        <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
+                        <li>The original purveyor of eBooks free of <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> (Digital Restrictions Management), <a href="https://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
+                        <li>Enjoy the freedom to read your ebooks on any device.</li>
+                    </ul>
 
-                </ul>
-
-              </div>
-
-              <div class="proprietary">
-                <div class="product">
-                  <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                  <img class="product_img" src="//static.fsf.org/nosvn/images/YouTube.png" alt="YouTube" />
                 </div>
 
-                <h4 class="title">YouTube</h4>
-                <ul>
-                  <li>
-                    Uses proprietary Adobe Flash player and patent-encumbered H.264 codec by default.
-                  </li>
-                  <li>
-                    Even the optional HTML5 player requires proprietary JavaScript.
-                  </li>
-                  <li>
-                    Implements <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to control access to videos by device and region.
-                  </li>
-
-                  <li>
-                    Imposes advertising on your uploads and polices copyright harshly.
-                  </li>
-                </ul>
+                <div class="proprietary">
+                    <div class="product">
+                        <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                        <img class="product_img" src="//static.fsf.org/fsforg/img/amazon.jpg" alt="Amazon" />
+                    </div>
+
+                    <h4 class="title">Amazon</h4>
+                    <ul>
+                        <li>
+                            Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done
+                                it before</a>).
+                            </li>
+
+                            <li>
+                                Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
+                                to prevent you from sharing your favorite books with friends or moving them between readers.
+                            </li>
+
+                            <li>
+                                Amazon openly claims
+                                <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
+                                    you don't actually own or control your
+                                    ebooks.
+                                </a>
+                            </li>
+                        </ul>
+
+                    </div>
+
+                    <!-- 'buy/download' and 'avoid' buttons -->
+                    <div class="buy_avoid">
+                        <div class="buy_avoid_wrapper">
+                            <div class="buy">
+                                <a href="https://www.gutenberg.org/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
+                                </a>
+                            </div>
+
+                            <div class="avoid">
+                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- end buy-avoid -->
 
-              </div>
-            </div>
-          </div>
-
-          <!-- 'buy/download' and 'avoid' buttons -->
-          <div class="buy_avoid">
-            <div class="buy_avoid_wrapper">
-              <div class="buy">
-                <a href="http://mediagoblin.org/"><img src="//static.fsf.org/nosvn/images/givingguide/images/try.png" alt="Try it" />
-                </a>
-              </div>
-
-              <div class="avoid">
-                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-              </div>
-            </div>
-          </div>
-          <!-- end buy-avoid -->
+                </div>
 
-        </div>
+                <div class="comparisons">
+                    <div class="section_wrapper">
+                        <h3 class="main_title">Larger Laptops</h3>
+
+                        <div class="free">
+                            <div class="product">
+                                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/minifree-t400.png" alt="Minifree T400 Notebook with Libreboot" />
+                            </div>
+
+                            <h4 class="title">Minifree GNU/Linux laptop with free boot firmware</h4>
+
+                            <ul>
+
+                                <li>
+                                    Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="https://www.gnu.org/distros/free-distros.html">fully free GNU/Linux distribution</a>.
+                                </li>
+
+                                <li>PLACEHOLDER RYF certification/libreboot bullet. Maybe first commercially available...?</li>
+                                <!--<li><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</li>-->
+                            </ul>
+
+                        </div>
+
+                        <div class="proprietary">
+                            <div class="product">
+                                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
+
+                            </div>
+
+                            <h4 class="title">Apple Macbook Pro</h4>
+                            <ul>
+                                <li>
+                                    Runs on proprietary software that restricts the user's freedoms.
+                                </li>
+
+                                <li>
+                                    Apple's App Store uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to restrict what you can do with your purchases.
+                                </li>
+                                <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
+                                <li>
+                                    Planned obsolescence: business model forces you to buy new devices frequently.
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+
+                    <!-- 'buy/download' and 'avoid' buttons -->
+                    <div class="buy_avoid">
+                        <div class="buy_avoid_wrapper">
+                            <div class="buy">
+                                <a href="https://www.thinkpenguin.com/catalog/notebook-computers-gnu-linux-2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                                </a>
+                            </div>
+
+                            <div class="avoid">
+                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- end buy-avoid -->
 
-        <!-- Recommended Section -->
+                </div>
 
-        <div class="recommended">
-          <h1 class="topic_title">More Recommended Products</h1>
+                <div class="comparisons">
+                    <div class="section_wrapper">
+                        <h3 class="main_title">Smaller Laptops</h3>
+
+                        <div class="free">
+                            <div class="product">
+                                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/libiquity-x200.png" alt="Libiquity X200 Notebook with Libreboot" />
+                            </div>
+
+                            <h4 class="title">Libiquity GNU/Linux laptop with free boot firmware</h4>
+
+                            <ul>
+
+                                <li>
+                                    Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="https://www.gnu.org/distros/free-distros.html">fully free GNU/Linux distribution</a>.
+                                </li>
+
+                                <li>PLACEHOLDER RYF certification/libreboot bullet. Maybe first commercially available...?</li>
+                                <!--<li><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</li>-->
+                            </ul>
+
+                        </div>
+
+                        <div class="proprietary">
+                            <div class="product">
+                                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
+
+                            </div>
+
+                            <h4 class="title">Apple Macbook Pro</h4>
+                            <ul>
+                                <li>
+                                    Runs on proprietary software that restricts the user's freedoms.
+                                </li>
+
+                                <li>
+                                    Apple's App Store uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to restrict what you can do with your purchases.
+                                </li>
+                                <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
+                                <li>
+                                    Planned obsolescence: business model forces you to buy new devices frequently.
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+
+                    <!-- 'buy/download' and 'avoid' buttons -->
+                    <div class="buy_avoid">
+                        <div class="buy_avoid_wrapper">
+                            <div class="buy">
+                                <a href="https://www.thinkpenguin.com/catalog/notebook-computers-gnu-linux-2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                                </a>
+                            </div>
+
+                            <div class="avoid">
+                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- end buy-avoid -->
 
-          <div class="recommend_wrapper">
+                </div>
 
-            <div class="recommended_product">
-              <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
-              <h4 class="title">Tehnoetic dongle Wi-Fi adapter</h4>
-              <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>. Discount code: FSFGIVING.</p>
-              <div class="buy">
-                <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                </a>
-              </div>
-            </div>
+                <div class="comparisons">
+                    <div class="section_wrapper">
+                        <h3 class="main_title">Graphic Design</h3>
+
+                        <div class="free">
+                            <div class="product">
+                                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                                <img class="product_img" src="//static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inkscape" />
+                            </div>
+
+                            <h4 class="title">GIMP and Inkscape</h4>
+
+                            <ul>
+                                <li>Free software, with thriving developer communities.</li>
+                                <li>Designed for free formats, but can also open files created in other programs.</li>
+                                <li>Wide variety of plugins grants limitless features.</li>
+                                <li>Easy to install on all major operating systems.</li>
+                            </ul>
+
+                        </div>
+
+                        <div class="proprietary">
+                            <div class="product">
+                                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                                <img class="product_img" src="//static.fsf.org/nosvn/images/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
+                            </div>
+
+                            <h4 class="title">Photoshop and Illustrator</h4>
+                            <ul>
+                                <li>Proprietary software controlled by Adobe.</li>
+                                <li>Prefers locked-down proprietary formats.</li>
+                                <li>Requires costly upgrades to stay up to date.</li>
+                            </ul>
+
+                        </div>
+                    </div>
+
+                    <!-- 'buy/download' and 'avoid' buttons -->
+                    <div class="buy_avoid">
+                        <div class="buy_avoid_wrapper">
+                            <div class="buy">
+                                <a href="https://www.inkscape.org/en/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
+                                </a>
+                            </div>
+
+                            <div class="avoid">
+                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- end buy-avoid -->
 
-            <div class="recommended_product">
-              <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/thinkpenguin_router.jpg" alt="ThinkPenguin Wi-Fi N router" />
-              <h4 class="title">ThinkPenguin Wi-Fi N router</h4>
-              <p>High speed wireless router running <a href="https://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> LibreCMC operating system. Certified to <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>. Discount code: FSFGIVING.</p>
+                </div>
+                <div class="section_wrapper">
+                    <h3 class="main_title">Operating Systems</h3>
+
+                    <div class="free">
+                        <div class="product">
+                            <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                            <img class="product_img" src="//www.gnu.org/graphics/trisquel/trisquel.svg" alt="Trisquel GNU/Linux" />
+                        </div>
+
+                        <h4 class="title">Trisquel GNU/Linux</h4>
+                        <ul>
+                            <li>
+                                <a href="http://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> completely free operating system: transparent and modifiable.
+                            </li>
+
+                            <li>
+                                Break the cycle of forced upgrades and planned obsolescence.
+                            </li>
+
+                            <li>
+                                Comes with all the software you need and an easy software manager to find more.
+                            </li>
+                            <li>Works great with the Wi-Fi adapters in this guide.</li>
+                        </ul>
+
+
+
+                    </div>
+
+                    <div class="proprietary">
+                        <div class="product">
+                            <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                            <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/windows.png" alt="Windows" />
+                        </div>
+
+                        <h4 class="title">Windows</h4>
+                        <ul>
+                            <li>
+                                Proprietary software that profits from controlling how you use your computer.
+                            </li>
+
+                            <li>
+                                Invades privacy and exposes personal data to <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInWindows">Microsoft</a>, the NSA, and other malicious attackers.
+                            </li>
+
+                            <li>
+                                Dependent on mandatory upgrades and devices that don't support older versions of Windows.
+                            </li>
+                        </ul>
+
+
+                    </div>
+
+                    <!-- 'buy/download' and 'avoid' buttons -->
+                    <div class="buy_avoid">
+                        <div class="buy_avoid_wrapper">
+                            <div class="buy">
+                                <a href="http://trisquel.info/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
+                                </a>
+                            </div>
+
+                            <div class="avoid">
+                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- end buy-avoid -->
 
-              <div class="buy">
-                <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-broadband-router-gnu-linux-tpe-nwifirouter2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                </a>
-              </div>
-            </div>
+                </div>
+                <div class="comparisons">
+                    <div class="section_wrapper">
+                        <h3 class="main_title">Gift Cards</h3>
+
+                        <div class="free">
+                            <div class="product">
+                                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                                <img class="product_img" src="//static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="FSF Membership Card" />
+                            </div>
+
+                            <h4 class="title">FSF Membership Card</h4>
+                            <ul>
+                                <li>Join over 3,000 active members working to make a better world built on free software.</li>
+                                <li>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="http://libreplanet.org/wiki/LibrePlanet:Conference">yearly LibrePlanet conference</a>.</li>
+                                <li>Membership donations are tax-deductible in the US. For a smaller gift, <a href="https://www.fsf.org/donate">donate in a friend's name</a>.</li>
+                            </ul>
+
+                        </div>
+
+                        <div class="proprietary">
+                            <div class="product">
+                                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                                <img class="product_img" src="//static.fsf.org/fsforg/img/iTunesCardPrepped.png" alt="iTunes Card" />
+                            </div>
+
+                            <h4 class="title">iTunes Card</h4>
+                            <ul>
+                                <li> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
+                                    on everything (except music) controls what you can do with your purchases.
+                                </li>
+
+                                <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
+
+                                <li> Requires proprietary software to use, even to download DRM-free music.</li>
+                            </ul>
+
+                        </div>
+                    </div>
+
+                    <!-- 'buy/download' and 'avoid' buttons -->
+                    <div class="buy_avoid">
+                        <div class="buy_avoid_wrapper">
+                            <div class="buy">
+                                <a href="https://my.fsf.org/associate/support_freedom/join_fsf?"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                                </a>
+                            </div>
+
+                            <div class="avoid">
+                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- end buy-avoid -->
 
-            <div class="recommended_product">
-              <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
-              <h4 class="title">ThinkPenguin dongle Wi-Fi adapter</h4>
-              <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</p>
-              <div class="buy">
-                <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                </a>
-              </div>
-            </div>
-            <p class="remark"> If you have ideas for more gifts that can be given freely, submit your recommendations to our
-              <a href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
-            </p>
-
-          </div>
-
-          <!--recommended charities-->
-
-          <a name="charities"><h1 class="topic_title">Recommended charities for holiday donations</h1></a>
-          <p><a href="http://www.eff.org">Electronic Frontier Foundation</a>,
-            <a href="http://www.creativecommons.org">Creative Commons</a>,
-            <a href="http://wikimedia.org">Wikimedia Foundation</a>,
-            <a href="http://www.sfconservancy.org">Software Freedom Conservancy</a>,
-            <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a>,
-            <a href="http://www.gnome.org">GNOME Foundation</a> and
-            <a href="http://www.fsf.org">Free Software Foundation</a>.</p>
-
-
-
-          </div>
-          <!-- end recommended-->
-
-          <!-- h-node block. Using licenses class as a quick and dirty way to match its formatting. Others are welcome to improve this. -->
-          <div class="licenses">
-          <h1 class="topic_title">More devices on h-node</h1>
-          <p>To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/">h-node database</a>.</p>
-          </div>
-          <!-- end h-node block -->
-
-          <!-- Licenses Section -->
-
-          <div class="licenses">
-            <h1 class="topic_title">Licenses</h1>
-            <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
-            </p>
-            <p>The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms: </p>
-            <ul style="list-style: none inside none;">
-              <li><a href="https://www.lulzbot.com/news/press-materials">Lulzbot 3D printer photo</a> by Aleph Objects is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-              <li><a href="http://static.fsf.org/nosvn/dontcardomebro.jpg">FSF USB membership card</a> by FSF is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-              <li><a href="http://www.flickr.com/photos/bmiphone/4640570159/">iTunes gift card</a> is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-              <li><a href="https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">ThinkPenguin with GNU</a> is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-              <li><a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">Macbook Pro</a> PSD by andrew-gw is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-              <li><a href="http://www.gutenberg.org">Astounding Stories</a> is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-              <li>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</li>
-              <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are in the public domain but are registered trademarks.</li>
-              <li><a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">Replicant</a> by Paul Kocialkowski is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-              <li>Tehnoetic Wi-Fi dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.</li>
-              <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
-              <li>The Media Goblin graphic is public domain.</li>
-            </ul>
-
-          </div>
-          <!-- end licenses-->
-
-
-
-          <!--footer-->
-          <footer>
-            <div class="footer_wrapper">
-              <div>
-                <p>The FSF is a charity with a worldwide mission to advance software freedom —
-                  <a href="https://fsf.org/about">learn about our history and work.</a>
-                </p>
-              </div>
-
-              <div class="copyright">
-                <p>Copyright © 2004-2014
-                  <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
-                    Free Software Foundation
-                  </a>, Inc.
-                  <a href="https://my.fsf.org/donate/privacypolicy.html"> Privacy Policy</a>.
-                </p>
-              </div>
-            </div>
+                </div>
 
-            <script type="text/javascript" src="js/piwik.js"></script>
-          </footer>
+                <div class="section_wrapper">
+                    <h3 class="main_title">Smartphone</h3>
+
+                    <div class="free">
+                        <div class="product">
+                            <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                            <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/tehnoetic-s2.png" alt="Replicant" />
+                        </div>
+
+                        <h4 class="title">Replicant</h4>
+                        <ul>
+                            <li>
+                                Fully free software, based on Android.
+                            </li>
+
+                            <li>
+                                <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantStatus#Replicant-42">
+                                    Supported devices
+                                </a> include both phones and tablets.
+                            </li>
+
+                            <li>
+                                Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially
+                                available Android devices ship with some proprietary software.)
+                            </li>
+                        </ul>
+
+
+                    </div>
+
+                    <div class="proprietary">
+                        <div class="product">
+                            <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                            <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/iphone.png" alt="Apple iPhone" />
+                        </div>
+
+                        <h4 class="title">Apple iPhone</h4>
+                        <ul>
+                            <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
+                            <li>
+                                iOS is a fully proprietary operating system, giving Apple control over the software on the devices.
+                            </li>
+                            <li>
+                                Apple uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
+                            </li>
+
+                        </ul>
+                    </div>
+
+                    <!-- 'buy/download' and 'avoid' buttons -->
+                    <div class="buy_avoid">
+                        <div class="buy_avoid_wrapper">
+                            <div class="buy">
+                                <a href="http://www.replicant.us"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
+                                </a>
+                            </div>
+
+                            <div class="avoid">
+                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- end buy-avoid -->
 
-        </body>
-        </html>
+                </div>
+                <!-- Recommended Section -->
+
+                <div class="recommended">
+                    <h1 class="topic_title">More Recommended Products</h1>
+
+                    <div class="recommend_wrapper">
+
+                        <div class="recommended_product">
+                            <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
+                            <h4 class="title">Tehnoetic dongle Wi-Fi adapter</h4>
+                            <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>. Discount code: FSFGIVING.</p>
+                            <div class="buy">
+                                <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                                </a>
+                            </div>
+                        </div>
+
+                        <div class="recommended_product">
+                            <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic dongle Wi-Fi adapter" />
+                            <h4 class="title">ThinkPenguin dongle Wi-Fi adapter</h4>
+                            <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</p>
+                            <div class="buy">
+                                <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                                </a>
+                            </div>
+                        </div>
+                        <p class="remark"> If you have ideas for more gifts that can be given freely, submit your recommendations to our
+                            <a href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
+                        </p>
+
+                    </div>
+
+                    <!--recommended charities-->
+
+                    <a name="charities"><h1 class="topic_title">Recommended charities for holiday donations</h1></a>
+                    <p><a href="http://www.eff.org">Electronic Frontier Foundation</a>,
+                        <a href="http://www.creativecommons.org">Creative Commons</a>,
+                        <a href="http://wikimedia.org">Wikimedia Foundation</a>,
+                        <a href="http://www.sfconservancy.org">Software Freedom Conservancy</a>,
+                        <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a>,
+                        <a href="http://www.gnome.org">GNOME Foundation</a> and
+                        <a href="http://www.fsf.org">Free Software Foundation</a>.</p>
+
+
+
+                    </div>
+                    <!-- end recommended-->
+
+                    <!-- h-node block. Using licenses class as a quick and dirty way to match its formatting. Others are welcome to improve this. -->
+                    <div class="licenses">
+                        <h1 class="topic_title">More devices on h-node</h1>
+                        <p>To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/">h-node database</a>.</p>
+                    </div>
+                    <!-- end h-node block -->
+
+                    <!-- Licenses Section -->
+
+                    <div class="licenses">
+                        <h1 class="topic_title">Licenses</h1>
+                        <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
+                        </p>
+                        <p>The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms: </p>
+                        <ul style="list-style: none inside none;">
+                            <li><a href="https://www.lulzbot.com/news/press-materials">Lulzbot 3D printer photo</a> by Aleph Objects is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                            <li><a href="//static.fsf.org/nosvn/dontcardomebro.jpg">FSF USB membership card</a> by FSF is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                            <li><a href="http://www.flickr.com/photos/bmiphone/4640570159/">iTunes gift card</a> is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                            <li><a href="https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">ThinkPenguin with GNU</a> is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                            <li><a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">Macbook Pro</a> PSD by andrew-gw is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                            <li><a href="http://www.gutenberg.org">Astounding Stories</a> is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                            <li>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</li>
+                            <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are in the public domain but are registered trademarks.</li>
+                            <li><a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">Replicant</a> by Paul Kocialkowski is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                            <li>Tehnoetic Wi-Fi dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.</li>
+                            <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
+                            <li>The Media Goblin graphic is public domain.</li>
+                        </ul>
+
+                    </div>
+                    <!-- end licenses-->
+
+
+
+                    <!--footer-->
+                    <footer>
+                        <div class="footer_wrapper">
+                            <div>
+                                <p>The FSF is a charity with a worldwide mission to advance software freedom —
+                                    <a href="https://fsf.org/about">learn about our history and work.</a>
+                                </p>
+                            </div>
+
+                            <div class="copyright">
+                                <p>Copyright © 2004-2014
+                                    <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
+                                        Free Software Foundation
+                                    </a>, Inc.
+                                    <a href="https://my.fsf.org/donate/privacypolicy.html"> Privacy Policy</a>.
+                                </p>
+                            </div>
+                        </div>
+
+                        <script type="text/javascript" src="js/piwik.js"></script>
+                    </footer>
+
+                </body>
+                </html>
index a0418a1..0e6aaad 100755 (executable)
@@ -70,7 +70,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   background-color: #2CAF8F;
   height: 486px;
   margin: auto;
-  width: 100%;  
+  width: 100%;
   /*width: 1300px;*/
 }
 
@@ -375,7 +375,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
 footer {
   display: block;
   background-color: #1a1a1a;
-  width: 100%;  
+  width: 100%;
   /*width: 1300px;*/
 }