X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=v11%2Fgivingguide.html;h=881590c88f973d110f9c26fb2d152db5a4d0198f;hb=HEAD;hp=522a5b80c01d12b29215a447224d796fdd1106aa;hpb=89de56473baa5a54897a6d9bd1ac3bf0d0035049;p=fsf-giving-guide.git

diff --git a/v11/givingguide.html b/v11/givingguide.html
index 522a5b8..1e57681 100644
--- a/v11/givingguide.html
+++ b/v11/givingguide.html
@@ -20,7 +20,7 @@
   <link rel="apple-touch-icon" sizes="76x76" href="img/favicons/apple-icon-76x76.png">
   <link rel="apple-touch-icon" sizes="114x114" href="img/favicons/apple-icon-114x114.png">
   <link rel="apple-touch-icon" sizes="120x120" href="img/favicons/apple-icon-120x120.png">
-  <link rel="apple-touch-icon" sizes="144x144" href="img/favicons/apple-icon-144x144.png"> 
+  <link rel="apple-touch-icon" sizes="144x144" href="img/favicons/apple-icon-144x144.png">
   <link rel="apple-touch-icon" sizes="152x152" href="img/favicons/apple-icon-152x152.png">
   <link rel="apple-touch-icon" sizes="180x180" href="img/favicons/apple-icon-180x180.png">
   <link rel="icon" type="image/png" sizes="192x192" href="img/favicons/android-icon-192x192.png">
@@ -40,12 +40,11 @@
   <!-- Our CSS -->
   <link rel="stylesheet" href="css/master.css">
 
-
   <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
   <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
   <!--[if lt IE 9]>
-  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.2/html5shiv.js"></script>
-  <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <script src="https://static.fsf.org/nosvn/libs/html5shiv/3.7.3/html5shiv.js"></script>
+    <script src="https://static.fsf.org/nosvn/libs/respond.js/1.4.2/respond.min.js"></script>
   <![endif]-->
 
   <script>
@@ -98,425 +97,6 @@
 
 <!-- Add banner and modal window here -->
 
-    <iframe src="//static.fsf.org/nosvn/banners/2020fundraiser-fall/" 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;
-    }
-
-    #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: #c44945;
-    border-radius: 20px;
-    box-shadow: 0px 0px 10px #111111;
-    background-color: #fff2ab;
-}
-
-#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;
-    /* 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:#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 {
-}
-
-#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;
-    /* text-shadow: 0px 0px 8px #004067;*/
-}
-            </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>All aboard for software freedom!</h2>
-                            </div>
-                            <div id="fsf-modal-window-elem-left-column">
-                                <div id="fsf-modal-window-elem-text">
-
-<p>
-
-In our 35 year journey, free software has become a vital global movement for user freedom.
-
-</p>
-
-<p>
-
-Without free software, we cannot and will not have a free society. Your membership fuels the voyage forward, and will help us reach our ultimate destination: full software freedom.
-
-</p>
-
-<p>
-
-Join us today for $10/month ($5 for students) and help us reach our December 31 goal of 500 new associate members!
-
-</p>
-
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2020&pk_kwd=learn-more&pk_source=modal">Read more</a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2020&pk_source=modal">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:#c44945; border-top-right-radius: 20px; border-top-left-radius: 20px;">
-                                      <a style="text-shadow: 0px 0px 6px #e75e57;" href="https://my.fsf.org/join?pk_campaign=frfall2020&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-check-circle">&nbsp;</i>Join</a>
-                                    </div>
-
-                                    <!--<div style="background-color:#fff2ab">-->
-                                    <div style="background-color:#c8c4ff">
-                                      <a style="text-shadow: 0px 0px 4px #e75e57;" href="https://my.fsf.org/renew?pk_campaign=frfall2020&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-refresh">&nbsp;</i>Renew</a>
-                                    </div>
-
-                                    <div style="background-color:#7745a8; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; margin-bottom: 2px">
-                                      <a style="text-shadow: 0px 0px 6px #fff2ab;" href="https://my.fsf.org/donate?pk_campaign=frfall2020&pk_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('2020-11-13T04:00:00Z');
-switchTextTime = new Date('2020-12-16T04:00:00Z');
-// endTime is unused.
-endTime = new Date('2021-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; // Do not switch the text
-    }
-
-    // Switch text
-    document.getElementById("fsf-modal-window-elem-text").innerHTML =' \
-\
-<p>In our 35 year journey, free software has become a vital global movement for user freedom.<\/p><p>Without free software, we cannot and will not have a free society. Your membership fuels the voyage forward, and will help us reach our ultimate destination: full software freedom.<\/p><p>Join us today for $10\/month ($5 for students) and help us reach our December 31 goal of 500 new associate members!<\/p> \
-\
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2020&pk_kwd=learn-more&pk_source=modal">Read more<\/a> |  <a href="https://my.fsf.org/join?pk_campaign=frfall2020&pk_source=modal">Join<\/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 = /showFsfFall2020FundraiserModalWindowElementP\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 = "showFsfFall2020FundraiserModalWindowElementP=false; path=/; domain=.fsf.org; expires=" + daysInFuture(forDays);
-    document.cookie = "showFsfFall2020FundraiserModalWindowElementP=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 -->
@@ -594,7 +174,7 @@ newest Apple or Google device is a great gift in itself, and one that
 
           <!-- Begin Action -->
 		            <div class="action col-md-4 col-sm-4 text-center">
-            <a class="action-button" href="https://my.fsf.org/gift-a-membership">Support free software</a>
+            <a class="action-button" href="https://my.fsf.org/gift-a-membership">Gift a membership</a>
             <p>
          	  Freedom is the gift that keeps on giving. By giving your friend or family member an <b>FSF associate membership</b>, you can show them you care <i>and</i> benefit the cause for global software freedom.
             </p>
@@ -848,7 +428,7 @@ it's the laptop that's most frequently used in the FSF office!</p>
 	  <!--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>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.at">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>
@@ -1225,7 +805,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>
 
@@ -1428,7 +1008,7 @@ numbers, which aids in password generation and encryption.</p>
 </script>
 <!-- End Piwik Code -->
 <!-- Piwik Image Tracker -->
-<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- <noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /><noscript> -->
 <!-- End Piwik -->
       </body>