projects / fsf-giving-guide.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Reordering items.
[fsf-giving-guide.git] / givingguide.html
diff --git a/givingguide.html b/givingguide.html
index b32ff3b452809d5903c7e65d41f1626ff28bed50..b8a46493a124562d893ec1591b15aba72a50c434 100755 (executable)
--- a/givingguide.html
+++ b/givingguide.html
@@ -77,75 +77,7 @@
   <!--We compare different products from here-->
 
   <div class="comparisons">
-    <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>
+    
 
 
 
@@ -280,73 +212,7 @@
                        <!-- 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 OS</h4>
-        <ul>
-          <li>
-            Fully free software, based on Android.
-          </li>
-
-          <li>
-            <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantImages">
-       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/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>
-        </div>
-      </div>
-                       <!-- end buy-avoid -->
-
-    </div>
-
+    
     <div class="comparisons">
       <div class="section_wrapper">
         <h3 class="main_title">Laptops</h3>
@@ -412,6 +278,10 @@ available Android devices ship with some proprietary software.)
 
     </div>
 
+    
+
+    
+
     <div class="comparisons">
       <div class="section_wrapper">
         <h3 class="main_title">Graphic Design</h3>
@@ -465,7 +335,75 @@ available Android devices ship with some proprietary software.)
                        <!-- 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>
+
+                       <!-- '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>
     <div class="comparisons">
       <div class="section_wrapper">
         <h3 class="main_title">Gift Cards</h3>
@@ -522,6 +460,72 @@ available Android devices ship with some proprietary software.)
 
     </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 OS</h4>
+        <ul>
+          <li>
+            Fully free software, based on Android.
+          </li>
+
+          <li>
+            <a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantImages">
+       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/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>
+        </div>
+      </div>
+                       <!-- end buy-avoid -->
+
+    </div>
+
     <div class="comparisons">
       <div class="section_wrapper">
         <h3 class="main_title">Online Storage</h3>