edits.

diff --git a/v8/givingguide.html b/v8/givingguide.html
index 1a49d3e2488c0e951a990112997d9574872572de..373c8c4d7f1ff437e49b87a02175de439b0ad974 100644 (file)
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -234,7 +234,7 @@
 
          <!-- start bad -->
 
 
          <!-- start bad -->
 

-          <div class="bad col-md-6 col-sm-6">
+          <div class="good col-md-6 col-sm-6">

            <ul class="pros">
               <li>
                 Runs the <a href="https://www.replicant.us">Replicant</a> free operating system, based on Android.
            <ul class="pros">
               <li>
                 Runs the <a href="https://www.replicant.us">Replicant</a> free operating system, based on Android.


@@ -245,7 +245,7 @@
              <li>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
             </ul>
 
              <li>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
             </ul>
 

-            <h5 class="text-center">Stay away from: iPhones!</h5>
+            <h5 class="text-center">Stay away from: iPhones</h5>

             <ul class="cons">
               <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
               <li>
             <ul class="cons">
               <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
               <li>


@@ -264,16 +264,18 @@
       <!--End bad-->
 
 
       <!--End bad-->
 
 

-              <h2 class="title text-center">Laptops and Tablets</h2>
-      
-      <!--Full-Sized Laptops-->
+              <h2 class="title text-center">Laptops, Tablets, and Desktops</h2>
+
+ <!--Laptops-->

       <div class="container">
       <div class="container">

-        <h3 class="title text-center">Full-Sized Laptops</h3>
+        <h3 class="title text-center">Laptops</h3>

         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
             <img src="img/products/t400.png" alt="t400" class="center-block" />
             <h5 class="text-center">T400 with GNU/Linux</h5>
 
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
             <img src="img/products/t400.png" alt="t400" class="center-block" />
             <h5 class="text-center">T400 with GNU/Linux</h5>
 

+
+           

             <!-- Buy/Download Button   -->
             <a id="get-item-full" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-full" aria-expanded="false" aria-controls="sellers-full" style="display:none">
               BUY
             <!-- Buy/Download Button   -->
             <a id="get-item-full" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-full" aria-expanded="false" aria-controls="sellers-full" style="display:none">
               BUY


@@ -318,9 +320,8 @@
           <!--End Good-->
          
          <!--start bad-->
           <!--End Good-->
          
          <!--start bad-->

-          <div class="bad col-md-6 col-sm-6">
+          <div class="good col-md-6 col-sm-6">

              <ul class="pros">
              <ul class="pros">

-             <p>While we're highlighting the follow laptops, there are <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">other options available</a>.</p>

               <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware.</li>
               <li>Durable hardware is meant to last and is easy to repair.</li>
               <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
               <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware.</li>
               <li>Durable hardware is meant to last and is easy to repair.</li>
               <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>


@@ -339,7 +340,7 @@
         <!--End Row-->
       </div>
       <!--End Container-->
         <!--End Row-->
       </div>
       <!--End Container-->

-
+      

       <!--Compact Laptops-->
       <div class="container">
         <h3 class="title text-center">Compact Laptops</h3>
       <!--Compact Laptops-->
       <div class="container">
         <h3 class="title text-center">Compact Laptops</h3>


@@ -348,6 +349,9 @@
             <img src="img/products/x200.png" alt="x200" class="center-block" />
             <h5 class="text-center">X200 with GNU/Linux</h5>
 
             <img src="img/products/x200.png" alt="x200" class="center-block" />
             <h5 class="text-center">X200 with GNU/Linux</h5>
 

+
+
+           

             <!-- Buy/Download Button   -->
             <a id="get-item-compact" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-compact" aria-expanded="false" aria-controls="sellers-compact" style="display:none">
               BUY
             <!-- Buy/Download Button   -->
             <a id="get-item-compact" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-compact" aria-expanded="false" aria-controls="sellers-compact" style="display:none">
               BUY


@@ -368,8 +372,14 @@
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">

-                  Technoethical's X200 has not yet been evaluated for <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification, but global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
+                  Technoethical's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#technoethical-promotion">Sale details.</a>

                 </p>
                 </p>

+                   <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a>
+                <p class="sale-info links">
+                  Viking's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available.
+
+                </p>
+            

               </div>
             </div>
 
               </div>
             </div>
 


@@ -402,7 +412,7 @@
           <!--End Good-->
 
          <!--start bad-->
           <!--End Good-->
 
          <!--start bad-->

-          <div class="bad col-md-6 col-sm-6">
+          <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> Trisquel operating system with libreboot firmware. The X200 sold by Libiquity is also certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
               <li>Durable hardware is meant to last and is easy to repair.</li>
             <ul class="pros">
              <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with libreboot firmware. The X200 sold by Libiquity is also certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
               <li>Durable hardware is meant to last and is easy to repair.</li>


@@ -473,7 +483,7 @@
           <!--End Good-->
 
          <!--start bad-->
           <!--End Good-->
 
          <!--start bad-->

-          <div class="bad col-md-6 col-sm-6">
+          <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> Trisquel operating system with libreboot firmware.</li>
               <li>Durable hardware is meant to last and is easy to repair.</li>
             <ul class="pros">
           <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with libreboot firmware.</li>
               <li>Durable hardware is meant to last and is easy to repair.</li>


@@ -493,7 +503,80 @@
       </div>
       <!--End Container-->
 
       </div>
       <!--End Container-->
 

+ <!--Desktops-->
+      <div class="container">
+        <h3 class="title text-center">Desktops</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <img src="img/products/desktop.png" alt="The Workstation, a tower computer by Vikings" class="center-block" />
+            <h5 class="text-center">The Workstation with GNU/Linux</h5>
+           
+            <!-- Buy/Download Button   -->
+            <a id="get-item-compact" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-compact" aria-expanded="false" aria-controls="sellers-compact" style="display:none">
+              BUY
+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
+            </a>
+            <div class="collapse" id="sellers-compact">
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+
+                <a href="https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation" class="seller action-button">Vikings</a>
+                <p class="sale-info links">
+                 The Workstation is not Respects Your Freedoms certified at this point.
+                </p>
+              </div>
+            </div>
+
+             <script>
+            document.getElementById('get-item-compact').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/libre-friendly-hardware/vikings-d16-workstation" class="seller action-button">Vikings</a>
+                <p class="sale-info links">
+                 The Workstation is not Respects Your Freedoms certified at this point.
+               </p>
+              </div>
+            </noscript>
+            <!-- End Buy/Download button -->
+
+            <ul class="pros">
+             <p>Sometimes you want or need a more powerful machine. Desktops are the answer for when you really need that extra push.</p>
+             <p>Vikings offers three desktop computers. (ThinkPenguin also <a href="https://www.thinkpenguin.com/catalog/desktop-computers-gnu-linux">has desktops</a>.)
+            </ul>

 
 

+          </div>
+          <!--End Good-->
+         
+         <!--start bad-->
+          <div class="good col-md-6 col-sm-6">
+             <ul class="pros">
+               <li>Options of coming with the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel or Parabola operating systems.</li>
+               <li>Choose between corebook and Libreboot.</li>
+               <li>Customize and specialize to your needs.</li>
+            </ul>
+            <h5 class="text-center">Stay away from: Intel Management Engine</h5>
+            <ul class="cons">
+             <li>Intel Management Engine is a little piece of firmware that performs various tasks while computers are booting, running, and sleeping. This poses a <a href="https://www.fsf.org/blogs/licensing/intel-me-and-why-we-should-get-rid-of-me">major security risk and threat to user freedom</a>. While there's not actually anything that can be done about Intel ME at the moment, it's good to know what's lurking inside your computer.
+              </li>
+              <!-- Commented out pending citation or confirmation <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</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>
+            </ul>
+          </div>
+          <!--End Bad-->
+        </div>
+        <!--End Row-->
+      </div>
+      <!--End Container-->
+
+      

       <!--start container-->
         <!-- Begin Recommended Template -->
       <div class="container">
       <!--start container-->
         <!-- Begin Recommended Template -->
       <div class="container">


@@ -550,7 +633,7 @@
             </ul>
            </div>
 
             </ul>
            </div>
 

-           <div class="bad col-md-6 col-sm-6">
+           <div class="good col-md-6 col-sm-6">

             <ul class="pros">
               <li>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.</li>
               <li><a href="https://www.fsf.org/ryf">Certified to Respect Your Freedom</a>.</li>
             <ul class="pros">
               <li>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.</li>
               <li><a href="https://www.fsf.org/ryf">Certified to Respect Your Freedom</a>.</li>


@@ -692,7 +775,8 @@
                 </p>
                 <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
                 <p class="sale-info links">
                 </p>
                 <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
                 <p class="sale-info links">

-                  <a href="#lulzbot-promotion">Sale details.</a>
+                  <a href="https://www.lulzbot.com">Lulzbot</a> is having general sales Black Friday through Cyber Monday. <a href="#lulzbot-promotion">Sale details.</a>
+                 

                 </p>
               </div>
             </div>
                 </p>
               </div>
             </div>


@@ -718,7 +802,7 @@
           </div>
           <!--End Good-->
 
           </div>
           <!--End Good-->
 

-          <div class="bad col-md-6 col-sm-6">
+          <div class="good col-md-6 col-sm-6">

            <ul class="pros">
               <li>Performance and seamless interface <a href="https://www.tomsguide.com/us/lulzbot-mini-3d-printer,review-2744.html">earned it "Editor's Choice"</a> in Tom's Guide's 2016 3D printer comparison.</li>
               <li>Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
            <ul class="pros">
               <li>Performance and seamless interface <a href="https://www.tomsguide.com/us/lulzbot-mini-3d-printer,review-2744.html">earned it "Editor's Choice"</a> in Tom's Guide's 2016 3D printer comparison.</li>
               <li>Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>


@@ -760,7 +844,7 @@
           <!--End Good-->
          
          <!--start bad-->
           <!--End Good-->
          
          <!--start bad-->

-          <div class="bad col-md-6 col-sm-6">
+          <div class="good col-md-6 col-sm-6">

              <ul class="pros">
             <h5 class="text-center">Stay away from: Amazon</h5>
             <ul class="cons">
              <ul class="pros">
             <h5 class="text-center">Stay away from: Amazon</h5>
             <ul class="cons">


@@ -791,7 +875,7 @@
           <!--End Good-->
 
          <!--start bad-->
           <!--End Good-->
 
          <!--start bad-->

-          <div class="bad col-md-6 col-sm-6">
+          <div class="good col-md-6 col-sm-6">

             <ul class="cons">
             <h5 class="text-center">Stay away from: XBox</h5>
               <ul class="cons">
             <ul class="cons">
             <h5 class="text-center">Stay away from: XBox</h5>
               <ul class="cons">


@@ -827,7 +911,7 @@
           <!--End Good-->
 
          <!--start bad-->
           <!--End Good-->
 
          <!--start bad-->

-          <div class="bad col-md-6 col-sm-6">
+          <div class="good col-md-6 col-sm-6">

             <ul class="cons">
              <h5 class="text-center">Stay away from: Spotify</h5>
            <p>DRM is the unfortunate standard for so much of major music available. While spotify certainly isn't the only offender, they're the one we are choosing to highlight.</p>
             <ul class="cons">
              <h5 class="text-center">Stay away from: Spotify</h5>
            <p>DRM is the unfortunate standard for so much of major music available. While spotify certainly isn't the only offender, they're the one we are choosing to highlight.</p>


@@ -859,7 +943,7 @@
           <!--End Good-->
 
          <!--start bad-->
           <!--End Good-->
 
          <!--start bad-->

-          <div class="bad col-md-6 col-sm-6">
+          <div class="good col-md-6 col-sm-6">

             <h5 class="text-center">Stay away from: Netflix</h5>
               <ul class="cons">
                <p>Whether it's <a href="https://www.defectivebydesign.org/blog/tell_netflix_nix_drm_original_productions">using major studios as scapegoats for using DRM</a> or <a href="https://www.w3.org/2017/09/pressrelease-eme-recommendation.html.en">pushing for DRM as an official W3C Reccomendation</a>, Netflix has been at the front line of getting DRM into media online and in your home.</p>
             <h5 class="text-center">Stay away from: Netflix</h5>
               <ul class="cons">
                <p>Whether it's <a href="https://www.defectivebydesign.org/blog/tell_netflix_nix_drm_original_productions">using major studios as scapegoats for using DRM</a> or <a href="https://www.w3.org/2017/09/pressrelease-eme-recommendation.html.en">pushing for DRM as an official W3C Reccomendation</a>, Netflix has been at the front line of getting DRM into media online and in your home.</p>


@@ -979,20 +1063,9 @@
                     <ul style="list-style: none inside none;">
                       <li>X200, T400, iPhone, and ISP-provided router images are in the public domain.</li>
                       <li>LulzBot 3D printer photo by Aleph Objects is licensed under a <a href="https://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>X200, T400, iPhone, and ISP-provided router images are in the public domain.</li>
                       <li>LulzBot 3D printer photo by Aleph Objects is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>

-                      <li>FSF USB membership card by FSF is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>iTunes gift card is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>

                       <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
                       <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>

-                      <li>Macbook Pro PSD by andrew-gw is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>Astounding Stories is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</li>
-                      <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are registered trademarks.</li>

                       <li>Technoethical Replicant s3, Wi-Fi Dongle, and X200t by Technoethical 2016-2017 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>
                       <li>Technoethical Replicant s3, Wi-Fi Dongle, and X200t by Technoethical 2016-2017 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>

-                      <li>The Lenovo U31 image is copyright Lenovo.</li>
-                      <li>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>
-                      <li>The MakerBot logo is copyright MakerBot Industries.</li>
-                      <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
-                      <li><a href="https://www.flickr.com/photos/janitors/12907608763">Microsoft Surface 2</a> by <a href="https://www.flickr.com/photos/janitors/">Kārlis Dambrāns</a> licensed under CC By 2.0.</li>
-                    </ul>
+                      <li>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>   </ul>

                   </div>
                 </div>
               </div>
                   </div>
                 </div>
               </div>

diff --git a/v8/img/products/desktop.png b/v8/img/products/desktop.png
new file mode 100644 (file)
index 0000000..2773476
Binary files /dev/null and b/v8/img/products/desktop.png differ