New panes!

diff --git a/givingguide.html b/givingguide.html
index 380be5aed3cebd04c48b8dbb5d4ad32efbf0ef04..d77057a035334e6f7ce814c1d2e391ec641a5490 100644 (file)
--- a/givingguide.html
+++ b/givingguide.html
@@ -300,7 +300,7 @@
             <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>
-          <button type="button" name="buy" class="buy center-block">Buy</button>
+          <button type="button" name="buy" class="buy center-block">Download</button>
         </div>
         <!--End Good-->
 
@@ -327,33 +327,65 @@
     </div>
     <!--End Container-->
 
-    <!--3D Printers-->
+    <!--Graphic Design-->
     <div class="container">
-      <h3 class="title text-center">3D Printers</h3>
+      <h3 class="title text-center">Graphic Design</h3>
       <div class="row">
         <div class="good col-md-6">
-          <img src="https://static.fsf.org/nosvn/images/givingguide/images/lulzbot-mini.png" alt="replicant phone" class="center-block" width="250px" />
-          <h5 class="text-center">Lulzbot Mini</h5>
+          <img src="https://static.fsf.org/nosvn/images/gimp_inkscape.png" alt="replicant phone" class="center-block" height="150px" />
+          <h5 class="text-center">GIMP and Inkscape</h5>
           <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>Ease of use features like self-leveling and self-cleaning.</li>
-            <li>Hardware designs available to make modification and improvement easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
+            <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>
+          <button type="button" name="buy" class="buy center-block">Download</button>
+        </div>
+        <!--End Good-->
+
+        <div class="bad col-md-6">
+          <img src="img/products/adobe-blocked.png" alt="printer" class="center-block" height="150px" />
+          <h5 class="text-center">Photoshop and Illustrator</h5>
+          <ul>
+            <li>Proprietary software controlled by Adobe.</li>
+            <li>Shuts down when its DRM is unable to verify the costly required subscription, even if it's actually up to date.</li>
+            <li>Prefers locked-down proprietary formats.</li>
+          </ul>
+        </div>
+        <!--End Bad-->
+      </div>
+      <!--End Row-->
+    </div>
+    <!--End Container-->
+
+    <!--Gift Cards-->
+    <div class="container">
+      <h3 class="title text-center">Gift Cards</h3>
+      <div class="row">
+        <div class="good col-md-6">
+          <img src="https://static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="replicant phone" class="center-block" height="200px" />
+          <h5 class="text-center">FSF Membership Card</h5>
+          <ul>
+            <li>Join over 3,500 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="https://www.libreplanet.org/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>
           <button type="button" name="buy" class="buy center-block">Buy</button>
         </div>
         <!--End Good-->
 
         <div class="bad col-md-6">
-          <img src="img/products/printer-blocked.png" alt="printer" class="center-block" height="250px" />
-          <h5 class="text-center">Makerbot Replicator Mini</h5>
+          <img src="img/products/itunes-blocked.png" alt="printer" class="center-block" height="150px" />
+          <h5 class="text-center">iTunes Cards</h5></h5>
           <ul>
-            <li>
-              MakerWare software is proprietary, restricting freedom and stifling innovation.
+            <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>
-              MakerBot was founded with a more freedom-respecting philosophy, but has since announced an increasingly proprietary approach and distanced itself from the community that formed around it.
-            </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>
         <!--End Bad-->

diff --git a/img/products/adobe-blocked.png b/img/products/adobe-blocked.png
new file mode 100644 (file)
index 0000000..6a7e80e
Binary files /dev/null and b/img/products/adobe-blocked.png differ

diff --git a/img/products/itunes-blocked.png b/img/products/itunes-blocked.png
new file mode 100644 (file)
index 0000000..3906353
Binary files /dev/null and b/img/products/itunes-blocked.png differ