Merge branch 'master' of vcs.fsf.org:fsf-giving-guide
authorGreg Farough <gregf@fsf.org>
Wed, 27 Nov 2019 17:24:28 +0000 (12:24 -0500)
committerGreg Farough <gregf@fsf.org>
Wed, 27 Nov 2019 17:24:28 +0000 (12:24 -0500)
1  2 
v10/givingguide.html

diff --combined v10/givingguide.html
                          <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"></i> -->
+                                     <i class="fa fa-close">&#8203;</i>
                                  </div>
                                  <h2>Join us and make an impact!</h2>
                              </div>
@@@ -357,20 -357,13 +357,13 @@@ Our associate members are the heart of 
                                      </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"></i>  -->
- Renew</a>
+                                       <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"></i> Donate</a>
+                                       <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 id="fsf-modal-window-elem-maybe-later">
-                                     <a onclick="//fsfModalWindowElemMaybeLater();">maybe later</a>
-                                 </div>
-                                 -->
                              </div>
                          </div>
                      </div>
@@@ -400,9 -393,9 +393,9 @@@ function fsfModalWindowElemMaybeSwitchT
      // 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>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>';
+ <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
@@@ -412,11 -405,6 +405,6 @@@ function fsfModalWindowElemMaybeShow (
  
      var pattern, noShowFsfModalWindowElementP, now;
  
- //    now = new Date();
- //    if (now.getTime() < startTime.getTime() || now.getTime() > endTime.getTime()) {
- //        return; // don't show the fsf-modal-window-elem
- //    }
      // see if cookie says not to show element
      pattern = /showFsfFall2019FundraiserModalWindowElementP\s*=\s*false/;
      noShowFsfModalWindowElementP = pattern.test(document.cookie);
@@@ -450,6 -438,7 +438,7 @@@ function daysInFuture (plusDays) 
  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) {
  
  // hide the element from now to two weeks after closing it
  function fsfModalWindowElemDontShowForAWhile () {
-     fsfModalWindowElemDontShowForDays(14, true);
+     fsfModalWindowElemDontShowForDays(7, true);
  }
- // hide the element from now to past the date of the campaign
- //function fsfModalWindowElemDontShowAgain () {
- //    fsfModalWindowElemDontShowForDays(120, true);
- //}
- // don't show the element for a while
- //function fsfModalWindowElemMaybeLater () {
- //    fsfModalWindowElemDontShowForDays(1, true);
- //}
  // keep the element visible for now, but don't show it for a while
  function fsfModalWindowElemFollowedLink () {
      fsfModalWindowElemDontShowForDays(14, false);
  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();
  });
- //// close popup if user clicks maybe-later div
- //document.getElementById("fsf-modal-window-elem-maybe-later").addEventListener("click", function(event){
- //    fsfModalWindowElemMaybeLater();
- //});
  // 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)  {
@@@ -1095,7 -1078,7 +1078,7 @@@ numbers, which aids in password generat
                  </div>
                </noscript>
                <!-- End Buy/Download button -->
-             <div class="collapse" id="sellers-mini-adapter">
+             <div class="collapse" id="sellers-mini-adapter2">
                <div class="center-block seller-group">
                  <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
                    <p class="sale-info links">
                      </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>Purism product image licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution ShareAlike 4.0</a> license.</li>
 +                                        <li>Purism product image licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
                        <li>X200 image in the public domain.</li>
                                          <li>NeuG image licensed under the <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0</a> license.</li>
 -                      <li>ThinkPenguin images are licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution ShareAlike 4.0</a> license.</li> 
 +                      <li>ThinkPenguin images are licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li> 
                        <li>Technoethical Replicant S3 image licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
                      <li>Photo of bookshelf by <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>
                    </div>