www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/server/staging/fundraiser background-deskto...


From: Ineiev
Subject: www/server/staging/fundraiser background-deskto...
Date: Mon, 5 Nov 2018 23:22:36 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     Ineiev <ineiev> 18/11/05 23:22:36

Modified files:
        server/staging/fundraiser: background-desktop.1.jpg 
                                   body-include-2.html 
                                   head-include-2.html home.html 

Log message:
        Initially draft next fundraiser.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/background-desktop.1.jpg?cvsroot=www&rev=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/body-include-2.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/head-include-2.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/home.html?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: background-desktop.1.jpg
===================================================================
RCS file: /web/www/www/server/staging/fundraiser/background-desktop.1.jpg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /var/tmp/cvsUuYqOX and /var/tmp/cvsD7YxjA differ

Index: body-include-2.html
===================================================================
RCS file: /web/www/www/server/staging/fundraiser/body-include-2.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- body-include-2.html 15 Nov 2017 13:40:46 -0000      1.8
+++ body-include-2.html 6 Nov 2018 04:22:35 -0000       1.9
@@ -1,22 +1,25 @@
 <!-- start of server/body-include-2 -->
 <div id="fundraiser">
 <p>
-Associate members power up the Free Software Foundation.
-Help smash our goal of <b>700</b> new members
-or donate by December 31st!</p>
+With your help, we'll launch free software to new frontiers! Fuel the mission 
by
+becoming one of <b>400</b> new Associate Members by <b>January 1st</b> for
+<b>$10 per month</b> ($5 per month for students).</p>
+
 <p class="contribute">
-<a class="donate" 
href="http://my.fsf.org/donate?pk_campaign=2017_Fundraiser_Banner&amp;pk_kwd=Donate";>
-Donate</a>
-<a class="join" 
href="http://my.fsf.org/join?pk_campaign=2017_Fundraiser_Banner&amp;pk_kwd=Join";>
+<a class="join"
+   
href="https://fsf.org/jfb?pk_campaign=2016_Fundraiser_Banner&amp;pk_kwd=Join";>
 Join</a>
 </p>
 <div style="clear:both"></div>
 <div class="progress">
 <div class="progress-bar">
-<span class="percentage"><span class="gnun-split"></span><!--#echo 
encoding="none" var="d_value" --></span>
+<span class="percentage"><!-- TRANSLATORS: use this string
+if you need to insert something before the percentage value --><span></span>
+<span class="gnun-split"></span><!--#echo encoding="none"
+   var="percent" --> %</span>
 </div>
 <div class="goal-div">
-<span class="goal">$450,000</span>
+<span class="goal">400</span>
 </div>
 </div>
 </div> <!-- /fundraiser -->

Index: head-include-2.html
===================================================================
RCS file: /web/www/www/server/staging/fundraiser/head-include-2.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- head-include-2.html 16 Nov 2017 15:21:24 -0000      1.12
+++ head-include-2.html 6 Nov 2018 04:22:35 -0000       1.13
@@ -23,7 +23,12 @@
 div#fundraiser
 {
   direction: ltr;
-  background-color: #123e3f;
+  background-color: #30007a;
+  background-image: url("/server/staging/background-desktop-1.jpg");
+  background-position: center;
+  background-size: cover;
+  background-repeat: no-repeat;
+  overflow: hidden;
 }
 #fundraiser p
 {
@@ -66,22 +71,22 @@
 }
 .progress
 {
-  width: 99%;
+  width: 100%;
+  height: 1.2em;
   line-height: 1.2em;
   text-align: right;
-  padding-right: 1%;
-  background: #36a9aa;
+  background: #ece1ff;
   color: black;
+  font-weight: bold;
 }
 .progress-bar
 {
-  float: left;
   line-height: 1.2em;
-  padding: 0 .1em;
+  padding: 0 1em;
   margin: 0;
   min-width: 4em;
-  background: #feb916;
-  text-align: center;
+  background: #ff79ad;
+  text-align: right;
 } -->
 #fundraiser .donate, #fundraiser .join
 {
@@ -95,6 +100,12 @@
 }
 " --><!--#echo var="bar" -->
 <!--
+.goal-div
+{
+  position: relative;
+  bottom: 1.2em;
+  right: .1em;
+}
 .percentage, .goal
 {
   margin-right: .1em;

Index: home.html
===================================================================
RCS file: /web/www/www/server/staging/fundraiser/home.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- home.html   19 Nov 2016 19:04:22 -0000      1.1
+++ home.html   6 Nov 2018 04:22:35 -0000       1.2
@@ -1,6 +1,9 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
-
+<!-- Parent-Version: 1.86 -->
+   <!--#if expr="$QUERY_STRING = /distro=([^&#]+)/"
+--><!--#set var="DISTRO" value="$1"
+--><!--#else --><!--#set var="DISTRO" value="pureos8"
+--><!--#endif -->
 <title>The GNU Operating System and the Free Software Movement</title>
 
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Libre Software, Operating System, GNU 
Kernel, GNU Hurd" />
@@ -9,22 +12,11 @@
 
 <style type="text/css" media="print,screen">
 <!--
-/* === Banner === */
-#gnuhealth { display: none; }
address@hidden (min-width: 57em) {
-   #gnuhealth {
-      display: block;
-      width: 100%;
-      margin-top: 2.3em;
-   }
-}
-/* ======================= */
-
 #content {
    margin: 0;
 }
 .first-column, .second-column {
-   width: 40em; max-width: 100%;
+   width: 46em; max-width: 100%;
    margin: auto;
 }
 
@@ -35,26 +27,74 @@
 h2.first {
    margin-top: 1em;
 }
-#gnu-linux {
-   width: 30em; max-width: 100%;
+
+#gnu-linux, .thumbs {
    text-align: center;
-   margin: 0 auto 1em;
+   font-style: italic;
+   margin: 1em auto;
+}
+#gnu-linux {
+   width: 32em;
+   max-width: 100%;
+   margin: .5em auto;
+}
+.screenshot, .thumbs .image td {
+   line-height: .8em;
+   background: #444;
+   padding: .2em;
 }
-#gnu-linux img {
+.screenshot a, .thumbs .image td a {
+   color: white;
+}
+.screenshot img {
    width: 100%;
 }
-.button {
-   font-size: 1.8em;
-   margin: 1.7em 0;
+#gnu-linux p {
+   line-height: 1.2em;
+   margin: .2em 0 0;
+}
+.thumbs {
+   width: 100%;
+   display: block;
+   overflow: auto;
+   padding-bottom: .2em;
+}
+.thumbs td {
+   width: 33.3%;
+   vertical-align: top;
+   padding: .1em;
+   border: 0;
+   border-left: .5em solid white;
+}
+.thumbs td:first-child {
+   border: 0;
+}
+.thumbs .caption td  {
+   line-height: 1em;
+}
+.thumbs img {
+   width: 10em;
+   max-width: 100%;
+   min-width: 8em;
+}
+.button.left {
+   float: left;
+   margin: .7em 0;
+}
+.button.right {
+   float: right;
+   margin: 0 0 .3em;
 }
 .button a, .button a:visited {
+   font-size: 1.6em;
    padding: .4em .6em;
-   color: #a42e2b;
-   background: #eee;
-   border: .1em solid #ccc;
+   color: #b02500;
+   border: .1em solid #b02500;
+   margin: .3em 0;
 }
 .button a:hover {
    color: #777;
+   border-color: #777;
 }
 .first-column p.back {
    margin-bottom: 0;
@@ -62,11 +102,14 @@
 
 .second-column .emph-box {
    padding: 0 1.2em 1.2em;
-   margin-top: 1.5em;
+   margin-top: 2.3em;
 }
 .second-column .emph-box.white {
    background: white;
 }
+.second-column .emph-box.beige {
+   background: #faf8ed;
+}
 .second-column .emph-box .back {
    margin-top: 1em;
 }
@@ -97,6 +140,10 @@
    font-size: 1.1em;
    color: black;
 }
+.ltr {
+   direction: ltr;
+   text-align: left;
+}
 
 .clear {
    clear: both;
@@ -114,14 +161,14 @@
    margin: 0 3% 2em;
 }
 
address@hidden (min-width: 57em) {
address@hidden (min-width: 60em) {
    .first-column {
-      width: 61%;
+      width: 65%;
       float: left;
       margin: 0;
    }
    .second-column {
-      width: 33%;
+      width: 30%;
       float: right;
       margin: 0;
    }
@@ -145,28 +192,80 @@
 
 <p>GNU is an operating system that
 is <a href="/philosophy/free-sw.html">free software</a>&mdash;that is,
-it respects users' freedom.  The development of GNU made it possible
-to use a computer without software that would trample your freedom.</p>
+it respects users' freedom.  The GNU operating system consists of GNU
+packages (programs specifically released by the GNU Project) as well
+as free software released by third parties.  The development of GNU
+made it possible to use a computer without software that would trample
+your freedom.</p>
 
 <p>We recommend <a href="/distros/free-distros.html">installable
 versions of GNU</a> (more precisely, GNU/Linux distributions) which
 are entirely free software.  <a href="#More-GNU">More about GNU
 below</a>.</p>
 
-<div id="gnu-linux">
-<p class="button"><a
-   href="/distros/free-distros.html">Try GNU/Linux!</a></p>
-
-<a href="/distros/screenshot-gnewsense.html"><img
-   src="/distros/screenshots/gnewsense2-medium.jpg"
-   alt="Screenshot of GNU"/></a>
+<p class="button left">
+  <a href="/distros/free-distros.html">Try GNU/Linux</a></p>
+<div style="clear: left"></div>
+
+<div id="gnu-linux"><!--#if expr="$DISTRO = trisquel8" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/trisquel8-mate.jpg"><img
+   src="/distros/screenshots/trisquel8-mate-medium.jpg"
+   alt="&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;" /></a>
+</div>
+<p><small><a href="https://trisquel.info";>Trisquel&nbsp;8</a> with <a
+href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser (web browser),
+and Inkscape (vector graphics editor)</small></p><!--#endif
+--><!--#if expr="$DISTRO = guix" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/guixSD-gnome3.jpg"><img
+   src="/distros/screenshots/guixSD-gnome3-medium.jpg"
+   alt="&nbsp;[Screenshot of GuixSD&nbsp;0.15 with GNOME&nbsp;3 
desktop]&nbsp;" /></a>
+</div>
+<p><small><a href="/software/guix/">GuixSD&nbsp;0.15</a> with <a
+href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop, Epiphany web
+browser, Totem video player, and GNOME terminal emulator</small></p><!--#endif
+--><!--#if expr="$DISTRO = pureos8" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/pureos8-gnome3.jpg"><img
+   src="/distros/screenshots/gnome3-medium.jpg"
+   alt="&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a>
 </div>
+<p><small><a href="https://www.pureos.net/";>PureOS&nbsp;8</a> with <a
+href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop,
+PureBrowser (web browser), and Gimp (image editor)</small></p><!--#endif -->
+
+<table class="thumbs">
+ <tr class="image">
+  <td><a href="/home.html?distro=trisquel8#gnu-linux"><img
+   src="/distros/screenshots/trisquel8-mate-thumb.jpg"
+   alt="&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;" 
/></a></td>
+  <td><a href="/home.html?distro=guix#gnu-linux"><img
+   src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
+   alt="&nbsp;[Screenshot of GuixSD&nbsp;0.15 with GNOME&nbsp;3 
desktop]&nbsp;" /></a></td>
+  <td><a href="/home.html?distro=pureos8#gnu-linux"><img
+   src="/distros/screenshots/gnome3-thumb.jpg"
+   alt="&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a></td>
+ </tr>
+ <tr class="caption">
+  <td><small>Trisquel&nbsp;8 &amp; MATE</small></td>
+  <td><small>GuixSD &amp; GNOME&nbsp;3</small></td>
+  <td><small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small></td>
+ </tr>
+</table>
+</div>
+
+<p class="button right">
+  ... or <a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements";>
+Try parts of GNU</a></p>
+<div style="clear: right"></div>
 
 <h2>What is the Free Software Movement?</h2>
 
 <p>The free software movement campaigns to win for the users of
 computing the freedom that comes from free software.  Free software
-puts its users in control of their own computing.  Non-free software
+puts its users in control of their own computing.  Nonfree software
 puts its users under the power of the software's developer. See
 <a 
href="https://www.fsf.org/blogs/rms/20140407-geneva-tedx-talk-free-software-free-society";>
 the video explanation</a>.</p>
@@ -238,25 +337,26 @@
 
 <div class="second-column">
 
-<a href="http://www.gnuhealthcon.org/2016-las_palmas/";><img id="gnuhealth"
-src="/server/staging/gnuhealth/gnuhealthcon2016_small.jpg" alt="GNUHealth 
Conference 2016" /></a>
-
 <div id="Flashes" class="emph-box white">
 <h3><a href="http://planet.gnu.org/";>Planet GNU</a>
-<a href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png" 
alt="RSS Feed" /></a></h3>
-
+<a href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
+alt="RSS Feed" /></a></h3>
+<div class="ltr">
 <!--#include virtual="/planetfeeds.html" -->
+</div>
 <p>For more news, see <a href="http://planet.gnu.org/";>Planet GNU</a>
 and the list of <a href="/software/recent-releases.html">recent GNU
 releases</a>.</p>
 </div>
 
-<div id="Action" class="emph-box">
+<div id="Action" class="emph-box beige">
 <h3>Take Action</h3>
 
 <ul>
-<li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
-campaigns</a></strong>.</li>
+<li><strong>Support the efforts on net neutrality
+<a href="http://www.savetheinternet.com"; title="Net
+neutrality in the United States of America">in the USA</a></strong>,
+and in your home country.</li>
 
 <li>Defend <a href="http://www.laquadrature.net/en/Privacy";>
 privacy</a>, and support <a
@@ -264,55 +364,62 @@
 global copyright reform</a> with <a
 href="http://www.laquadrature.net/en/";>LQDN</a>.</li>
 
-<li>Support the efforts on net neutrality in Europe,
-<a href="http://www.savetheinternet.com"; title="Net
-neutrality in the United States of America">in the USA</a>
-and <a href="http://saveournet.ca/"; title="Net neutrality in
-Canada">in Canada</a>.</li>
-
-<li><strong>Fight against software patents:</strong>
-<a href="http://www.endsoftpatents.org";>worldwide</a>,
-<a href="/server/takeaction.html#swpat">and Europe</a>.</li>
+<li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
+campaigns</a></strong>.</li>
+
+<li>Fight against software patents:
+<a href="http://www.endsoftpatents.org";>worldwide</a>, and
+<a href="/server/takeaction.html#swpat">in Europe</a>.</li>
 </ul>
 
 <p class="back"><a href="/server/takeaction.html">More action items</a></p>
 </div>
 
-<div id="unmaint" class="emph-box">
+<div id="unmaint" class="emph-box beige">
 <ul>
 <li><strong>Can you contribute to any of
-these <a href="http://www.fsf.org/campaigns/priority-projects/";>High
-Priority Projects</a>?</strong> Gnash, coreboot, free distributions of
-GNU/Linux, GNU Octave, drivers for network routers, reversible
-debugging in GDB, automatic transcription, PowerVR drivers, and also
-free software replacements for Skype, OpenDWG libraries, and Oracle
-Forms.</li>
+these <a href="//www.fsf.org/campaigns/priority-projects/">High
+Priority Areas</a>?</strong> Free phone operating system;
+decentralization, federation, and self-hosting; free drivers,
+firmware, and hardware designs; real-time voice and video chat;
+encourage contribution by people underrepresented in the community,
+and more.</li>
 
 <li><strong>Can you take over an <a
 href="/server/takeaction.html#unmaint">unmaintained GNU
 package</a>?</strong>
 <span class="gnun-split"></span>
+  <a href="/software/cfengine/">cfengine</a>,
   <a href="/software/freetalk/">freetalk</a>,
   <a href="/software/halifax/">halifax</a>,
-  <a href="/software/orgadoc/">orgadoc</a><span class="gnun-split"></span>,
+  <a href="/software/mcron/">mcron</a>,
+  <a href="/software/quickthreads/">quickthreads</a><span 
class="gnun-split"></span>,
 are all <a href="/server/takeaction.html#unmaint">looking for
 maintainers</a>.  Also, these packages are looking for co-maintainers:
 <span class="gnun-split"></span>
   <a href="/software/aspell/">aspell</a>,
+  <a href="/software/bison/">bison</a>,
   <a href="/software/gnuae/">gnuae</a>,
   <a href="/software/gnubik/">gnubik</a>,
   <a href="/software/metaexchange/">metaexchange</a>,
-  <a href="/software/powerguru/">powerguru</a><span class="gnun-split"></span>.
+  <a href="/software/powerguru/">powerguru</a>,
+  <a href="/software/xboard/">xboard</a><span class="gnun-split"></span>.
 See the package web pages for more information.</li>
 </ul>
 </div>
 
 <div id="blurb" class="emph-box white">
-<p>Today's random package&hellip;</p>
+<p><strong><a href="/software/recent-releases.html">Recent GNU
+releases</a></strong></p>
+
+<p><strong><a href="/manual/blurbs.html">Short descriptions for all GNU
+packages</a></strong></p>
+
+<p style="margin-top: 2em">Today's random package&hellip;</p>
 <!--#include virtual="/server/home-pkgselect.html" -->
+<div class="ltr">
 <!--#include virtual="/server/home-pkgblurbs.html" -->
-<p class="back"><small><a href="/manual/blurbs.html">Short descriptions for 
all GNU
-packages</a></small></p>
+</div>
 </div>
 
 </div><!-- /second-column -->
@@ -325,7 +432,7 @@
 <p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> also has sister
 organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
 href="http://www.fsfla.org/";>Latin America</a> and <a
-href="http://fsf.org.in/";>India</a>.</p>
+href="http://gnu.org.in/";>India</a>.</p>
 
 <!--#include virtual="/server/fs-gang.html" -->
 
@@ -374,8 +481,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 <a
+<p>Copyright &copy; 1996-2018 <a
 href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -386,7 +492,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/11/19 19:04:22 $
+$Date: 2018/11/06 04:22:35 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]