Remove fundraiser elements
[fsf-giving-guide.git] / v10 / givingguide.html
index 2c542a7f7cdffab38259eba3cdc62e755e63b594..030799f8a7092f470cf7a702a30e7821f4207849 100644 (file)
@@ -153,7 +153,7 @@ cost much higher than its price tag?</p>
                        <h4>Freedom is the gift that keeps on giving</h4>
 <p>Letting your loved ones know that
 you respect their privacy and freedom too much to cave in for the
-newest Apple or Google product is a great gift in itself, and one that
+newest Apple or Google device is a great gift in itself, and one that
   you can feel good about.</p>
           </div>
         </div>
@@ -362,70 +362,42 @@ advertisers.</p>
       <div class="container">
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
-            <h5 class="text-center">X200 with GNU/Linux</h5>
-            <img src="img/products/x200.png" alt="X200" class="center-block"/>
+                   <h5 class="text-center">Vikings D8</h5>
+            <img src="img/products/desktop.png" alt="Vikings D8" class="center-block" />
 
             <!-- Buy/Download Button   -->
-            <a id="get-item-x200" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-x200" aria-expanded="false" aria-controls="sellers-x200" style="display:none">
+            <a id="get-item-d8" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-d8" aria-expanded="false" aria-controls="sellers-d8" style="display:none;">
               BUY
-              <!-- Begin Sale -->
-              <span class="sale" >sale</span>
-              <!-- End Sale -->
-                       </a>
-            <div class="collapse" id="sellers-x200">
+            </a>
+            <div class="collapse" id="sellers-d8">
               <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
-               <p>
-               <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
-               </p>
-                               <p><a href="https://tehnoetic.com/laptops/tet-x200" class="seller action-button">Technoethical</a></p>
-                               <p>  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
-                <p class="sale-info links">
-                  <a href="#technoethical-promotion">Sale details.</a></p>
+                <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
               </div>
             </div>
 
             <script>
-            document.getElementById('get-item-x200').style.display = '';
+            document.getElementById('get-item-d8').style.display = '';
             </script>
             <noscript>
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-               <p>
-               <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
-               </p>
-                       <p><a href="https://tehnoetic.com/laptops/tet-x200" class="seller action-button">Technoethical</a></p>
-<p>                              <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
-                               <p class="sale-info links">
-                  <a href="#technoethical-promotion">Sale details.</a>           
-                </p>
+                <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
               </div>
             </noscript>
-            <!-- End Buy/Download button -->
             <ul class="pros">
-             <p>Why it's cool: The X200 is one of the few home user devices that's
-able to run fully free software from top to bottom. Starting with an
-attractive user interface and extending through the microcode (or
-"BIOS") at the heart of the system, this laptop is powered by software
-that takes your freedom and privacy seriously.</p>
-<p>While it may be a little vintage, what it lacks in speed
-it makes up for in utmost respect to user freedom. It's so good that
-it's the laptop that's most frequently used in the FSF office!</p>
-           </ul>
-          </div>
-          <!--End Good-->
-         
-         <!--start bad-->
-          <div class="good col-md-6 col-sm-6">
-             <ul class="pros">
-            <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> <a href="https://trisquel.info">Trisquel</a> operating system and <a href="https://libreboot.org">Libreboot</a> firmware.</li>
-              <li>Durable hardware that's meant to be easy to repair.</li>
-              <li>Created by small businesses that replace restrictive components from a stock laptop.</li>
-            </ul>
+<p>Why it's cool: The Vikings D8 is a robust desktop computer that can be scaled up or down according to your needs, and which is capable of doing everything from simple Web browsing and video playback to intense code compilation.</p>
+
+<p>You can order the Vikings D8 installed with the preferred <a href="https://trisquel.info">Trisquel</a> distribution of GNU/Linux, a fully free operating system that removes the user-hostile binary-only blobs lurking in the drivers of many common network and graphics cards, or, if you prefer, you can order the D8 installed with any other <a href="https://gnu.org/distros/free-distros.html">free distribution of GNU/Linux</a>.</p>
+</ul>
+</div>
+
+<div class="good col-md-6 col-sm-6">
+<ul class="pros">
+                         <li>Has room for three hard drives and four custom case fans.</li>
+                         <li>Quiet and energy efficient while maintaining a small form factor.</li>
+                         </ul>
             <h5 class="text-center">Stay away from: Microsoft Windows</h5>
             <ul class="cons">
              <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product. It also <a href="https://www.fsf.org/news/the-fsfs-statement-on-windows-10">forces users to consent to data collection</a> for "targeted advertising."
@@ -792,7 +764,7 @@ numbers, which aids in password generation and encryption.</p>
   <p>Try these video services and sites instead:</p>
 <ul class="pros">
   <li>Visit the <a href="https://archive.org/details/movies">Moving Internet Archive</a> for free (as in freedom) classic films and art projects.</li>
-<li>The <a href="https://cloud.blender.org/open-projects">Blender Open Movies</a> project has a collection of computer-animated films that were made entirely with <a href="https://blender.org">Blender</a>, an enormously popular free software tool.</li>
+<li>The <a href="https://studio.blender.org/films">Blender Open Movies</a> project has a collection of computer-animated films that were made entirely with <a href="https://blender.org">Blender</a>, an enormously popular free software tool.</li>
 <li><p>Visit the <a href="https://www.defectivebydesign.org/guide/">Guide to DRM-free Living</a> for more suggestions on how to stay a film lover and keep your freedom at the same time.</p></li>
            </ul>
 
@@ -1006,7 +978,7 @@ numbers, which aids in password generation and encryption.</p>
 </script>
 <!-- End Piwik Code -->
 <!-- Piwik Image Tracker -->
-<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- <noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /><noscript> -->
 <!-- End Piwik -->
       </body>