Add banner and modal window
[fsf-giving-guide.git] / v12 / givingguide.html
index cf36b7a7f43581c6c055e45e6f839c0cfb19c403..59d7b65bcd97f901a687dffc727981fdbe6de47e 100644 (file)
 
 <!-- Add banner and modal window here -->
 
+    <iframe src="//static.fsf.org/nosvn/banners/202206fundraiser/" scrolling="no"
+      style="width: 100%; height: 150px; display: block; margin: 0; border: 0 none; overflow: hidden;">
+    </iframe>
+
+            <!-- Begin fsf-modal-window-elem campaign element -->
+            <link type="text/css" rel="stylesheet" href="https://static.fsf.org/nosvn/fonts/fa/css/font-awesome.min.css">
+            <style>
+#fsf-modal-window-elem-container div {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+@media screen and (min-width: 700px) {
+  #fsf-modal-window-elem-outer-v-center {
+    display: table;
+    position: absolute;
+    height: 100%;
+    width: 100%;
+  }
+
+  #fsf-modal-window-elem-inner-v-center {
+    display: table-cell;
+    vertical-align: middle;
+  }
+
+  #fsf-modal-window-elem {
+    width: 687px;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  #fsf-modal-window-elem-right-column {
+    float: right;
+    width: 280px;
+    padding-left: 20px;
+    color: #002047;
+  }
+
+  #fsf-modal-window-elem-left-column {
+    width: 100%;
+    float: left;
+    margin-right: -280px;
+  }
+
+  #fsf-modal-window-elem-text {
+    margin-right: 280px;
+  }
+}
+
+@media screen and (max-width: 699px) {
+  #fsf-modal-window-elem {
+    -ms-box-orient: horizontal;
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -moz-flex;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-flow: row wrap;
+    flex-flow: row wrap;
+  }
+
+  #fsf-modal-window-elem {
+    width: 80vw;
+    margin-left: 10vw;
+    margin-right: 10vw;
+    margin-top: 40px;
+    margin-bottom: 40px;
+  }
+
+  #fsf-modal-window-elem-right-column {
+    width: 100%;
+    order: 1;
+  }
+
+  #fsf-modal-window-elem-left-column {
+    width: 100%;
+    order: 2;
+  }
+
+  #fsf-modal-window-elem-text {
+    margin-top: 20px;
+  }
+}
+
+@media screen and (max-width: 360px) {
+  .long-button-text {
+    font-size: 25px !important;
+  }
+}
+
+#fsf-modal-window-elem-container {
+  position: fixed;
+  z-index: 10000;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgba(0,0,0,0.8);
+  font-weight: normal;
+}
+
+#fsf-modal-window-elem a, a:active, a:focus {
+  outline: none;
+  border-bottom: 0px;
+}
+
+#fsf-modal-window-elem {
+  overflow: auto;
+  padding: 20px;
+  border-style: solid;
+  border-width: 5px;
+  border-color: #b25ea8;
+  border-radius: 20px;
+  box-shadow: 0px 0px 10px #111111;
+  background-color: #e3d9e4;
+}
+
+#fsf-modal-window-elem-header {
+  width: 100%;
+}
+
+#fsf-modal-window-elem-header h2 {
+  font-family: sans-serif,"Helvetica",Arial;
+  font-weight: bold;
+  font-size: 24px;
+  color: #002047;
+  padding-bottom: 20px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  border: none;
+}
+
+#fsf-modal-window-elem-close-button {
+  float: right;
+  height: 40px;
+  margin-right: -20px;
+  margin-top: -20px;
+  padding: 11px;
+  color: #888;
+  cursor: pointer;
+}
+
+#fsf-modal-window-elem-close-button:hover {
+  color: #aaf;
+}
+
+#fsf-modal-window-elem-right-column {
+  text-align: center;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+
+#fsf-modal-window-elem-buttons div {
+  height:53.333px;
+  line-height: 53.333px;
+  margin-left:auto;
+  margin-right:auto;
+  display:block;
+}
+
+#fsf-modal-window-elem-buttons a {
+  width: 100%;
+  display: block;
+  text-align: center;
+  font-size:35px;
+  color:#002047;
+  text-decoration: none;
+  font-family: sans-serif,"Helvetica",Arial;
+  font-weight: normal;
+}
+
+#fsf-modal-window-elem-maybe-later {
+  margin-top: 5px;
+  margin-bottom: -5px;
+}
+
+#fsf-modal-window-elem-maybe-later a {
+  color: #367c93;
+  line-height: 20px;
+  text-decoration: none;
+  cursor: pointer;
+  font-weight: normal;
+  font-family: sans-serif,"Helvetica",Arial;
+  font-size: 16px;
+}
+
+#fsf-modal-window-elem-text a {
+  color: #002047;
+  font-weight: 700;
+  text-decoration: none;
+}
+
+#fsf-modal-window-elem-text a:hover {
+  color: #fd8e1b;
+}
+
+#fsf-modal-window-elem-text a:focus {
+  color: #fd8e1b;
+}
+
+#fsf-modal-window-elem-text a:active {
+  color: #ffac30;
+}
+
+#fsf-modal-window-elem-text p {
+  font-family: sans-serif,"Helvetica",Arial;
+  font-size: 17px;
+  font-weight: normal;
+  margin: 0px 0px 10px 0px;
+  line-height: 20px;
+  color: #002047;
+}
+            </style>
+            <div id="fsf-modal-window-elem-container" style="display: none;">
+                <div id="fsf-modal-window-elem-outer-v-center">
+                    <div id="fsf-modal-window-elem-inner-v-center">
+                        <div id="fsf-modal-window-elem">
+                            <div id="fsf-modal-window-elem-header">
+                                <div id="fsf-modal-window-elem-close-button" onclick="//fsfModalWindowElemDontShowForAWhile();">
+                                    <i class="fa fa-close">&#8203;</i>
+                                </div>
+                                <h2>Support #UserFreedom!</h2>
+                            </div>
+                            <div id="fsf-modal-window-elem-left-column">
+                                <div id="fsf-modal-window-elem-text">
+
+<p>
+
+To truly have the right to collaborate, repair, and live more sustainably, we need freedom for computer users. A world with free software would have better privacy, protection from bulk surveillance, and would avoid user lock-in.
+
+</p>
+
+<p>
+
+With your support, we can continue helping people find their reasons and motivation to live more freely. Donate today and help us achieve our spring goal of $67,000 by July 8.
+
+</p>
+
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?mtm_campaign=spring22&mtm_source=modal">Read more</a> | <a href="https://my.fsf.org/donate?mtm_campaign=spring22&mtm_source=modal">Donate</a></span></p>
+
+                                </div>
+                            </div>
+                            <div id="fsf-modal-window-elem-right-column">
+                                <div id="fsf-modal-window-elem-buttons" style="border-radius: 20px;box-shadow: 5px 0 5px -6px #002047, -5px 0 5px -6px #002047;">
+                                    <div style="background-color:#c87137; border-top-right-radius: 20px; border-top-left-radius: 20px;">
+                                      <a style="text-shadow: 0px 0px 6px #ffe6b4;" href="https://my.fsf.org/join?mtm_campaign=spring22&mtm_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-check-circle">&nbsp;</i>Join</a>
+                                    </div>
+
+                                    <div style="background-color:#e3d9e4;">
+                                      <a href="https://my.fsf.org/renew?mtm_campaign=spring22&mtm_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-refresh">&nbsp;</i>Renew</a>
+                                    </div>
+
+                                    <div style="background-color:#b25ea8; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; margin-bottom: 2px">
+                                      <a style="text-shadow: 0px 0px 6px #ffe6b4;" href="https://my.fsf.org/donate?mtm_campaign=spring22&mtm_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-money">&nbsp;</i>Donate</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <script>
+// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-3.0
+
+// Licensed GPLv3-or-later by Andrew Engelbrecht
+
+var startTime, endTime, switchTextTime;
+
+startTime = new Date('2022-06-12T04:00:00Z');
+switchTextTime = new Date('2022-12-12T04:00:00Z');
+// endTime is unused.
+endTime = new Date('2022-12-17T04:00:00Z');
+
+// Possibly switch the text that is displayed in the modal window, depending
+// upon the current date.
+function fsfModalWindowElemMaybeSwitchText () {
+
+    var now;
+
+    now = new Date();
+    if (now.getTime() < switchTextTime.getTime()) {
+        return; // Do not switch the text
+    }
+
+    // Switch text
+    document.getElementById("fsf-modal-window-elem-text").innerHTML =' \
+\
+<p>To truly have the right to collaborate, repair, and live more sustainably, we need freedom for computer users. A world with free software would have better privacy, protection from bulk surveillance, and would avoid user lock-in.<\/p><p>With your support, we can continue helping people find their reasons and motivation to live more freely. Donate today and help us achieve our spring goal of \$67,000 by July 8!<\/p> \
+\
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?mtm_campaign=spring22&mtm_source=modal">Read more<\/a> |  <a href="https://my.fsf.org/donate?mtm_campaign=spring22&mtm_source=modal">Donate<\/a><\/span><\/p>';
+}
+
+// Show fsf-modal-window-elem if it has not been previously closed by
+// the user, nor recently hit "maybe later",
+// and the campaign is still happening
+function fsfModalWindowElemMaybeShow () {
+
+    var pattern, noShowFsfModalWindowElementP, now;
+
+    // See if cookie says not to show element
+    pattern = /showFsf202206FundraiserModalWindowElementP\s*=\s*false/;
+    noShowFsfModalWindowElementP = pattern.test(document.cookie);
+
+//// Uncomment here to enable modal window hiding
+    if (!noShowFsfModalWindowElementP) {
+        setTimeout(function () {
+            // display the element
+            document.getElementById("fsf-modal-window-elem-container").style.display="block";
+        }, 0);
+    }
+}
+
+// Call this first to set the proper text.
+fsfModalWindowElemMaybeSwitchText();
+// Check if appeal is the url.
+if (window.location.href.indexOf("appeal") == -1) {
+  // Call this right away to avoid flicker.
+  fsfModalWindowElemMaybeShow();
+}
+
+// Get the time `plusDays` in the future.
+// This can be a fraction.
+function daysInFuture (plusDays) {
+    var now, future;
+
+    now = new Date();
+    future = new Date(now.getTime() + Math.floor(1000 * 60 * 60 * 24 * plusDays));
+    return future.toGMTString();
+}
+
+// Hide the fsf-modal-window-elem
+function fsfModalWindowElemHide () {
+    document.getElementById("fsf-modal-window-elem-container").style.display="none";
+}
+
+// Optionally hide elem and set a cookie to keep the fsf-modal-window-elem hidden for the next `forDays`.
+function fsfModalWindowElemDontShowForDays (forDays, hideNow) {
+    if (hideNow === true) {
+        fsfModalWindowElemHide();
+    }
+    //document.cookie = "showFsf202206FundraiserModalWindowElementP=false; path=/; domain=.fsf.org; expires=" + daysInFuture(forDays);
+    document.cookie = "showFsf202206FundraiserModalWindowElementP=false; path=/; SameSite=Strict; Secure; expires=" + daysInFuture(forDays);
+}
+
+// Hide the element from now to two weeks after closing it
+function fsfModalWindowElemDontShowForAWhile () {
+  fsfModalWindowElemDontShowForDays(7, true);
+}
+
+// Keep the element visible for now, but do not show it for a while
+function fsfModalWindowElemFollowedLink () {
+  fsfModalWindowElemDontShowForDays(14, false);
+}
+
+// Check if visiting appeal page.
+if (window.location.href.indexOf("appeal") > -1) {
+  fsfModalWindowElemDontShowForAWhile();
+}
+
+// Close popup if user clicks trasparent part
+document.getElementById("fsf-modal-window-elem-container").addEventListener("click", function(event){
+  fsfModalWindowElemDontShowForAWhile();
+});
+
+// Do not close popup if clicking non-trasparent part (with the text and buttons)
+document.getElementById("fsf-modal-window-elem").addEventListener("click", function(event){
+  event.stopPropagation();
+});
+
+// Close popup if user clicks X icon
+document.getElementById("fsf-modal-window-elem-close-button").addEventListener("click", function(event){
+  fsfModalWindowElemDontShowForAWhile();
+});
+
+// Disable popup if user clicks one of the main buttons
+document.getElementById("fsf-modal-window-elem-buttons").addEventListener("click", function(event){
+  fsfModalWindowElemFollowedLink();
+});
+
+// Disable popup if user clicks one of the "Read more" link
+document.getElementById("fsf-modal-window-text-link").addEventListener("click", function(event){
+  fsfModalWindowElemFollowedLink();
+});
+
+// Close popup if user presses escape key
+window.addEventListener("keydown",  function  (event)  {
+    switch  (event.key)  {
+        case  "Escape":
+            fsfModalWindowElemDontShowForAWhile();
+            break;
+        default:
+            return;
+    }
+},  true);
+// @license-end
+                </script>
+            </div>
+            <!-- End fsf-modal-window-elem campaign element -->
+
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <!-- Brand and toggle get grouped for better mobile display -->
 <p>The headlines are filled with stories of "Big Tech" abuses, using the
 tight control they have over their devices and platforms to keep us
 powerless and dependent on them. There's no time at which this is more
-evident than in the holiday season, when they martial all of the
+evident than in the holiday season, when they marshal all of the
 advertising at their disposal to sell us things that we don't need --
-  and worse, products that don't respect our <a href="https://gnu.org/free-sw/">basic freedoms</a>.</p>
+  and worse, products that don't respect our basic freedoms.</p>
                        <h4>This year, choose freedom</h4>
-                       <p>This year, we advise you to end that cycle of forced obsolescence and user exploitation, and opt to try running <a href="https://gnu.org/free-sw">free software</a> on a device you already own. If you're unlucky enough to get a gift that doesn't respect your freedom, you can still <a href="https://h-node.org">help others avoid it</a> by documenting its ethical pitfalls.</p>
+                       <p>This year, we advise you to end that cycle of forced obsolescence and user exploitation, and opt to try running <a href="https://gnu.org/philosophy/free-sw">free software</a> on a device you already own. If you're unlucky enough to get a gift that doesn't respect your freedom, you can still <a href="https://h-node.org">help others avoid it</a> by documenting its ethical pitfalls.</p>
 <p>Let your loved ones know that you respect their freedom and privacy
 too much to cave for the newest Apple, Amazon, or Google device, and
 give them the one gift that keeps on giving: freedom.</p>
@@ -165,7 +568,7 @@ give them the one gift that keeps on giving: freedom.</p>
           <div class="action col-md-4 col-sm-4 text-center">
             <a class="action-button" href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&amp;t=Check out the Free Software Foundation Ethical Tech Giving Guide">Tell your friends</a>
             <p>
-                         Use the hashtag <span class="label label-default">#UserFreedom</span> on social media sites like <a href="https://mastodon.social">Mastodon</a>, <a href="https://www.gnu.org/software/social/">GNU social</a>, or <a href="https://fsf.org/twitter">Twitter</a>. You might get a gift out of it yourself!
+                         Use the hashtag <span class="label label-default">#UserFreedom</span> on social media sites like <a href="https://joinmastodon.org/#getting-started">Mastodon</a>, <a href="https://www.gnu.org/software/social/">GNU social</a>, or <a href="https://fsf.org/twitter">Twitter</a>. You might get a gift out of it yourself!
             </p>
           </div>
           <!-- End Action -->
@@ -174,7 +577,7 @@ give them the one gift that keeps on giving: freedom.</p>
                            <div class="action col-md-4 col-sm-4 text-center">
             <a class="action-button" href="">Collaborate</a>
             <p>
-                         You can help others know which devices to avoid by documenting hardware you currently own in the <a href="https://h-node.org">H-Node</a> database. Join a growing community of volunteers to help individuals choose hardware compatible with their freedom, even if they don't have <a href="https://ryf.fsf.org">RYF</a> certification.
+                         You can help others know which devices to avoid by documenting hardware you own that does or doesn't work with free software in the <a href="https://h-node.org">h-node</a> database. Join a growing community of volunteers to help individuals choose hardware compatible with their freedom, even if they don't have <a href="https://ryf.fsf.org">Respects Your Freedom</a> (RYF) certification.
             </p>
           </div>
           <!-- End Action -->
@@ -233,7 +636,7 @@ give them the one gift that keeps on giving: freedom.</p>
             <!-- End Buy/Download button -->
 
             <ul class="pros">
-                         <p><strong>Our advice:</strong> There's currently no cell phone on the market that's fully compatible with user freedom, given the presence of nonfree software in iOS and Android. There are promising projects like PINE64 and the Librem 5 that seek to run GNU/Linux on smartphone hardware, but even these aren't perfect. What makes matters worse is that all smartphones currently run a separate, nonfree OS commonly referred to as the "mobile baseband," which is responsible for most of the device's communications.</p>
+                         <p><strong>Our advice:</strong> There's currently no cell phone on the market that's fully compatible with user freedom, given the presence of nonfree software in iOS and Android. There are promising projects like PinePhone and the Librem 5 that seek to run GNU/Linux on smartphone hardware, but even these aren't perfect. What makes matters worse is that all smartphones currently run a separate, nonfree OS commonly referred to as the "mobile baseband," which is responsible for most of the device's communications.</p>
                          <p>If you're at all able to, and if you find your hardware is compatible with it, we recommend pairing the <strong>Replicant</strong> distribution of Android with the <a href="https://f-droid.org">F-Droid</a> app repository. Replicant is the bottom line when it comes to mobile OSes that respect their user's freedom, and is a project <a href="https://www.fsf.org/working-together/fund">fiscally sponsored by the FSF.</a></p>
             </ul>
           </div>
@@ -357,9 +760,6 @@ Apple prevents you from installing third-party free software on your own phone,
             <!-- 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">
               BUY
-              <!-- Begin Sale -->
-              <span class="sale" >sale</span>
-              <!-- End Sale -->
                        </a>
             <div class="collapse" id="sellers-x200">
               <div class="center-block seller-group">
@@ -369,9 +769,6 @@ 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://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
-                               <p class="sale-info links">
-                                 <a href="#vikings-promotion">Sale details.</a></p>
               </div>
             </div>
 
@@ -386,9 +783,6 @@ 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://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
-                               <p class="sale-info links">
-                                 <a href="#vikings-promotion">Sale details.</a></p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
@@ -412,11 +806,10 @@ it's the laptop that's most frequently used in the FSF office!</p>
               <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>
-          <h5 class="text-center">Stay away from: MacBook Air and MacBook Pro</h5>
+          <h5 class="text-center">Stay away from: M1 MacBook and MacBook Pro</h5>
           <ul class="cons">
            <li>macOS is <a href="https://gnu.org/proprietary">proprietary software</a> that restricts its users' freedoms.</li>
                <li>In early November 2020, macOS was caught alerting Apple each time a user <a href="https://sneak.berlin/20201112/your-computer-isnt-yours/">opens an app</a>. Even though Apple is <a href="https://support.apple.com/en-us/HT202491">making changes</a> to the service, it just goes to show how bad they try to be until there is an outcry.</li>
-              <li>Apple has been <a href="https://motherboard.vice.com/en_us/article/evmeya/apple-iphone-right-to-repair-california">opposing the Right to Repair home user devices</a> for years, and maintains totalitarian control over their hardware.</li>
               <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a> that rats on you to advertisers.</li>
             </ul>
           </div>
@@ -424,59 +817,6 @@ it's the laptop that's most frequently used in the FSF office!</p>
       </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."
-              </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">
@@ -716,9 +1056,10 @@ numbers, which aids in password generation and encryption.</p>
 <li><a href="https://leanpub.com/">Leanpub</a> is an author-driven ebook Web site encouraging people to &quot;publish early, publish often.&quot;</li>
 <li><a href="https://www.libreture.com/">Libreture</a> provides a catalog of DRM-free ebook publishers, and a storage solution for all of your digital books and comics.</li>
 <li><a href="https://lektu.com/">Lektu</a> provides you with an array of DRM-free media in Spanish.</li>
+<li><a href="https://nantucketebooks.com">Nantucket E-Books</a> is a DRM-free publisher and writing platform that also makes a strong commitment to software freedom. They were profiled in this season's <em>Free Software Bulletin.</em>
 <li><a href="https://nostarch.com">No Starch Press</a> offers &quot;the finest in geek entertainment,&quot; with educational books on a variety of programming topics.</li>
 <li><a href="http://www.smashwords.com">Smashwords</a> is the world's largest distributor of indie ebooks.</li>
-<li>Many free (as in freedom) educational books are available through sites like <a href="https://flossmanuals.net">FLOSS Manuals</a>, a supporter of the <a href="https://dayagainstdrm.org/">International Day Against DRM 2019</a>.</li>
+<li>Many free (as in freedom) educational books are available through sites like <a href="https://flossmanuals.net">FLOSS Manuals</a>, a supporter of the <a href="https://dayagainstdrm.org/">International Day Against DRM</a>.</li>
 <li>Looking to buy paper books? Check out the <a href="https://shop.fsf.org">GNU Press Shop</a> for your technical manuals and documentation needs.</li>
                        </ul>
                  </div>
@@ -776,7 +1117,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>
 
@@ -787,8 +1128,8 @@ numbers, which aids in password generation and encryption.</p>
           <div class="good col-md-6 col-sm-6">
             <h5 class="text-center">Stay away from: Netflix</h5>
               <ul class="cons">
-                               <li><p>Netflix is continuing its <a href="https://defectivebydesign.org/netflix">disturbing trend</a> of making onerous DRM the norm for streaming media. That's why they're a target for last year's <a href="https://dayagainstdrm.org/">International Day Against DRM (IDAD)</a>.</p>
-<li><p>They're also leveraging their newfound place in the <a href="https://torrentfreak.com/netflix-becomes-a-member-of-the-mpaa/">Motion Picture Association of America</a> (MPAA) to advocate for tighter restrictions on users, and drove the effort to embed DRM into the <a href="https://www.defectivebydesign.org/no-drm-in-html5">fabric of the Web</a>.</p</li>
+                               <li><p>Netflix is continuing its <a href="https://defectivebydesign.org/netflix">disturbing trend</a> of making onerous DRM the norm for streaming media. That's why they were a target for last year's <a href="https://dayagainstdrm.org/">International Day Against DRM (IDAD)</a>.</p>
+<li><p>They're also leveraging their place in the <a href="https://torrentfreak.com/netflix-becomes-a-member-of-the-mpaa/">Motion Picture Association of America</a> (MPAA) to advocate for tighter restrictions on users, and drove the effort to embed DRM into the <a href="https://www.defectivebydesign.org/no-drm-in-html5">fabric of the Web</a>.</p</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -809,16 +1150,19 @@ numbers, which aids in password generation and encryption.</p>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
                        <p>
-                         The FSF's long-running <strong>H-Node</strong> project has recently seen an uptick in activity, and we need your help to document how well free software runs on common devices. By registering an account on <a href="https://h-node.org">H-Node</a> and filling out listings for your hardware, you can help newcomers to the free software movement select hardware that will make thir transiton as easy as possible.
+                         The FSF's long-running <strong>h-node</strong> project has recently seen an uptick in activity, and we need your help to document how well free software runs on common devices.
+                       </p>
+                       <p>
+                         By registering an account on <a href="https://h-node.org">h-node</a> and filling out listings for your hardware, you can help newcomers to the free software movement select hardware that will make thir transition as easy as possible.
                        </p>
                  </div>
-               <div class="good col-md-6 col-sm-6" style="position:relative">
-           <h5 class="text-center">Stay away from these devices:</h5>
-            <ul class="cons">
-<li>Internet of Things connected home appliances, smart speakers, and virtual assistants are little more than spying devices brought into your home. These include Ring, Amazon Alexa, Amazon Echo, Google Home, Nest, Ecobee, and Sonos products.</li>
-<li><p>The Nintendo Switch is a popular holiday gift, but few realize that Nintendo has utter control over the platform and offers little insight into how it really works -- or how it might be spying on you and your family. Not much has changed since our advice to <a href="https://www.defectivebydesign.org/nintendo">brick them</a> before they bricked the Nintendo DS.</p></li>
-            </ul>
-          </div>
+<!--           <div class="good col-md-6 col-sm-6" style="position:relative"> -->
+<!--       <h5 class="text-center">Stay away from these devices:</h5> -->
+<!--             <ul class="cons"> -->
+<!-- <li>Internet of Things connected home appliances, smart speakers, and virtual assistants are little more than spying devices brought into your home. These include Ring, Amazon Alexa, Amazon Echo, Google Home, Nest, Ecobee, and Sonos products.</li> -->
+<!-- <li><p>The Nintendo Switch is a popular holiday gift, but few realize that Nintendo has utter control over the platform and offers little insight into how it really works -- or how it might be spying on you and your family. Not much has changed since our advice to <a href="https://www.defectivebydesign.org/nintendo">brick them</a> before they bricked the Nintendo DS.</p></li> -->
+<!--             </ul> -->
+<!--           </div> -->
           <!--End Bad-->
         </div>
         <!--End Row-->
@@ -827,28 +1171,16 @@ numbers, which aids in password generation and encryption.</p>
       <!--End bad-->
 <!-- end choices -->
 </div></section>
-      <!-- Begin Donations -->
+<!-- Begin Donations -->
       <section class="charities" id="charities">
         <div class="container">
-          <h1 class="text-center">Recommended organizations for holiday donations</h1>
-          <div class="row">
-           <div class="col-md-4 col-md-offset-4 col-sm-4 col-sm-offset-4 col-xs-6 col-xs-offset-3">
+          <h1 class="text-center">Join the FSF associate membership program</h1>
+          <div class="container choices">
+                       <div class="row is-table row">
+           <div class="col-md-4 col-md-offset-4 col-sm-4 col-sm-offset-4 col-xs-10 col-xs-offset-6" style="position:relative">
               <a href="https://www.fsf.org/"><img src="img/logo-1.png" alt="fsf" class="center-block img-responsive" /></a><br />
-<p>The Giving Guide is brought to you by the <a href="https://fsf.org">Free Software Foundation</a>. Our <a href="https://fsf.org/join">associate membership</a> program is the heart of the FSF's work campaigning for computer user freedom worldwide. We've been fighting for digital freedoms since 1985, and have no plans of stopping. Will you make your voice heard by <a href="https://fsf.org/appeal">joining today</a>?</p>
-            </div>
-          </div>
-          <div style="height: 30px"></div>
-          <div class="row">
-           <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://april.org/"><img src="img/charities/april.png" alt="April" class="center-block img-responsive" /></a>
-            </div>
-            <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://creativecommons.org/"><img src="img/charities/cc.png" alt="Creative Commons" class="center-block img-responsive" /></a>
-            </div>
-            <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://www.torproject.org/"><img src="img/charities/tor.png" alt="Tor Foundation" class="center-block img-responsive" /></a></div>
-            <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://www.wikimedia.org/"><img src="img/charities/wikimedia.png" alt="Wikimedia" class="center-block img-responsive" /></a>
+                         <p>The Giving Guide is brought to you by the <a href="https://fsf.org">Free Software Foundation</a>. Our <a href="https://fsf.org/join">associate membership</a> program is the heart of the FSF's work campaigning for computer user freedom worldwide. If you're still looking for a gift, and want to put your money towards digital freedom, please consider becoming a member or donating to another charity supported by your friend or loved one.</p>
+                         <p>We've been fighting for digital freedoms since 1985, and have no plans of stopping. The work we do year-round is work to provide more and better options for gifts: spreading the message of software freedom, as well as helping retailers do the right thing and promoting the work of those who do. It's your support that makes this work possible.</p>
             </div>
           </div>
         </div>
@@ -901,7 +1233,6 @@ 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>
-                                         <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>
@@ -926,7 +1257,7 @@ numbers, which aids in password generation and encryption.</p>
                 <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —
                   <a href="https://fsf.org/about">learn about our history and work</a>.
                 </p>
-                <p>Version 11.0. Copyright © 2004-2020
+                <p>Version 12.0. Copyright © 2004-2021
                   <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
                     Free Software Foundation
                   </a>, Inc.