Adding more products and Recommended charities section.
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 19 Nov 2014 21:40:45 +0000 (16:40 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 19 Nov 2014 21:40:45 +0000 (16:40 -0500)
givingguide.html

index a8d25e6..7b723a7 100755 (executable)
                                <div class="free">
                                        <div class="product">
                                                <img class="good" src="images/good.png" alt="good"/>
-                                               <img class="product_img" src="images/linux.png" alt="Linux"/>
+                                               <img class="product_img" src="//www.gnu.org/graphics/trisquel/trisquel.svg" alt="Trisquel GNU/Linux"/>
                                        </div>
 
-                                       <h4 class="title">Trisquel</h4>
+                                       <h4 class="title">Trisquel GNU/Linux</h4>
                                        <ul>
                                                <li>
-                         Completely free operating system:
-                         transparent and modifiable
+                         <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
+                         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.
+                         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>
 
                                        <h4 class="title">Lulzbot TAZ 4.0</h4>
                                        <ul>
-                       <li>
-                         <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">
-                           Respects Your Freedom
-                         </a>
-
-                         certified by the Free Software Foundation
+                       <li>            
+                         Contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive gratis shipping and filament with your TAZ.        
                        </li>
 
                        <li>
-                         Powered by free software, making 3D printing
-                         more accessible and encouraging innovation
+                          <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>
-                         Learn more about the Lulzbot at
-                         <a href="http://www.lulzbot.com/">
-                           www.lulzbot.com
-                         </a>
+                          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>
                      </ul>
 
                                </div>
                                        <h4 class="title">Project Gutenberg</h4>
 
                      <ul>
-                       <li>
-                         The original purveyor of DRM-free eBooks
-                       </li>
-
-                       <li>
-                         Enjoy the freedom to read your ebooks on any
-                         device
-                       </li>
-
-                       <li>
-                         All of the ebooks on Project Gutenberg,
-                         including classics like Peter Pan and Huck
-                         Finn, are gratis
-                       </li>
-
-                       <li>
-                         Pick out the perfect books for the whole
-                         family at
-                         <a href="http://www.gutenberg.org/">
-                           www.gutenberg.org
-                         </a>
-                         or from other
-                         <a href="http://www.defectivebydesign.org/guide/ebooks">
-                           DRM-free ebooks sites
-                         </a>
-                       </li>
+                       <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
+<li>The original purveyor of DRM-free eBooks, <a href="htts://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
+<li>Enjoy the freedom to read your ebooks on any device.</li>
                      </ul>
 
                                </div>
                        </li>
 
                        <li>
-                         The company claims to take away your freedom
-                         <a href="http://www.defectivebydesign.org/blog/1256">
-                           for your own good
-                         </a>.
+                         The company claims to take away your freedom <a href="https://www.defectivebydesign.org/blog/1256">for your own good</a>.
                        </li>
                      </ul>
                                </div>
                                        </div>
                                </div>
                        </div>
-       </div>
+<div class="comparisons">
+                                               <div class="section_wrapper">
+                                                       <h3 class="main_title">Laptops</h3>
 
-                       <!-- Recommended Section -->
+                                                       <div class="free">
+                                                               <div class="product">
+                                                                       <img class="good" src="images/good.png" alt="good"/>
+                                                                       <img class="product_img" src="//static.fsf.org/fsforg/img/givingguidethinkpenguin.png" alt="ThinkPenguin GNU/Linux Notebook"/>
+                                                               </div>
 
-                       <div class="recommended">
-                               <h1 class="topic_title">Recomended Products</h1>
+                                                               <h4 class="title">ThinkPenguin GNU/Linux Notebook</h4>
 
-                               <div class="recommend_wrapper">
-                                       <div class="recommended_product">
-                                               <img class="recommended_product_img" src="images/Linux.png" alt="Linux"/>
-                                               <h4 class="title">Fedora</h4>
-                                               <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
-                                               <div class="buy">
-                                                       <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" /></a>
+                      <ul>
+                      <li>Save $5 on 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>
+                        <li>
+                          Comes with free OS and free software-compatible Wi-Fi and 3D-accelerated graphics chipsets work with any <a href="http://www.gnu.org/distros/">fully free GNU/Linux distribution</a> you choose. While its proprietary firmware means it's <a href="<a href="https://www.fsf.org/campaigns/free-bios.html">not fully free</a>, this laptop is one of the most freedom-supporting available.
+                        </li>
+
+                        <li>Browse more companies that sell <a href="www.gnu.org/links/companies">free software-compatible computers</a>.</li>
+                      </ul>
+
+                                                               <div class="buy">
+
+                                                                       <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" /></a>
+
+                                                               </div>
+
+                                                       </div>
+
+                                                       <div class="proprietary">
+                                                               <div class="product">
+                                                                       <img class="bad" src="images/bad.png" alt="bad"/>
+                                                                       <img class="product_img" src="http://upload.wikimedia.org/wikipedia/commons/0/07/Macbook_Pro_PSD.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 DRM (Digital
+                          Restrictions Management) to restrict what
+                          you can do with your purchases
+                        </li>
+
+                        <li>
+                          Planned obsolescence: business model forces
+                          you to buy new devices frequently
+                        </li>
+                      </ul>
+
+                                                               <div class="avoid">
+
+                                                                       <img src="images/avoid.png" alt="avoid" />
+
+                                                               </div>
+                                                       </div>
+                                               </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="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 class="buy">
+
+                                                               <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" /></a>
+
+                                                       </div>
+
+                                               </div>
+
+                                               <div class="proprietary">
+                                                       <div class="product">
+                                                               <img class="bad" src="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 class="avoid">
+
+                                                               <img src="images/avoid.png" alt="avoid" />
+
+                                                       </div>
                                                </div>
                                        </div>
+                       </div>
+
+                               <div class="comparisons">
+                                       <div class="section_wrapper">
+                                               <h3 class="main_title">Gift Card</h3>
+
+                                               <div class="free">
+                                                       <div class="product">
+                                                               <img class="good" src="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 class="buy">
+
+                                                               <a href="https://www.fsf.org/associate"><img src="images/buy.png" alt="Buy" /></a>
+
+                                                       </div>
 
-                                       <div class="recommended_product">
-                                               <img class="recommended_product_img" src="images/Linux.png" alt="Linux"/>
-                                               <h4 class="title">Fedora</h4>
-                                               <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
-                                               <div class="buy">
-                                                       <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" /></a>
+                                               </div>
+
+                                               <div class="proprietary">
+                                                       <div class="product">
+                                                               <img class="bad" src="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="https://www.defectivebydesign.org">DRM (Digital Restrictions Management)</a on everything except music to control 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 class="avoid">
+
+                                                               <img src="images/avoid.png" alt="avoid" />
+
+                                                       </div>
                                                </div>
                                        </div>
+                       </div>
+                       
+                       <div class="comparisons">
+                                       <div class="section_wrapper">
+                                               <h3 class="main_title">Online Storage</h3>
+
+                                               <div class="free">
+                                                       <div class="product">
+                                                               <img class="good" src="images/good.png" alt="good"/>
+                                                               <img class="product_img" src="//static.fsf.org/nosvn/images/leastauthority.png" alt="Least Authority"/>
+                                                       </div>
+
+                                                       <h4 class="title">FSF Membership Card</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 class="buy">
+
+                                                               <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" /></a>
+
+                                                       </div>
 
-                                       <div class="recommended_product">
-                                               <img class="recommended_product_img" src="images/Linux.png" alt="Linux"/>
-                                               <h4 class="title">Fedora</h4>
-                                               <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
-                                               <div class="buy">
-                                                       <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" /></a>
+                                               </div>
+
+                                               <div class="proprietary">
+                                                       <div class="product">
+                                                               <img class="bad" src="images/bad.png" alt="bad"/>
+                                                               <img class="product_img" src="//static.fsf.org/nosvn/images/googledrive.png" alt="Google Drive"/>
+                                                       </div>
+
+                                                       <h4 class="title">Google Drive</h4>
+                                                       <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>
+
+                        <li>
+                          Data may be accessed by Google and
+                          <a href="http://arstechnica.com/information-technology/2013/10/how-the-nsas-muscular-tapped-googles-and-yahoos-private-networks/">
+                            intelligence agencies.
+                          </a>
+                        </li>
+                    
+                      </ul>
+
+                                                       <div class="avoid">
+
+                                                               <img src="images/avoid.png" alt="avoid" />
+
+                                                       </div>
                                                </div>
                                        </div>
-                               </div>
+                       </div>
+                       
+<div class="comparisons">
+                                       <div class="section_wrapper">
+                                               <h3 class="main_title">Media Hosting</h3>
 
-                               <div class="recommend_wrapper">
-                                       <div class="recommended_product">
-                                               <img class="recommended_product_img" src="images/Linux.png" alt="Linux"/>
-                                               <h4 class="title">Fedora</h4>
-                                               <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
-                                               <div class="buy">
-                                                       <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" /></a>
+                                               <div class="free">
+                                                       <div class="product">
+                                                               <img class="good" src="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>
+
+                        <li>Supports free video formats.</li>
+
+                        <li>Ability to choose a copyleft license.</li>
+
+                        <li>Source files can be attached to an upload.</li>
+
+                        <li>
+                          Go to
+                          <a href="http://mediagoblin.org/">
+                            http://mediagoblin.org/
+                          </a>
+                          to learn how to use it and see a list of
+                          public instances.
+                        </li>
+                      </ul>
+
+                                                       <div class="buy">
+
+                                                               <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" /></a>
+
+                                                       </div>
+
+                                               </div>
+
+                                               <div class="proprietary">
+                                                       <div class="product">
+                                                               <img class="bad" src="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.
+                        </li>
+
+                        <li>
+                          Implements DRM to control access to videos
+                          by device and region.
+                        </li>
+
+                        <li>
+                          Imposes advertising on your uploads and
+                          polices copyright harshly.
+                        </li>
+                      </ul>
+
+                                                       <div class="avoid">
+
+                                                               <img src="images/avoid.png" alt="avoid" />
+
+                                                       </div>
                                                </div>
                                        </div>
+                       </div>
+       </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="images/Linux.png" alt="Linux"/>
-                                               <h4 class="title">Fedora</h4>
-                                               <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+                                               <img class="recommended_product_img" src="//tehnoetic.com/image/cache/data/adaptor-500x500.JPG" 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. <a href="https://www.fsf.org/ryf">Respects Your Freedom-certified by the FSF</a>.</p>
                                                <div class="buy">
-                                                       <a href="http://fedoraproject.org/"><img src="images/download.png" alt="Download" /></a>
+                                                       <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150"><img src="images/buy.png" alt="Buy" /></a>
                                                </div>
                                        </div>
 
                                        <div class="recommended_product">
-                                               <img class="recommended_product_img" src="images/Linux.png" alt="Linux"/>
-                                               <h4 class="title">Fedora</h4>
-                                               <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+                                               <img class="recommended_product_img" src="//www.thinkpenguin.com/files/imagecache/product/librecmc-router-v2_0.jpg" alt="ThinkPenguin Wi-Fi N router"/>
+                                               <h4 class="title">ThinkPenguin Wi-Fi N router</h4>
+                                               <p>High speed wireless router running free LibreCMC operating system. Respects Your Freedom-certified.</p>
                                                <div class="buy">
-                                                       <a href="http://fedoraproject.org/"><img src="images/buy.png" alt="Buy" /></a>
+                                                       <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-broadband-router-gnu-linux-tpe-nwifirouter2"><img src="images/buy.png" alt="Buy" /></a>
                                                </div>
                                        </div>
-                               </div>
-                               <div class="licenses">
-                                       <p class= "remark"> If you have ideas for more gifts that can be given
+<p class= "remark"> If you have ideas for more gifts that can be given
                                      freely, submit your recommendations to our growing
                                      page at <a href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">
                                        libreplanet.org/wiki/Group:Giving_Guide_Suggestions</a>.
                                        </p>
-
+                               </div>
+                               <h1 clas"topic_title">Recommended charities for holiday donations</h1>
+<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 class="licenses">
+                                       
                                        <h1 class="topic_title">Licenses</h1>
 
                                </div>
                        </div>
+                       
        </body>
 </html>