X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v10%2Fgivingguide.html;h=6260d1438d1ee40370804059d4a09dc26e211589;hp=60752a7d8376a68cc733effe72ecab014adbc131;hb=319eae50125546db2d9c452ead9091b4e7ba8f96;hpb=cf12c5ae3577743d05041d819db36271550a2d96 diff --git a/v10/givingguide.html b/v10/givingguide.html index 60752a7..6260d14 100644 --- a/v10/givingguide.html +++ b/v10/givingguide.html @@ -333,7 +333,7 @@
- +

Join us and make an impact!

@@ -357,20 +357,13 @@ Our associate members are the heart of the FSF's commitment to a society where s
- - -Renew +  Renew
- Donate +  Donate
- @@ -400,9 +393,9 @@ function fsfModalWindowElemMaybeSwitchText () { // switch dbd text document.getElementById("fsf-modal-window-elem-text").innerHTML =' \ \ -

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.

\ +

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> \ \ -

READ MORE | JOIN

'; +

READ MORE<\/a> | JOIN<\/a><\/span><\/p>'; } // show fsf-modal-window-elem if it hasn't been previously closed by @@ -412,11 +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 @@ 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) { @@ -461,16 +450,9 @@ function fsfModalWindowElemDontShowForDays (forDays, hideNow) { // 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); @@ -480,26 +462,27 @@ function fsfModalWindowElemFollowedLink () { 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) { @@ -559,7 +542,7 @@ window.addEventListener("keydown", function (event) { to give them gifts that invade their privacy and abuse their freedom. This Giving Guide is full of gifts that you can feel good about instead.

-

When we allow proprietary software created by Facebook, Apple, Google, and countless other companies to handle our basic computing tasks, we put an enormous amount of power in their hands, power which they freely exploit. It's only through using free software, and devices running free software, that we can seize this power back.

+

When we allow proprietary software created by Facebook, Amazon, Apple, Google, and countless other companies to handle our basic computing tasks, we put an enormous amount of power in their hands, power which they freely exploit. It's only through using free software, and devices running free software, that we can seize this power back.

When picking a gift this year, we urge you to think carefully about the choice you're making. Is that smart assistant smart enough to respect your friend or family member's rights? Does that tablet really @@ -1095,7 +1078,7 @@ numbers, which aids in password generation and encryption.

-
+
ThinkPenguin
DRM-free Music