Copying assets into 2015 again so my dev environment works.
authorZak Rogoff <zak@fsf.org>
Thu, 26 Nov 2015 01:19:11 +0000 (20:19 -0500)
committerZak Rogoff <zak@fsf.org>
Thu, 26 Nov 2015 01:19:11 +0000 (20:19 -0500)
2015/fonts/OpenSans-Bold.ttf [new file with mode: 0644]
2015/fonts/OpenSans-Regular.ttf [new file with mode: 0644]
2015/fonts/Signika-Bold.ttf [new file with mode: 0644]
2015/fonts/Signika-Light.ttf [new file with mode: 0644]
2015/fonts/Signika-Regular.ttf [new file with mode: 0644]
2015/givingguide.html
2015/js/piwik.js [new file with mode: 0644]
2015/reset.css [new file with mode: 0755]
2015/stylesheet.css [new file with mode: 0755]

diff --git a/2015/fonts/OpenSans-Bold.ttf b/2015/fonts/OpenSans-Bold.ttf
new file mode 100644 (file)
index 0000000..fd79d43
Binary files /dev/null and b/2015/fonts/OpenSans-Bold.ttf differ
diff --git a/2015/fonts/OpenSans-Regular.ttf b/2015/fonts/OpenSans-Regular.ttf
new file mode 100644 (file)
index 0000000..db43334
Binary files /dev/null and b/2015/fonts/OpenSans-Regular.ttf differ
diff --git a/2015/fonts/Signika-Bold.ttf b/2015/fonts/Signika-Bold.ttf
new file mode 100644 (file)
index 0000000..9cd28cf
Binary files /dev/null and b/2015/fonts/Signika-Bold.ttf differ
diff --git a/2015/fonts/Signika-Light.ttf b/2015/fonts/Signika-Light.ttf
new file mode 100644 (file)
index 0000000..7fa6e24
Binary files /dev/null and b/2015/fonts/Signika-Light.ttf differ
diff --git a/2015/fonts/Signika-Regular.ttf b/2015/fonts/Signika-Regular.ttf
new file mode 100644 (file)
index 0000000..5845c93
Binary files /dev/null and b/2015/fonts/Signika-Regular.ttf differ
index 64e89c3..078d4c5 100644 (file)
@@ -56,7 +56,7 @@
                         than they give. 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.
                     </p>
-                    <p>Like this guide? Download the <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">printable version</a> (translations welcome!) and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
+                    <p>Like this guide? Download the <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">printable version</a> and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
                         Guide Giveaway</a> to share it with your community. And remember: donating to a <a href="#charities">nonprofit</a> in someone's name is at least as meaningful as buying them an electronic device.</p>
                     </div>
                 </div>
                         <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware on hardware that is certified to Respect Your Freedom.</li>
                         <li>Durable hardware is meant to last and easy to repair.</li>
                         <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
-                        <li><span style="font-weight:bold">SAVE!</span> 10% off any purchase. Expires Jan 31, 2016. <a href="#libiquity-discount">Details.</a></li>
+                        <li><span style="font-weight:bold">SAVE!</span> 10% off your subtotal price, and Libiquity will donate to the FSF with each purchase. Expires Jan 31, 2016. <a href="#libiquity-discount">Details.</a></li>
+                        <li><em>Libiquity only ships in the USA. For non-US orders, buy an <a href="https://minifree.org/product/libreboot-x200/">X200 from Minifree with <a href="#minifree-discount">this discount.</a></em></li>
                     </ul>
                 </div>
 
 
                     <h4 class="title">Lenovo U31 with Windows</h4>
                     <ul>
-                        <li>Runs on proprietary software that profits from treating the user as a product -- each account is assigned an advertising ID to help Microsoft sell user data.</li>
+                        <li>Runs on proprietary software that profits from treating the user as a product -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user data.</li>
                         <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>
                         <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
                     </ul>
 
                     <h4 class="title">Lulzbot Mini</h4>
                     <ul>
+                        <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.</li>
                         <li>Ease of use features like self-leveling and self-cleaning.</li>
                         <li>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.</li>
-                        <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.</li>
-                        <li><span style="font-weight:bold">BONUS!</span> Receive a gratis reel of filament when you buy from this guide. Expires Dec 30, 2015. <a href="#lulzbot-discount">Details.</a></li>
+                        <li><span style="font-weight:bold">BONUS!</span> Receive a gratis reel of filament when you buy from this guide. Expires Jan 31st, 2015. <a href="#lulzbot-discount">Details.</a></li>
                     </ul>
                 </div>
 
                             Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done
                                 it before</a>).
                             </li>
-
                             <li>
                                 Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
                                 to prevent you from sharing your favorite books with friends or moving them between readers.
                             </li>
-
                             <li>
                                 Amazon openly claims
                                 <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
                                     ebooks.
                                 </a>
                             </li>
+<li>If you insist on
+purchasing from Amazon, at least designate a charity like the Free
+Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> to receive some of the money.</li>
                         </ul>
 
                     </div>
 
                         <h4 class="title">FSF Membership Card</h4>
                         <ul>
-                            <li>Join over 3,000 active members working to make a better world built on free software.</li>
+                            <li>Join over 3,500 active members working to make a better world built on free software.</li>
                             <li>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="https://www.libreplanet.org/conference">yearly LibrePlanet conference</a>.</li>
                             <li>Membership donations are tax-deductible in the US. For a smaller gift, <a href="https://www.fsf.org/donate">donate in a friend's name</a>.</li>
                         </ul>
                 </div>
                 <!--recommended charities-->
                 <a name="charities"><h1 class="topic_title">Recommended organizations for holiday donations</h1></a>
-                <p><a href="http://www.eff.org">Electronic Frontier Foundation</a>,
+                <p><a href="http://www.fsf.org">Free Software Foundation</a>,
+                <a href="http://www.sfconservancy.org">Software Freedom Conservancy</a>,
+<a href="http://www.eff.org">Electronic Frontier Foundation</a>,
                     <a href="http://www.creativecommons.org">Creative Commons</a>,
-                    <a href="http://wikimedia.org">Wikimedia Foundation</a>,
-                    <a href="http://www.sfconservancy.org">Software Freedom Conservancy</a>,
-                    <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a>,
-                    <a href="http://www.gnome.org">GNOME Foundation</a> and
-                    <a href="http://www.fsf.org">Free Software Foundation</a>.</p>
+                    <a href="http://wikimedia.org">Wikimedia Foundation</a>, <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a>, and <a href="http://www.gnome.org">GNOME Foundation</a>.</p>
                 </div>
                 <!-- end recommended-->
 
                     <a name="promotion-details"><h1 class="topic_title">Promotion details</h1></a>
                     <ul style="list-style: none inside none;">
 
-                        <li id="minifree-discount"><span style="font-weight: bold">Minifree:</span> Receive &euro;100 off each and every T400 or X200 laptop or D16 server board you buy. Enter the discount code FSFGIVINGGUIDE at checkout. Minifree donates &euro;20 (approx. $21) to the FSF for each purchase made with the code.</li>
+                        <li id="minifree-discount"><span style="font-weight: bold">Minifree:</span> Receive &euro;100 off each and every computer you buy. Enter the discount code FSFGIVINGGUIDE at checkout. Minifree donates &euro;20 (approx. $21) to the FSF for each purchase made with the code.</li>
                         <li id="lulzbot-discount"><span style="font-weight: bold">Lulzbot:</span>
-                            Purchase a LulzBot Mini desktop 3D printer through this guide and receive a gratis 1kg reel of standard filament. Email <a href="mailto:sales@lulzbot.com">sales@lulzbot.com</a> before purchase and mention the FSF 2015 Giving Guide to receive this promotion. Specify if you'd like HIPS, PLA, or ABS filament. Promotion subject to inventory availability.</li>
-                            <li id="thinkpenguin-discount"><span style="font-weight: bold">ThinkPenguin:</span> Use coupon code FSFGIVING15 at checkout. Appies to all items.</li>
+                            Purchase a LulzBot Mini desktop 3D printer through this guide and receive a gratis 1kg reel of standard filament. Email <a href="mailto:sales@lulzbot.com">sales@lulzbot.com</a> before or immediately after purchase and mention the FSF 2015 Giving Guide to receive this promotion. Specify if you'd like HIPS, PLA, or ABS filament. Promotion subject to inventory availability.</li>
+                            <li id="thinkpenguin-discount"><span style="font-weight: bold">ThinkPenguin:</span> Use coupon code FSFGIVING15 at checkout. Applies to all items.</li>
                             <li id="libiquity-discount"><span style="font-weight: bold">Libiquity:</span> This is a rebate, not a discount at point of sale. After purchase, email your order number to
-                                <a href="mailto:sales@libiquity.com">sales@libiquity.com</a> and mention the secret password FSFGIVING in your message. You'll receive a refund of 10% of your purchase. Applies to all items.</li>
+                                <a href="mailto:sales@libiquity.com">sales@libiquity.com</a> and mention the secret password FSFGIVING in your message. You'll receive a refund of 10% of your subtotal price. Libiquity will donate 5% of each purchase's subtotal price to the FS. Applies to all items.</li>
                             </ul>
                         </div>
                         <!-- end promotion details-->
diff --git a/2015/js/piwik.js b/2015/js/piwik.js
new file mode 100644 (file)
index 0000000..c9b8fa5
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * |@licstart The following is the entire license notice for the JavaScript code in this page.|
+
+ * Copyright 2012 Matthieu Aubry.
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see http://www.gnu.org/licenses/.
+
+ * |@licend The above is the entire license notice for the JavaScript code in this page.|
+ */
+
+    <script type="text/javascript">
+    var _paq = _paq || [];
+_paq.push(["trackPageView"]);
+_paq.push(["enableLinkTracking"]);
+
+(function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+})();
+</script>
diff --git a/2015/reset.css b/2015/reset.css
new file mode 100755 (executable)
index 0000000..ed11813
--- /dev/null
@@ -0,0 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+       margin: 0;
+       padding: 0;
+       border: 0;
+       font-size: 100%;
+       font: inherit;
+       vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+       display: block;
+}
+body {
+       line-height: 1;
+}
+ol, ul {
+       list-style: none;
+}
+blockquote, q {
+       quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+       content: '';
+       content: none;
+}
+table {
+       border-collapse: collapse;
+       border-spacing: 0;
+}
diff --git a/2015/stylesheet.css b/2015/stylesheet.css
new file mode 100755 (executable)
index 0000000..0e6aaad
--- /dev/null
@@ -0,0 +1,387 @@
+/*Typography*/
+
+@font-face {
+    font-family: 'Signika Regular';
+    src: local('Signika Regular'), url('fonts/Signika-Regular.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Signika Light';
+    src: local('Signika Light'), url('fonts/Signika-Light.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Signika Bold';
+    src: local('Signika Bold'), url('fonts/Signika-Bold.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: local('Open Sans'), url('fonts/OpenSans-Regular.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Open Sans Bold';
+    src: local('Open Sans Bold'), url('fonts/OpenSans-Bold.ttf') format('truetype');
+}
+
+/*Style common HTML tags*/
+
+html {
+    font-family: 'Open Sans', 'DejaVu Sans', Arial, sans-serif;
+    font-size: 14px;
+    line-height: 1.4;
+    color: #363636;
+    background-color: #fff;
+    width: 100%;
+}
+
+/* Type something: */
+
+a { color: #1F8A70; border-bottom: 1px solid #dbd145; text-decoration: none; }
+
+p { line-height: 1.4; margin-bottom: 1.5em; font-size: 1em; }
+
+i { font-style: italic; }
+b { font-style: oblique; }
+
+li {list-style-type: circle; padding: 0.4em 0.2em; line-height: 1.4; }
+/* ul {margin: 1em 2em 0em 4em;} */
+
+br {margin-bottom: 0.5em; margin-top: 0.5em;}
+
+h1 {  font-size: 2.20em;  font-family: 'Signika Light'; color: #2CAF8F; margin-bottom: 0.5em; margin-top: 1em; }
+h2 {  font-size: 1.75em;  font-family: 'Signika Light';        color: #2CAF8F; margin-bottom: 0.5em; margin-top: 2em; }
+h3 {  font-size: 1.625em; font-family: 'Signika Bold'; color: #484848; margin-bottom: 0.5em; margin-top: 2em; }
+h4 {  font-size: 1.375em; font-family: 'Signika Light'; color: #4d4d4d;        margin-bottom: 0.5em; margin-top: 2em; }
+h5 {  font-size: 1.25em;  font-family: 'Signika Light'; color: #4d4d4d; margin-bottom: 0.5em; margin-top: 2em; }
+h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-bottom: 0.5em; margin-top: 2em; }
+
+/*Site-specific*/
+
+  /* Header */
+
+.header {
+}
+
+/* Navbar */
+
+.header_wrapper {
+  background-color: #2CAF8F;
+  height: 486px;
+  margin: auto;
+  width: 100%;
+  /*width: 1300px;*/
+}
+
+.header a {
+  border-bottom: 0;
+}
+
+.navbar_wrapper,
+.comparisons {
+  max-width: 1300px;
+  min-width: 1110px;
+  margin: auto;
+  text-align: center;
+}
+
+.logo_wrapper {
+  padding: 1.3em;
+  float: left;
+}
+
+.join_wrapper {
+  padding: 1.2em;
+  float: right;
+  display: inline-block;
+}
+
+.logo, .join {
+  max-width: 200px;
+  min-width: 200px;
+}
+
+.share_wrapper {
+}
+
+.share {
+  position: relative;
+  bottom: 0.8em;
+  text-align: center;
+}
+
+.share a{
+  background-color: #FDD53A;
+  border-bottom: 0;
+  padding: .6em 2em;
+  font-family: 'Signika Bold';
+  font-size: 1.4em;
+  color: #2CAF8F;
+  border-radius: 50em;
+}
+
+.share a:hover {
+  background-color: #FDDE56;
+}
+
+.navbar {
+  padding: 1em;
+  height: 2.55556em;
+  display: inline-block;
+/*   float: left; */
+}
+
+.navbar li {
+  font-family: 'Signika Regular';
+  font-size: 1em;
+  background-color: white;
+  list-style-type: none;
+  border-right: 1px #9BD2BF solid;
+  padding: 0 30px 0 30px;
+  line-height: 2.6;
+  float: left;
+}
+
+.navbar li:first-child {
+  border-radius: 100px 0 0 100px;
+}
+
+.navbar li:last-child {
+  border-right: 0;
+  border-radius: 0 100px 100px 0;
+}
+
+.navbar li:hover {
+  background-color: #FFDD55;
+}
+
+.navbar li a {
+  display: block;
+  text-decoration: none;
+}
+
+.navbar li a:hover {
+  color: #4B423B;
+}
+
+.intro,
+.share {
+  max-width: 1300px;
+  min-width: 1170px;
+  margin: auto;
+}
+
+.intro_wrapper,
+.intro_img {
+  max-width: 500px;
+  min-width: 00px;
+}
+
+.intro_wrapper {
+  float: right;
+  color: white;
+  padding-right: 4em;
+}
+
+.intro_img{
+  float: left;
+  padding-left: 4em;
+}
+
+.intro_wrapper h2 {
+  color: #FFDD55;
+}
+
+.intro_wrapper a {
+  border-bottom: 1px solid #FDD53A;
+  color: #FDD53A;
+}
+
+.intro_img img{
+  padding-top: 1.7em;
+  width: 100%;
+}
+
+/* Comparisons */
+
+.wrapper,
+.section_wrapper,
+.buy_avoid,
+.recommended,
+.licenses {
+  max-width: 750px;
+  min-width: 750px;
+  margin: auto;
+}
+
+.main_title {
+  width: 100%;
+  text-align: left;
+  border-bottom: 1px solid lightgray;
+  margin-top: 3em;
+  margin-bottom: 2em;
+  display: inline-block;
+}
+
+.buy a {
+  border-bottom: none;
+}
+
+.product_img {
+  margin: auto;
+  max-width: 168px;
+  max-height: 168px;
+  position: relative;
+}
+
+.product {
+  text-align: center;
+  position: relative;
+  margin: auto;
+  display: block;
+  height: 168px;
+  width: 168px;
+  /* margin-bottom: 8em; */
+/*   max-height: 168px; */
+}
+/*
+ .proprietary .product_img:after {
+  content: "";
+  background-image: url("images/bad.png");
+  background-size: 25px;
+  background-repeat: no-repeat;
+  width: 25px;
+  height: 25px;
+  position: absolute;
+}
+
+ .free h4:after {
+  content: "";
+  background-image: url("images/good.png");
+  background-size: 25px;
+  background-repeat: no-repeat;
+  width: 25px;
+  height: 25px;
+  position: absolute;
+}
+ */
+
+
+.good,
+.bad {
+  z-index: 999;
+  width: 65px;
+  top: 8em;
+  left: 9em;
+  position: absolute;
+
+}
+
+
+.free, .proprietary {
+  text-align: center;
+}
+
+.free li,
+.proprietary li {
+  text-align: left;
+}
+
+.buy img,
+.avoid img {
+  max-width: 151px;
+  height: 42px;
+}
+
+.buy_avoid_wrapper {
+  margin-top: 2em;
+  min-width: 100%;
+  max-width: 100%;
+  display: inline-block;
+}
+
+.buy {
+  text-align: center;
+  margin: auto;
+  width: 45.555555%;
+  float: left;
+
+}
+
+.avoid {
+  text-align: center;
+  margin: auto;
+  width: 45.555555%;
+  float: right;
+}
+
+.free {
+  float: left;
+  width: 45.555555%;
+}
+
+.proprietary {
+  float: right;
+  width: 45.555555%;
+}
+
+/* Recommended Section */
+
+.topic_title {
+  border-bottom: 1px solid #2CAF8F;
+  width: 100%;
+  text-align: left;
+  margin-top: 3em;
+  display: inline-block;
+}
+
+.recommend_wrapper {
+  padding-top: 1em;
+  margin: auto;
+  width: 750px;
+}
+
+.recommended_product {
+  text-align: center;
+  width: 29%;
+  margin: 1em;
+  display: inline-block
+}
+
+.recommended_product_img {
+  width: 120px;
+}
+
+.recommend_wrapper .buy {
+  float: none;
+  text-align: center;
+  width: 100%;
+}
+
+.remark {
+  margin-top: 3em;
+  font-weight: bold;
+}
+
+/* Licenses */
+
+.licenses h1 {
+  margin-top: 0.6em;
+}
+
+/* Footer */
+
+footer {
+  display: block;
+  background-color: #1a1a1a;
+  width: 100%;
+  /*width: 1300px;*/
+}
+
+.footer_wrapper {
+  width: 750px;
+  margin: auto;
+  padding: 2em;
+  color: white;
+}