FIXED THE WORKSTATION BUTTON.

[fsf-giving-guide.git] / givingguide.html

diff --git a/givingguide.html b/givingguide.html
index abf5d2912c969affd6ea8dba3a65656c5bcb39bd..ff6e9592865d418d92f3fbcf66dfef27a79afffe 100755 (executable)
--- a/givingguide.html
+++ b/givingguide.html
@@ -102,9 +102,9 @@
               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>
+            <!--<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>
+            </li>-->
           </ul>
 
         </div>
@@ -115,7 +115,7 @@
             <img class="product_img" src="//static.fsf.org/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2" />
           </div>
 
-          <h4 class="title">Makerbot Replicator 2</h4>
+          <h4 class="title">Makerbot Replicator</h4>
           <ul>
             <li>
               MakerWare software is proprietary, restricting freedom and stifling innovation.
@@ -232,7 +232,7 @@
                 </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>
+                <!--<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>
@@ -704,7 +704,6 @@
             <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-->
@@ -723,19 +722,22 @@
           </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>
-              <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>
+            <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>