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

                                        </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>
- <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>.
++
+                               </div>
+                               <!-- Licenses Section -->
+                               <div class="licenses">
+                                       <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>
 +                              <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>
  
+                                       <p>This page is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></a></p>
+                                       <p>Lulzbot by FSF is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></a>
+                                               <br>Based on a work at <a href="https://static.fsf.org/nosvn/ryf/taz2.jpg">https://static.fsf.org/nosvn/ryf/taz2.jpg.</a></p>
+                                               <p>Replicator 2 by FSF is licensed under a Creative Commons Attribution 2.0 Generic.
+                                               <br>Based on a work at <a href="http://www.flickr.com/photos/creative_tools/8080029032/">http://www.flickr.com/photos/creative_tools/8080029032/</a>.</p>
+                                               <p>FSF USB membership card 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>
+                                               <br>Based on a work at <a href="http://static.fsf.org/nosvn/dontcardomebro.jpg">http://static.fsf.org/nosvn/dontcardomebro.jpg</a>.</p>
+                                               <p>iTunes gift card 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>
+                                               <br>Based on a work at <a href="http://www.flickr.com/photos/bmiphone/4640570159/">http://www.flickr.com/photos/bmiphone/4640570159/</a>.</p>
+                                               <p>ThinkPenguin with GNU 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>
+                                               <br>Based on a work at <a href="https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook</a>.</p>
+                                               <p>Macbook Pro 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>
+                                               <br>Retrieved from <a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png</a>.</p>
+                                               <p>Astounding Stories 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>
+                                               <br>Retrieved from <a href="http://www.gutenberg.org">http://www.gutenberg.org</a>.</p>
+                                               <p>The Amazon.com logo is public domain but is a registered trademark.</p>
+                                               <p>Replicant by Paul Kocialkowski 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>
+                                               <br>Retrieved from <a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg</a>.</p>
+                                               <p>The iOS logo is a registered trademark.</p>
+                                               <p>The Least Authority logo is copyright Least Authority Enterprises.</p>
+                                               <p>The Google Drive logo is public domain but may be subject to trademark laws.</p>
+                                               <p>The Media Goblin graphic is public domain.</p>
+                                               <p>The YouTube logo is public domain but may be subject to trademark laws.</p>
                                </div>
                        </div>
 +                      
        </body>
  </html>