Revert "remove viking d8"
authorGreg Farough <gregf@gnu.org>
Wed, 1 Dec 2021 15:58:28 +0000 (10:58 -0500)
committerGreg Farough <gregf@gnu.org>
Wed, 1 Dec 2021 15:58:28 +0000 (10:58 -0500)
This reverts commit e5edd82fb9a7bda64e112de3de536d0799e4e988.

v12/givingguide.html

index d4a047e..5066489 100644 (file)
@@ -366,6 +366,22 @@ Apple prevents you from installing third-party free software on your own phone,
                <p>
                <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
                </p>
                <p>
                <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
                </p>
+                               <p>  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
+              </div>
+            </div>
+
+            <script>
+            document.getElementById('get-item-x200').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://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
               </div>
             </noscript>
             <!-- End Buy/Download button -->
@@ -400,6 +416,59 @@ it's the laptop that's most frequently used in the FSF office!</p>
       </div>
         <!--End Row-->
 
       </div>
         <!--End Row-->
 
+ <div class="container">
+        <div class="row is-table-row">
+          <div class="col-md-5 col-sm-6 recommended-img">
+                   <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-d8" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-d8" aria-expanded="false" aria-controls="sellers-d8" style="display:none;">
+              BUY
+            </a>
+            <div class="collapse" id="sellers-d8">
+              <div class="center-block seller-group">
+                <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
+              </div>
+            </div>
+
+            <script>
+            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>
+                <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
+              </div>
+            </noscript>
+            <ul class="pros">
+<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 FSF-endorsed <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>Want to graduate from the X200? The D8 is higher performing while still just as respectful of your freedom.</li>
+  <li>Has room for three hard drives and four custom case fans.</li>
+  <li>Despite being a mid-tower PC, it runs quietly, allowing you to surf the Web or code in peace.</li>
+                         </ul>
+            <h5 class="text-center">Desktops running Microsoft Windows</h5>
+            <ul class="cons">
+              <li>Windows is <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product. It <a href="https://www.fsf.org/news/the-fsfs-statement-on-windows-10">forces users to consent to data collection</a> for "targeted advertising." <a href="https://www.fsf.org/news/lifes-better-together-when-you-avoid-windows-11">Windows 11</a> is no better.
+              </li>
+              <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
+            <li>Looking at a computer that includes an Intel CPU? They come with the <a href="https://www.fsf.org/blogs/sysadmin/the-management-engine-an-attack-on-computer-users-freedom">Intel Management Engine</a>, a hardware-based backdoor that gives Intel -- or intruders -- permanent and privileged access to your computer.</li>
+            </ul>
+          </div>
+          <!--End Bad-->
+        </div>
+        <!--End Row-->
+      <!--End Container-->
+
       <h2 class="title text-center">Cool Devices</h2>
   <!-- cool devices -->
 <div class="container">
       <h2 class="title text-center">Cool Devices</h2>
   <!-- cool devices -->
 <div class="container">
@@ -816,6 +885,7 @@ numbers, which aids in password generation and encryption.</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 style="list-style: none inside none;">
                       <li>X200 product image in the public domain.</li>
                     <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 style="list-style: none inside none;">
                       <li>X200 product image in the public domain.</li>
+                                         <li>Vikings product images copyright © 2019, Vikings GmbH. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
                                          <li>NeuG product image copyright © 2020, Free Software Foundation, Inc. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
                       <li>ThinkPenguin product images © 2019, ThinkPenguin, Inc. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li> 
                      <li>Bookshelf photo copyright © 2010, <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a>. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> license.</li>
                                          <li>NeuG product image copyright © 2020, Free Software Foundation, Inc. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
                       <li>ThinkPenguin product images © 2019, ThinkPenguin, Inc. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li> 
                      <li>Bookshelf photo copyright © 2010, <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a>. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> license.</li>