X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v10%2Fgivingguide.html;h=d353375f4c1190a6ed8aa2247b45cde96b2bd243;hp=cbed8039a010bcc49a4d2631a2bac835cdea658c;hb=e84a243b56ed16055cde313daf526607a1b17190;hpb=420a142e7ecbbbd6e6e4c6bd4983bcc6f03afc05

diff --git a/v10/givingguide.html b/v10/givingguide.html
index cbed803..d353375 100644
--- a/v10/givingguide.html
+++ b/v10/givingguide.html
@@ -99,9 +99,9 @@
 
 <!-- Add banner and modal window here -->
 
-<iframe src="//static.fsf.org/nosvn/banners/2020fundraiser-spring/" width="100%" height="100%" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block;"></iframe>
+    <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 -->
+            <!-- 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 {
@@ -211,14 +211,13 @@
 
 #fsf-modal-window-elem {
     overflow: auto;
-    zoom: 1;
     padding: 20px;
     border-style: solid;
     border-width: 5px;
-    border-color: #0f68a7;
+    border-color: #c44945;
     border-radius: 20px;
     box-shadow: 0px 0px 10px #111111;
-    background-color: #fdd474;
+    background-color: #fff2ab;
 }
 
 #fsf-modal-window-elem-header {
@@ -273,7 +272,7 @@
 #fsf-modal-window-elem-buttons a {
     width: 100%;
     display: block;
-    text-align:center;
+    text-align: center;
     font-size:35px;
     color:#002047;
     text-decoration: none;
@@ -335,57 +334,65 @@
                                 <div id="fsf-modal-window-elem-close-button" onclick="//fsfModalWindowElemDontShowForAWhile();">
                                     <i class="fa fa-close">&#8203;</i>
                                 </div>
-                                <h2>The free software community must grow in order to meet new threats.</h2>
+                                <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 now socially distant society, we can't live, work, or learn in freedom unless the software we use is free. Your membership protects everyone's digital freedoms from powerful forces using technology to disempower the public.
+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 August 7th goal of 200 new associate members!
+Join us today for $10/month ($5 for students) and help us reach our January 18 goal of 500 new associate members!
 
 </p>
 
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frspring2020&pk_kwd=learn-more&pk_source=modal">Read more</a> | <a href="https://my.fsf.org/join?pk_campaign=frspring2020&pk_source=modal">Join</a></span></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:#fb6b73; border-top-right-radius: 20px; border-top-left-radius: 20px;">
-                                      <a style="text-shadow: 0px 0px 8px #f999ef;" href="https://my.fsf.org/join?pk_campaign=frspring2020&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-check-circle">&nbsp;</i>Join</a>
+                                    <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:#fdd474">
-                                      <a style="text-shadow: 0px 0px 8px #ffffff;" href="https://my.fsf.org/renew?pk_campaign=frspring2020&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-refresh">&nbsp;</i>Renew</a>
+                                    <!--<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:#99d8fd; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; margin-bottom: 2px">
-                                      <a style="text-shadow: 0px 0px 8px #ffffff;" href="https://my.fsf.org/donate?pk_campaign=frspring2020&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-money">&nbsp;</i>Donate</a>
+                                    <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 type="text/javascript">
+                <script>
 // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-3.0
 
-// licensed GPLv3-or-later by Andrew Engelbrecht
+// Licensed GPLv3-or-later by Andrew Engelbrecht
 
 var startTime, endTime, switchTextTime;
 
-startTime = new Date('2020-07-01T04:00:00Z');
-switchTextTime = new Date('2020-08-08T04:00:00Z');
-endTime = new Date('2020-08-08T04:00:00Z');
+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
+// Possibly switch the text that is displayed in the modal window, depending
 // upon the current date.
 function fsfModalWindowElemMaybeSwitchText () {
 
@@ -393,29 +400,29 @@ function fsfModalWindowElemMaybeSwitchText () {
 
     now = new Date();
     if (now.getTime() < switchTextTime.getTime()) {
-        return; // don't switch the dbd text
+        return; // Do not switch the text
     }
 
-    // switch dbd text
+    // Switch text
     document.getElementById("fsf-modal-window-elem-text").innerHTML =' \
 \
-<p>In our now socially distant society, we can\'t live, work, or learn in freedom unless the software we use is free. Your membership protects everyone\'s digital freedoms from powerful forces using technology to disempower the public.<\/p><p>Join us today for $10\/month ($5 for students) and help us reach our August 7th goal of 200 new associate members!<\/p> \
+<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 January 18 goal of 500 new associate members!<\/p> \
 \
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frspring2020&pk_kwd=learn-more&pk_source=modal">Read more<\/a> |  <a href="https://my.fsf.org/join?pk_campaign=frspring2020&pk_source=modal">Join<\/a><\/span><\/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 hasn't been previously closed by
+// 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 = /showFsfSpring2020FundraiserModalWindowElementP\s*=\s*false/;
+    // 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
+//// Uncomment here to enable modal window hiding
     if (!noShowFsfModalWindowElementP) {
         setTimeout(function () {
             // display the element
@@ -424,14 +431,16 @@ function fsfModalWindowElemMaybeShow () {
     }
 }
 
-// call this first to set the proper text
+// Call this first to set the proper text.
 fsfModalWindowElemMaybeSwitchText();
-// call this right away to avoid flicker
-fsfModalWindowElemMaybeShow();
-
+// 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.
-// can be a fraction.
+// Get the time `plusDays` in the future.
+// This can be a fraction.
 function daysInFuture (plusDays) {
     var now, future;
 
@@ -440,56 +449,61 @@ function daysInFuture (plusDays) {
     return future.toGMTString();
 }
 
-// hide the fsf-modal-window-elem
+// 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`.
+// 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 = "showFsfSpring2020FundraiserModalWindowElementP=false; path=/; domain=.fsf.org; expires=" + daysInFuture(forDays);
-    document.cookie = "showFsfSpring2020FundraiserModalWindowElementP=false; path=/; expires=" + daysInFuture(forDays);
+    //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
+// 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
+// Keep the element visible for now, but do not show it for a while
 function fsfModalWindowElemFollowedLink () {
     fsfModalWindowElemDontShowForDays(14, false);
 }
 
-// close popup if user clicks trasparent part
+// 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();
 });
 
-// don't close popup if clicking non-trasparent part (with the text and buttons)
+// 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
+// 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
+// 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
+// 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 
+// Close popup if user presses escape key
 window.addEventListener("keydown",  function  (event)  {
     switch  (event.key)  {
         case  "Escape":
@@ -499,11 +513,10 @@ window.addEventListener("keydown",  function  (event)  {
             return;
     }
 },  true);
-
 // @license-end
                 </script>
             </div>
-            <!-- end fsf-modal-window-elem campaign element -->
+            <!-- End fsf-modal-window-elem campaign element -->
 
   <nav class="navbar navbar-default">
     <div class="container-fluid">
@@ -557,7 +570,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>