From b8f59729b894b5b3945cb9fa9161296239cde394 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 22 Nov 2017 20:29:13 -0500 Subject: [PATCH 1/1] remove duplicate and temporary files --- v6/test.html | 1 - v7/README.md | 48 --- v7/template.html | 974 ----------------------------------------------- 3 files changed, 1023 deletions(-) delete mode 100644 v6/test.html delete mode 100644 v7/README.md delete mode 100644 v7/template.html diff --git a/v6/test.html b/v6/test.html deleted file mode 100644 index 3b18e51..0000000 --- a/v6/test.html +++ /dev/null @@ -1 +0,0 @@ -hello world diff --git a/v7/README.md b/v7/README.md deleted file mode 100644 index dc090ea..0000000 --- a/v7/README.md +++ /dev/null @@ -1,48 +0,0 @@ -# FSF Holiday Giving Guide README - -## Deployment -The git repo holding the live copy of the site is in the master branch. - -## Adding images -Make sure that, for side-by-side comparisons, both images are a similar height - -## Developing using Python -The guide is a simple static web page. To view it in your browser, -run `make` at the root of the source tree, then visit -`localhost:8000`. The `Makefile` relies on Python for starting the -development web server, but it's trivial to serve the page using the -web server of your preference if you do not have Python. - - -# Guidelines for future use ---- -## Images: - -* If it's a logo then ALWAYS export the images from its VECTOR (.svg, .eps, .pdf) source. If a vector source isn't available, use a very large image and scale it down. - -* Do not put a logo next to a product or vice-versa, Always use images with the same nature (i.e. product versus product; logo versus logo) - -* Charities' logos should be exported to 580px × 580px, transparent PNG - -* Products' images, "good" or "naughty" should be put inside transparent, square PNG files at 350px × 350px, and a padding consistent with existing images. - -## BUY/GET button - -* Copy the entire block of code including the two lines for comments before and after the Divs. - -* Paste it just after the **h5** line. - -* Append a unique string to the `id` `href` `aria-controls` of the **a** elements, as well as the `id` of the next div and the content of `document.getElementById('...')` so that all have the same text. Example: `get-iem-smartphone` `get-item-compact` ... - -* Change the content of the Anchor link **a** and its `href` attributes to link to different sellers. - -* If the product has only one source use this code instead: - -`BUY` - - -## General Best Practices - -* Resist the urge to add another list-element **li** to announce a SALE, a BONUS, or anything unrelated to being a PROS or CONS. Instead use the SALE triangle, and Bootstrap's *alert* (Check its documentation, or existing code if unsure) - -* Avoid using very long titles as they tend to wrap into multiple lines on mobile devices. Be concise. diff --git a/v7/template.html b/v7/template.html deleted file mode 100644 index 87f0b8a..0000000 --- a/v7/template.html +++ /dev/null @@ -1,974 +0,0 @@ - - - - - - - - - Ethical Tech | Giving Guide - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- large-illutration -
-
-

This version is kept as an HTML/CSS reference. It includes some small bells and whistles that were removed in the v7 launch, but might be useful later.

-

Or gifts which put someone else in control?

-

- Electronics are popular gifts, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more than they give. -

- -

The good news

-

- The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive counterparts. -

-
-
-
-
- - - -
-
-
- -
-

Share

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt. -

- #givefreely -
- - - -
-

Organize

-

- Download the printable version and organize a Giving Guide Giveaway to share it with your community. -

- Print the guide -
- - - -
-

Non-profit

-

- Donating to a nonprofit in someone's name is at least as meaningful as buying them an electronic device. -

- Donate -
- -
- -
- -
- - - -
- - -
-

Smartphones

-
-
- replicant phone -
Tehnoetic S2 with Replicant
- - - -
-
- Seller 1 - Seller 2 - -
-

- Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! -

-
- -
-
- - - - - -
    -
  • Fully free software, based on Android.
    • -
  • Supported devices include both phones and tablets.
    • -
  • Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially available Android devices ship with some proprietary software.)
    • -
-
- - -
- iphone -
iPhone
-
    -
  • Comes with no shortage of spyware.
    • -
  • - iOS is a fully proprietary operating system, giving Apple control over the software on the devices. -
    • -
  • - Apple uses DRM to block competing software. -
    • -
-
- -
- -
- - - -
- -
-
- Tehnoetic Mini - - -
-
- Seller 1 - Seller 2 - -
-

- Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! -

-
- -
-
- - - - - - -
-
-
Wi-Fi adapter: Tehnoetic Mini
-
    -
  • As free as can be: runs the FSF-endorsed Trisquel operating system and libreboot firmware on hardware that is certified to Respect Your Freedom.
    • -
  • Durable hardware is meant to last and easy to repair.
    • -
  • Created by a small business that replaces all restrictive components from a stock laptop.
    • -
-
-
- -
- - - - -
-

Full-sized Laptops

-
-
- t400 -
Minifree T400 with GNU/Linux
- - - - -
-
- Seller 1 - -
-

- Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! -

-
- -
-
- - - - - -
    -
  • As free as can be: runs the FSF-endorsed Trisquel operating system and libreboot firmware on hardware that is certified to Respect Your Freedom.
    • -
  • Durable hardware is meant to last and easy to repair.
    • -
  • Created by a small business that replaces all restrictive components from a stock laptop.
    • -
- -
- - -
- macbook -
Apple Macbook Pro with macOS
-
    -
  • Runs on proprietary software that restricts the user's freedoms.
    • -
  • - Apple's App Store uses DRM to restrict what you can do with your purchases. -
    • -
  • Comes crawling with spyware.
    • -
-
- -
- -
- - - -
-

Compact Laptops

-
-
- x200 -
Libiquity Taurinus X200 with GNU/Linux
- - - -
-
- Seller 1 - Seller 2 - -
-

- Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! -

-
- -
-
- - - - -
    -
  • As free as can be: runs the FSF-endorsed Trisquel operating system and libreboot firmware on hardware that is certified to Respect Your Freedom.
    • -
  • Durable hardware is meant to last and easy to repair.
    • -
  • Created by a small business that replaces all restrictive components from a stock laptop.
    • -
- -
- - -
- lenovo -
Lenovo U31 with Windows
- -
- -
- -
- - - -
-

3D Printers

-
-
- lulzbot -
Lulzbot Mini
- - - -
-
- Seller 1 - Seller 2 - -
-

- Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! -

-
- -
-
- - - - -
    -
  • Respects Your Freedom-certified by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.
    • -
  • Ease of use features like self-leveling and self-cleaning.
    • -
  • Hardware designs available to make modification and improvement easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.
    • -
- -
- - -
- printer -
Makerbot Replicator Mini
-
    -
  • - MakerWare software is proprietary, restricting freedom and stifling innovation. -
    • - -
  • - MakerBot was founded with a more freedom-respecting philosophy, but has since announced an increasingly proprietary approach and distanced itself from the community that formed around it. -
    • -
-
- -
- -
- - - -
-

Wi-Fi Routers

-
-
- free-router -
ThinkPenguin Router
- - - -
-
- Seller 1 - Seller 2 - -
-

- Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! -

-
- -
-
- - - - -
    -
  • - Easily separate privacy-sensitive network traffic from Internet traffic to improve security. -
    • -
  • As free as can be: runs the FSF-endorsed LibreCMC operating system on hardware that is certified to Respect Your Freedom.
    • -
- -
- - -
- router -
ISP-provided Routers
-
    -
  • - Proprietary firmware means that there's no way for you to know whether it's spying on you -- and it handles all your Internet traffic as well as local print jobs and file transfers. -
    • -
  • - Many models are subject to remote firmware updates from your Internet Service Provider, which probably does not have your best interests in mind -- these same companies fight net neutrality. -
    • -
-
- -
- -
- - - -
-

eBooks

-
-
- gutenberg -
Project Gutenberg
- - - -
-
- Seller 1 - Seller 2 - Seller 2 - Seller 2 - -
-

- Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! -

-
- -
-
- - - - -
    -
  • All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.
    • -
  • The original purveyor of eBooks free of DRM (Digital Restrictions Management), inspiring many others.
    • -
  • Enjoy the freedom to read your ebooks on any device.
    • -
-
- - -
- amazon -
Amazon.com
-
    -
  • - Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (they've done it before). -
    • -
  • - Amazon uses DRM to prevent you from sharing your favorite books with friends or moving them between readers. -
    • -
  • - Amazon openly claims - you don't actually own or control your ebooks. -
    • -
  • If you insist on purchasing from Amazon, at least designate a charity like the Free Software Foundation at smile.amazon.com to receive some of the money.
    • -
-
- -
- -
- - - -
-

Graphic Design

-
-
- GIMP and Inskacape -
GIMP and Inkscape
- - - -
-
- GIMP - Inkscape -
-
- - - - -
    -
  • Free software, with thriving developer communities.
    • -
  • Designed for free formats, but can also open files created in other programs.
    • -
  • Wide variety of plugins grants limitless features.
    • -
  • Easy to install on all major operating systems.
    • -
-
- - -
- adobe -
Photoshop and Illustrator
-
    -
  • Proprietary software controlled by Adobe.
    • -
  • Shuts down when its DRM is unable to verify the costly required subscription, even if it's actually up to date.
    • -
  • Prefers locked-down proprietary formats.
    • -
-
- -
- -
- - - -
-

Gift Cards

-
-
- fsf card -
FSF Membership Card
- - - -
-
- Seller 1 - Seller 2 - -
-

- Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! -

-
- -
-
- - - - - - -
- - -
- itunes -
iTunes Cards
-
    -
  • DRM on everything (except music) controls what you can do with your purchases. -
    • - -
  • Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.
    • - -
  • Requires proprietary software to use, even to download DRM-free music.
    • -
-
- -
- -
-
  • -

    - All the items recommended by the Free Software Foundation are RYF-Certified -

    -
    • -
    -
    - -
    - - - -
    -
    -

    Recommended organizations for holiday donations

    -
    -
    - fsf -
    -
    - sfc -
    -
    - eff -
    -
    - cc -
    -
    - wikimedia -
    -
    - sflc -
    -
    - gnome -
    -
    - ceata -
    -
    -
    -
    - - - -
    -
    -
    -
    -
    -
    -

    Licenses

    - -
    -
    -

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

    -

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

    - -
    -
    -
    - -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - -- 2.25.1