Remove fundraiser elements
[fsf-giving-guide.git] / v10 / givingguide.html
index ffa52ec98e5807f277ff8a2a131e50174a20033e..030799f8a7092f470cf7a702a30e7821f4207849 100644 (file)
 
 <!-- Add banner and modal window here -->
 
-<iframe src="//static.fsf.org/nosvn/banners/2019fundraiser-fall/" width="100%" height="100%" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block;"></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;
-    }
-
-    #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;
-    zoom: 1;
-    padding: 20px;
-    border-style: solid;
-    border-width: 5px;
-    border-color: #ff00ff;
-    border-radius: 20px;
-    box-shadow: 0px 0px 10px #111111;
-    background-color: #19003a;
-}
-
-#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: #edd400;
-    text-shadow: 0px 0px 8px #00378c;
-    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 {
-}
-
-#fsf-modal-window-elem-buttons a {
-    width: 100%;
-    display: block;
-    text-align:center;
-    font-size:35px;
-    color:#FFFFFF;
-    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 {
-}
-
-#fsf-modal-window-elem-text a {
-    color: #edd400;
-    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: 18px;
-    font-weight: normal;
-    margin: 0px 0px 10px 0px;
-    line-height: 20px;
-    color: #ffffff;
-    text-shadow: 0px 0px 8px #4600ba;
-}
-            </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>Join us and make an impact!</h2>
-                            </div>
-                            <div id="fsf-modal-window-elem-left-column">
-                                <div id="fsf-modal-window-elem-text">
-
-<p>
-
-Our associate members are the heart of the FSF's commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.
-
-</p>
-
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN</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: 0px 0px 5px #0c2b2b;">
-                                    <div style="background-color:#ff00ff; border-top-right-radius: 20px; border-top-left-radius: 20px;">
-                                      <a style="text-shadow: 0px 0px 8px #b300b3;" href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-check-circle">&nbsp;</i>Join</a>
-                                    </div>
-
-                                    <div style="background-color:#930093">
-                                      <a style="text-shadow: 0px 0px 8px #460046;" href="https://my.fsf.org/renew?pk_campaign=frfall2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-refresh">&nbsp;</i>Renew</a>
-                                    </div>
-
-                                    <div style="background-color:#42009a; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; margin-bottom: 2px">
-                                      <a style="text-shadow: 0px 0px 8px #22004e;" href="https://my.fsf.org/donate?pk_campaign=frfall2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-money">&nbsp;</i>Donate</a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <script type="text/javascript">
-// @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('2019-11-18T04:00:00Z');
-switchTextTime = new Date('2019-12-12T04:00:00Z');
-endTime = new Date('2020-01-01T04: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; // don't switch the dbd text
-    }
-
-    // switch dbd text
-    document.getElementById("fsf-modal-window-elem-text").innerHTML =' \
-\
-<p>Our associate members are the heart of the FSF\'s commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.<\/p> \
-\
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE<\/a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN<\/a><\/span><\/p>';
-}
-
-// show fsf-modal-window-elem if it hasn't 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 = /showFsfFall2019FundraiserModalWindowElementP\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();
-// call this right away to avoid flicker
-fsfModalWindowElemMaybeShow();
-
-
-// get the time `plusDays` in the future.
-// 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 = "showFsfFall2019FundraiserModalWindowElementP=false; path=/; domain=.fsf.org; expires=" + daysInFuture(forDays);
-    document.cookie = "showFsfFall2019FundraiserModalWindowElementP=false; path=/; 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 don't show it for a while
-function fsfModalWindowElemFollowedLink () {
-    fsfModalWindowElemDontShowForDays(14, false);
-}
-
-// close popup if user clicks trasparent part
-document.getElementById("fsf-modal-window-elem-container").addEventListener("click", function(event){
-    fsfModalWindowElemDontShowForAWhile();
-});
-
-// don't 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">
@@ -535,8 +137,9 @@ window.addEventListener("keydown",  function  (event)  {
         <div class="row">
           <div class="illustration col-md-6">
                        <center>
-            <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-dblock" /><hr />
-                       <video style="width: 100%; max-width: 640px;" controls="controls" poster="https://static.fsf.org/nosvn/videos/fsf-shoetool/thumbnails/ShoeTool-Cover-1.jpg" crossorigin="anonymous"><source src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.mp4" type="video/mp4" /><track kind="subtitles" label="English" srclang="en" src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_en.vtt" default="default" /></video>
+                         <hr />
+                         <iframe src="https://static.fsf.org/nosvn/videos/fsf-heroes/" id="fsf-heroes-video" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block; width: 50%; height: 67vw; max-height: 200px;"></iframe>
+            <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-dblock" />
                        </center>
           </div>
           <div class="intro-text col-md-6">
@@ -550,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>
@@ -759,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."
@@ -1189,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>
 
@@ -1385,19 +960,26 @@ numbers, which aids in password generation and encryption.</p>
         <!-- Our JS -->
         <script src="js/magic.js" charset="utf-8"></script>
 
-        <!-- Piwik -->
-        <script type="text/javascript">
-        // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-        var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-        document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-        try {
-          var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-          piwikTracker.trackPageView();
-          piwikTracker.enableLinkTracking();
-        } catch (err) {}
-        // @license-end
-        </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-        <!-- End Piwik Tracking Code -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u = (("https:" == document.location.protocol) ? "https" : "http") + "://"+"piwik.fsf.org//";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+  // @license-end
+</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> -->
+<!-- End Piwik -->
       </body>
 
       </html>