X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v10%2Fgivingguide.html;h=05f4b0e3a3bebb8bb878ae470bf826c43c348858;hp=2c5a67efe1b94e11c27b05ab3fa2ecf8776f453e;hb=20804cb92a465ab095e196438007957acd70cb55;hpb=b723463bd30e27e0bb0bc6dbb097e47c3c72f2b8 diff --git a/v10/givingguide.html b/v10/givingguide.html index 2c5a67e..05f4b0e 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 @@ -582,7 +565,7 @@ newest Apple or Google product is a great gift in itself, and one that

- Tell your friends + Tell your friends

Use the hashtag #givefreely on social media sites like Twitter, Mastodon, or GNU social. You might get a gift out of it yourself!

@@ -1095,7 +1078,7 @@ numbers, which aids in password generation and encryption.

-
+
ThinkPenguin
Stay away from: Amazon
  • Amazon is one of the most notorious DRM offenders. They use this Orwellian control over their devices and services to spy on users and keep them trapped in their "walled garden."
  • -
  • ead more about the dangers of DRM through our Defective by Design campaign.
  • +
  • Read more about the dangers of DRM through our Defective by Design campaign.
@@ -1155,7 +1138,7 @@ numbers, which aids in password generation and encryption.

DRM-free Music
    -

    Despite the efforts of companies like Spotify, we can still dance to music in the free world. Thanks to the artists, producers, record labels, and shops highlighted on Defective by Design, the rights-respecting options are nearly endless. Check out music from great labels and artists, including:

    +

    Despite the efforts of companies like Spotify, we can still dance to music in the free world. Thanks to the artists, producers, record labels, and shops highlighted on on our Guide to DRM-free Living>, the rights-respecting options are nearly endless. Check out music from great labels and artists, including:

  • All of the music on Bandcamp is DRM-free and comes in a variety of formats, including patent-free ones like FLAC and Ogg Vorbis.
  • Dischord Records, a classic punk label providing music since 1980.
  • Emusic is a DRM-free replacement for services like Spotify and Apple Music.
  • @@ -1164,7 +1147,7 @@ numbers, which aids in password generation and encryption.

    -
  • Stay away from: Spotify, iTunes, and all other major streaming services
  • +
  • Stay away from: Spotify, Apple Music, and all other major streaming services
  • Spotify is only one of many offenders when it comes to putting DRM in music: all major streaming services do this, with the support of big record labels.
  • In addition to streaming music encumbered by DRM, people who want to use Spotify are required to install additional proprietary software. Even Spotify's client for GNU/Linux relies on proprietary software.
  • Apple Music is no better, and places heavy restrictions on the music streamed through the platform.

  • @@ -1199,7 +1182,7 @@ numbers, which aids in password generation and encryption.

    Stay away from: Netflix
@@ -1318,7 +1301,37 @@ numbers, which aids in password generation and encryption.

+ +
+
+
+
+
+
+

Licenses

+
+
+

This page by the Free Software Foundation is licensed under a Creative Commons Attribution-ShareAlike 4.0. +

+

The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms:

+
+
+
+ +
+ +
+ +
+