www-commits
[Top][All Lists]
Advanced

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

www/server/staging/fundraiser body-include-2.ht...


From: Ineiev
Subject: www/server/staging/fundraiser body-include-2.ht...
Date: Thu, 19 Nov 2020 07:01:55 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     Ineiev <ineiev> 20/11/19 07:01:55

Modified files:
        server/staging/fundraiser: body-include-2.html 
                                   head-include-2.html home.html 

Log message:
        New fundraiser draft.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/body-include-2.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/head-include-2.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/home.html?cvsroot=www&r1=1.5&r2=1.6

Patches:
Index: body-include-2.html
===================================================================
RCS file: /web/www/www/server/staging/fundraiser/body-include-2.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- body-include-2.html 21 Nov 2019 18:19:50 -0000      1.23
+++ body-include-2.html 19 Nov 2020 12:01:55 -0000      1.24
@@ -1,79 +1,50 @@
 <!-- start of server/body-include-2 -->
+<!-- GNUN: localize URL /server/banners/sign1.png
+  /server/banners/sign2.png /server/banners/sign3.png -->
 <div id='fundraiser'>
-<div id='stars'></div>
-<div id='stars2'></div>
-<div id='stars3'></div>
-
-<div id='fr-content'>
-<div id='title'>
-<div id="fsfs">
-<img src="/server/banners/fsfs.svg" alt="Free Software Free Society" />
-</div>
-
-<p id="text">
-  Together we have the opportunity to empower the world through the use of
-  free software.<span id='counter' 
style='color:#e8e6e3;text-decoration:none;'> The
-  only way to counter proprietary software companies and the billions of
-  dollars they use to strip user rights is through the power of your voice
-  and your generosity.</span>
-<span id="read-more"><a
-href="https://www.fsf.org/appeal?pk_campaign=frfall2019&amp;pk_kwd=learn-more&amp;pk_source=banner";>Read
 more</a></span></p>
-
-<div id="button">
-<a href="https://my.fsf.org/join?pk_campaign=frfall2019&amp;pk_source=banner";
-   class="button-member">BECOME A MEMBER</a>
-</div>
-</div><!-- #title -->
-
-<div id="progressbar">
-  <div class="bar">
-     <div class="progress"><!-- Change Value HERE Fixme -->
+  <div class="message">
+    <p>
+      <a href="https://fsf.org/appeal?pk_campaign=fall20&amp;pk_kwd=banner";>
+      Your membership fuels the voyage forward, and
+      will help us reach our ultimate destination: full software freedom.
+      Become an associate member by December 31st.
+      <span class="highlight">Read more &gt;</span></a>
+    </p>
+  </div><!-- .message -->
+  <img class="fence" src="/server/banners/fence.png" alt="" />
+  <a 
href="https://my.fsf.org/join?pk_campaign=frfall2020&amp;pk_source=banner";>
+  <img class="clouds" id="cloud1" src="/server/banners/cloud1.png" alt="" />
+  <img class="clouds" id="cloud2" src="/server/banners/cloud1.png" alt="" />
+  <img class="clouds" id="cloud3" src="/server/banners/cloud2.png" alt="" />
+  <img class="clouds" id="cloud4" src="/server/banners/cloud3.png" alt="" />
+  <img class="signs" id="sign1" src="/server/banners/sign1.png" alt="" />
+  <img class="signs" id="sign2" src="/server/banners/sign2.png" alt="" />
+  <img class="signs" id="sign3" src="/server/banners/sign3.png" alt="" />
+  <img class="signsxs" id="signxs1" src="/server/banners/sign-xs-plain.png" 
alt="" />
+  <img class="signsxs" id="signxs2" src="/server/banners/sign-xs-plain.png" 
alt="" />
+  <img class="signsxs" id="signxs3" src="/server/banners/sign-xs-plain.png" 
alt="" />
+  </a>
+  <div class="progresswidget">
+    <div class="progress">
       <div class="progress-bar">
-        <span class="percentage"><!--#echo var="joined" --> Joined</span>
-      </div>
-      <span class="goal">600 New Members</span>
+        <a 
href="https://my.fsf.org/join?pk_campaign=frfall2020&amp;pk_source=banner";>
+          <img class="train" src="/server/banners/fsf35-train.png" alt="" />
+        </a>
+        <span class="percentage"><!--#echo var="joined" --></span>
     </div>
+      <span class="goal">500 members</span>
   </div>
-</div><!-- #progressbar -->
-
-</div><!-- #fr-content -->
+  </div><!-- .progresswidget -->
 </div><!-- #fundraiser -->
+<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
+<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
 <div style="clear: both"></div>
 
-<div id="header">
-<div id="fsf-frame">
-<div id="fssbox">
-<p><a href="//www.fsf.org/fss">Free Software Supporter</a></p>
-<form action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=31";
- method="post" class="header">
- <div>
-  <input name="postURL" type="hidden" value="" />
-  <input type="hidden" name="group[25]" value="1" />
-  <input name="cancelURL" type="hidden" 
value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-  <input name="_qf_default" type="hidden" value="Edit:cancel" />
- </div>
- <p>
-  <input type="text" id="frmEmail" name="email-Primary" size="18" 
maxlength="80"
-         value="email address" onfocus="this.value=''"/>
-  <input type="submit" name="_qf_Edit_next" value="Sign up" />
- </p>
-</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
-
-<div id="gnu-banner">
- <a href="/">
- <img src="/graphics/heckert_gnu.transp.small.png"
-      alt=" [A GNU head] " /><strong>GNU</strong> Operating System</a>
-
-</div><!-- /gnu-banner -->
-<div style="clear:both"></div>
-</div><!-- /header -->
-
 <div id="navigation">
+ <a id="more-links" href="#navigation" title="More...">
+   <span>Site navigation</span></a>
+ <a id="less-links" href="#content"><b>Skip</b></a>
  <ul>
-<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
-<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
 <!--#if expr="$REQUEST_URI = /^\/gnu\//" -->
   <li id="tabAboutGNU" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
@@ -134,6 +105,16 @@
 <!--#else -->
   <li id="tabDoc"><a href="/doc/doc.html">DOCS</a></li>
 <!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/proprietary\//" -->
+  <li id="tabMalware" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/proprietary/proprietary.html">MALWARE</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+  <li id="tabMalware"><a href="/proprietary/proprietary.html">MALWARE</a></li>
+<!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/help\//" -->
   <li id="tabHelp" class="active">
     <!--#echo encoding="none" var="MARK_START" -->
@@ -144,9 +125,30 @@
 <!--#else -->
   <li id="tabHelp"><a href="/help/help.html">HELP&nbsp;GNU</a></li>
 <!--#endif -->
-  <li id="more-links"><a href="#fsf-links">More &#9660;</a></li>
+<!--#if expr="$REQUEST_URI = /^\/graphics\//" -->
+  <li id="tabArt" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/graphics/graphics.html">GNU&nbsp;ART</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+  <li id="tabArt"><a href="/graphics/graphics.html">GNU&nbsp;ART</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/people\//" -->
+  <li id="tabPeople" class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/people/people.html">GNU'S&nbsp;WHO?</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+  <li id="tabPeople"><a href="/people/people.html">GNU'S&nbsp;WHO?</a></li>
+<!--#endif -->
+  <li><a href="/server/sitemap.html">SITEMAP</a></li>
+  <li><a href="//directory.fsf.org">SOFTWARE&nbsp;DIRECTORY</a></li>
+  <li><a href="https://h-node.org/";>HARDWARE</a></li>
  </ul>
- <div style="clear:both"></div>
-</div><!--  /navigation -->
+ <div style="clear: both"></div>
+</div><!-- /"navigation -->
 <!-- end of server/body-include-2 -->
-

Index: head-include-2.html
===================================================================
RCS file: /web/www/www/server/staging/fundraiser/head-include-2.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- head-include-2.html 15 Jul 2020 12:40:33 -0000      1.40
+++ head-include-2.html 19 Nov 2020 12:01:55 -0000      1.41
@@ -1,8 +1,11 @@
+<!-- start of head-include-2.html -->
 <meta name="viewport" content="width=device-width, initial-scale=1" />
+<!--#include virtual="/server/banners/fundraiser-style.html" -->
 <style type="text/css" media="screen">
-@media (min-width: 0) {
-   a#more-links:after { content: "More\00A0\002B9F"; }
-   a#less-links:after { content: "\002B9D"; }
+<!-- TRANSLATORS: Change direction to rtl if you translate
+     the fundraiser and your script is right-to-left.  -->
+.fundraiser {
+  direction: ltr;
 }
 </style>
-<!--#include virtual="/server/banners/fundraiser-style.html" -->
+<!-- end of head-include-2.html -->

Index: home.html
===================================================================
RCS file: /web/www/www/server/staging/fundraiser/home.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- home.html   12 Jun 2019 08:43:59 -0000      1.5
+++ home.html   19 Nov 2020 12:01:55 -0000      1.6
@@ -1,8 +1,8 @@
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!--#include virtual="/server/html5-header.html" -->
+<!-- Parent-Version: 1.92 -->
    <!--#if expr="$QUERY_STRING = /distro=([^&#]+)/"
 --><!--#set var="DISTRO" value="$1"
---><!--#else --><!--#set var="DISTRO" value="guix"
+--><!--#else --><!--#set var="DISTRO" value="trisquel"
 --><!--#endif -->
 <title>The GNU Operating System and the Free Software Movement</title>
 
@@ -12,18 +12,15 @@
 
 <style type="text/css" media="print,screen">
 <!--
+blockquote.highlight-para { margin: 1.5em 0 0; }
+
 .first-column, .second-column {
    width: 46em; max-width: 100%;
    margin: auto;
 }
 
-h2 {
-   color: #333;
-   margin: 1.2em 0 .9em;
-}
-h2.first {
-   margin-top: 1em;
-}
+h2 { margin: 1.2em 0 .8em; }
+h2.first { margin-top: .9em; }
 
 #gnu-linux, .thumbs {
    text-align: center;
@@ -35,14 +32,17 @@
    max-width: 100%;
    margin: .5em auto;
 }
-.screenshot, .thumbs .image td {
+.screenshot {
    line-height: .8em;
    background: #444;
    padding: .2em;
 }
-.screenshot a, .thumbs .image td a {
+.screenshot a {
    color: white;
 }
+.screenshot a[href]:hover, .thumbs a[href]:hover {
+   background-color: transparent;
+}
 .screenshot img {
    width: 100%;
 }
@@ -50,50 +50,53 @@
    line-height: 1.2em;
    margin: .2em 0 0;
 }
-.thumbs {
+div.thumbs {
+   display: inline-block;
    width: 100%;
-   display: block;
+   white-space: nowrap;
    overflow: auto;
-   padding-bottom: .2em;
+   padding-bottom: .8em;
 }
-.thumbs td {
-   width: 33.3%;
+div.thumbs div {
+   display: inline-block;
    vertical-align: top;
-   padding: .1em;
-   border: 0;
-   border-left: .5em solid white;
+   white-space: normal;
+   width: 8em;
+   margin: 0 2px;
 }
-.thumbs td:first-child {
-   border: 0;
-}
-.thumbs .caption td  {
-   line-height: 1em;
-}
-.thumbs img {
-   width: 10em;
-   max-width: 100%;
-   min-width: 8em;
+div.thumbs img {
+   width: 100%;
+   border: 1px solid #444;
 }
-p.btn-left a, p.btn-right a,
- p.btn-left a:visited, p.btn-right a:visited {
+.btn-left a[href], .btn-right a[href] {
+   display: inline-block;
+   text-align: center;
+   font-family: "Noto Sans Display", "Noto Sans", "Liberation Sans", 
sans-serif;
    font-size: 1.6em;
-   padding: .4em .6em;
+   font-weight: bold;
+   text-decoration: none;
+   padding: .4em .6em .5em;
    color: #b02500;
+   background: white;
    border: .1em solid #b02500;
-   margin: .3em 0;
+   border-radius: .3em;
+}
+.btn-left a[href]:hover, .btn-right a[href]:hover {
+   text-decoration: none;
+   color: #a42e2b;
+   background: #f6e5e1;
+   border-color: #a42e2b;
 }
-p.btn-left {
+.btn-left {
    float: left;
-   margin: .7em 0;
+   margin: 2em 0;
 }
-p.btn-right {
+.btn-right {
    float: right;
-   margin: 0 0 .3em;
-}
-p.button a:hover {
-   color: #777;
-   border-color: #777;
+   margin: 2em 0 1.5em;
 }
+.btn-right a { margin-left: .7em; }
+
 .first-column p.back {
    margin-bottom: 0;
 }
@@ -116,7 +119,12 @@
 }
 h3 img {
    height: .8em;
-   margin-left: .5em;
+   vertical-align: middle;
+   padding: 0 .5em .2em;
+   background: white;
+}
+#Flashes h3 a {
+   background: none;
 }
 #blurb h4 {
    text-align: left;
@@ -155,6 +163,7 @@
    padding: 0 3% 2em;
    margin: 0;
 }
+video track a[href] { color: white; }
 
 @media (min-width: 60em) {
    .first-column {
@@ -172,6 +181,23 @@
    }
 }
 -->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
+.btn-left {
+   float: right;
+}
+.btn-right {
+   float: left;
+}
+@media (min-width: 60em) {
+   .first-column {
+      float: right;
+   }
+   .second-column {
+      float: left;
+   }
+}-->
+<!--#endif -->
 </style>
 <!--#include virtual="/server/fs-gang-definitions.html" -->
 <!--#include virtual="/po/home.translist" -->
@@ -183,6 +209,32 @@
 <div id="home">
 <div class="first-column">
 
+<div style="max-width: 40em; margin: 2.3em auto 0">
+<video width="100%" controls="controls" crossorigin="anonymous"
+poster="https://static.fsf.org/nosvn/videos/fsf-rewind/thumbnails/Rewind-7.jpeg";>
+
+<source
+src="https://static.fsf.org/nosvn/videos/fsf-rewind/videos/FSF-Rewind-720p.webm";
 type="video/webm" />
+<source
+src="https://static.fsf.org/nosvn/videos/fsf-rewind/videos/FSF-Rewind-720p.ogv";
 type="video/ogg" />
+<source
+src="https://static.fsf.org/nosvn/videos/fsf-rewind/videos/FSF-Rewind-720p.mp4";
 type="video/mp4" />
+
+<track kind="subtitles" label="English" srclang="en"
+src="https://static.fsf.org/nosvn/videos/fsf-rewind/captions/fsfrewind_en.vtt"; 
default="default" />
+<track kind="subtitles" label="German" srclang="de"
+src="https://static.fsf.org/nosvn/videos/fsf-rewind/captions/fsfrewind_de.vtt"; 
default="default" />
+<track kind="subtitles" label="Spanish" srclang="es"
+src="https://static.fsf.org/nosvn/videos/fsf-rewind/captions/fsfrewind_es.vtt"; 
default="default" />
+<track kind="subtitles" label="Persian" srclang="fa"
+src="https://static.fsf.org/nosvn/videos/fsf-rewind/captions/fsfrewind_fa.vtt"; 
default="default" />
+</video>
+</div>
+
+<p class="c">
+<a 
href="https://www.fsf.org/blogs/community/watch-and-share-rewind-to-help-explain-free-software";>
+Rewind: A video from the FSF</a></p>
+
 <h2 class="first">What is GNU?</h2>
 
 <p>GNU is an operating system that
@@ -198,19 +250,19 @@
 are entirely free software.  <a href="#More-GNU">More about GNU
 below</a>.</p>
 
-<p class="button btn-left">
-  <a href="/distros/free-distros.html">Try GNU/Linux</a></p>
-<div style="clear: left"></div>
+<div class="btn-left">
+  <a href="/distros/free-distros.html">Try GNU/Linux</a></div>
+<div style="clear:both"></div>
 
-<div id="gnu-linux"><!--#if expr="$DISTRO = trisquel8" -->
+<div id="gnu-linux"><!--#if expr="$DISTRO = dragora" -->
 <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
+ <a href="/distros/screenshots/dragora-ice.png"><img
+   src="/distros/screenshots/dragora-ice.png"
+   alt="&nbsp;[Screenshot of Dragora&nbsp;3.0-beta1 with IceWM window 
manager]&nbsp;" /></a>
+</div>
+<p><small><a href="https://dragora.org/en/index.html";>
+Dragora&nbsp;3.0-beta1</a> with customized <a href="https://ice-wm.org/";>
+IceWM</a> window manager</small></p><!--#endif
 --><!--#if expr="$DISTRO = guix" -->
 <div class="screenshot">
  <a href="/distros/screenshots/guixSD-gnome3.jpg"><img
@@ -220,7 +272,25 @@
 <p><small><a href="/software/guix/">Guix&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" -->
+--><!--#if expr="$DISTRO = hyperbola" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/hyperbola-i3.png"><img
+   src="/distros/screenshots/hyperbola-i3.png"
+   alt="&nbsp;[Screenshot of Hyperbola with i3 window manager]&nbsp;" /></a>
+</div>
+<p><small><a href="https://www.hyperbola.info/";>
+Hyperbola&nbsp;0.3</a> with <a href="https://i3wm.org/";>i3 window manager</a>,
+cool-retro-term (terminal emulator), Gimp (image editor), and Iceweasel-UXP 
(web
+browser)</small></p><!--#endif
+--><!--#if expr="$DISTRO = parabola" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/parabola2020-lxde.jpg"><img
+   src="/distros/screenshots/parabola2020-lxde-medium.jpg"
+   alt="&nbsp;[Screenshot of Parabola with LXDE desktop]&nbsp;" /></a>
+</div>
+<p><small><a href="https://www.parabola.nu";>Parabola&nbsp;2020</a> with <a
+href="http://lxde.sourceforge.net/about.html";>LXDE 
desktop</a></small></p><!--#endif
+--><!--#if expr="$DISTRO = pureos" -->
 <div class="screenshot">
  <a href="/distros/screenshots/pureos8-gnome3.jpg"><img
    src="/distros/screenshots/gnome3-medium.jpg"
@@ -228,33 +298,72 @@
 </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 -->
+PureBrowser (web browser), and Gimp (image editor)</small></p><!--#endif
+--><!--#if expr="$DISTRO = trisquel" -->
+<div class="screenshot">
+ <a href="https://trisquel.info/files/screenshots/etiona-media.jpg";><img
+   src="/distros/screenshots/trisquel9-mate.jpg"
+   alt="&nbsp;[Screenshot of Trisquel&nbsp;9 with MATE desktop]&nbsp;" /></a>
+</div>
+<p><small><a href="https://trisquel.info";>Trisquel&nbsp;9</a> with <a
+href="https://mate-desktop.org/";>MATE</a> desktop, and VLC media
+player</small></p><!--#endif -->
+</div>
+
+<div class="thumbs">
+ <div>
+  <a href="/home.html?distro=dragora#gnu-linux"><img
+   src="/distros/screenshots/dragora-ice-thumb.jpg"
+   alt="&nbsp;[Screenshot of Dragora&nbsp;3.0-beta1 with IceWM window 
manager]&nbsp;" /></a>
+  <span class="gnun-split"></span>
+  <small>Dragora / IceWM</small>
+ </div>
 
-<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
+ <div>
+  <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
+   alt="&nbsp;[Screenshot of Guix&nbsp;0.15 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a>
+  <span class="gnun-split"></span>
+  <small>Guix / GNOME3</small>
+ </div>
+
+ <div>
+  <a href="/home.html?distro=hyperbola#gnu-linux"><img
+   src="/distros/screenshots/hyperbola-i3-thumb.jpg"
+   alt="&nbsp;[Screenshot of Hyperbola&nbsp;0.3 with i3 window manager]&nbsp;" 
/></a>
+  <span class="gnun-split"></span>
+  <small>Hyperbola / i3</small>
+ </div>
+
+ <div>
+  <a href="/home.html?distro=parabola#gnu-linux"><img
+   src="/distros/screenshots/parabola2020-lxde-thumb.jpg"
+   alt="&nbsp;[Screenshot of Parabola&nbsp;2020 with LXDE desktop]&nbsp;" 
/></a>
+  <span class="gnun-split"></span>
+  <small>Parabola / LXDE</small>
+ </div>
+
+ <div>
+  <a href="/home.html?distro=pureos#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>Guix &amp; GNOME&nbsp;3</small></td>
-  <td><small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small></td>
- </tr>
-</table>
+   alt="&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a>
+  <span class="gnun-split"></span>
+  <small>PureOS / GNOME3</small>
+ </div>
+
+ <div>
+  <a href="/home.html?distro=trisquel#gnu-linux"><img
+   src="/distros/screenshots/trisquel9-mate-thumb.jpg"
+   alt="&nbsp;[Screenshot of Trisquel&nbsp;9 with MATE desktop]&nbsp;" /></a>
+  <span class="gnun-split"></span>
+  <small>Trisquel / MATE</small>
+ </div>
 </div>
 
-<p class="button btn-right">
-  ... or <a
+<div class="btn-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>
+Try parts of GNU</a></div>
+<div style="clear:both"></div>
 
 <h2>What is the Free Software Movement?</h2>
 
@@ -334,6 +443,21 @@
 
 <div class="second-column">
 
+<div class="emph-box beige">
+<p><strong>The GNU Project supports the Free Software Foundation's 
+petition to call on school administrators around the world to stop 
+requiring students to run nonfree software. <a
+href="https://my.fsf.org/give-students-userfreedom";>Sign the petition
+for freedom in the classroom</a></strong>.</p>
+</div>
+
+<div class="emph-box beige">
+<p><strong>The GNU Project strongly urges the community to communicate in 
+ways that are friendly, welcoming and kind. See the 
+<a href="/philosophy/kind-communication.html">
+GNU Kind Communications Guidelines</a></strong>.</p>
+</div>
+
 <div id="Flashes" class="emph-box white">
 <h3><a href="https://planet.gnu.org/";>Planet GNU</a>
 <a href="https://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
@@ -341,9 +465,6 @@
 <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 beige">
@@ -390,6 +511,7 @@
 <ul>
 <li><span class="gnun-split"></span>
   <a href="/software/cfengine/">cfengine</a>,
+  <a href="/software/freedink/">freedink</a>,
   <a href="/software/freetalk/">freetalk</a>,
   <a href="/software/halifax/">halifax</a>,
   <a href="/software/mcron/">mcron</a>,
@@ -434,7 +556,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://gnu.org.in/";>India</a>.<br />
+href="http://fsf.org.in/";>India</a>.<br />
 Feel free to join them!</p>
 
 <!--#include virtual="/server/fs-gang.html" -->
@@ -484,7 +606,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996-2019 <a
+<p>Copyright &copy; 1996-2020 <a
 href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -495,7 +617,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/06/12 08:43:59 $
+$Date: 2020/11/19 12:01:55 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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