[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging body-include-1.html body-inc...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging body-include-1.html body-inc... |
|
Date: |
Wed, 27 Nov 2019 06:16:09 -0500 (EST) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 19/11/27 06:16:09
Modified files:
server/staging : body-include-1.html body-include-2.html
head-include-2.html education-menu.html
edu-software.html
server/staging/nav-bar/test9: edu-software-tuxpaint.html
Added files:
server/staging : education.css
Log message:
Education menu on the left.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-1.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-2.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/head-include-2.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education-menu.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-software.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.22&r2=1.23
Patches:
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-1.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- body-include-1.html 10 Dec 2015 15:39:36 -0000 1.2
+++ body-include-1.html 27 Nov 2019 11:16:08 -0000 1.3
@@ -8,77 +8,6 @@
value='<a href="/server/select-language.html?callback=$cb" rel="nofollow">'
-->
<!--#set var="closing_anchor" value='</a>' -->
-<style type="text/css" media="print,screen">
-<!--
-div.fundraiser {
- padding: .3em 1.5%;
- background-color: #ffc;
- border-bottom: .3em solid white;
-}
-.fundraiser a {
- color: blue;
-}
-div.donate_btn {
- float: right;
- margin: 1.5em 0 0 1.5em;
-}
-
-.crm-amount-high {
- clear-both;
- float: right; padding-right: .3em;
-}
-.crm-amount-bar {
- border-radius: .5em;
- background-color:#334683;
- color: white;
- border: .1em solid #222;
- margin-bottom: .5em;
-}
-.crm-amount-fill {
- background: #f2cd5f;
- color: black;
- border-radius: .5em;
- padding-right: .3em; padding-left: .3em;
- width: 15.335555555556%;
-}
-.donate_btn a{
- display: block;
- text-decoration: none;
- font-weight:bold;
- padding: 0.4em 1em;
- color: black;
- background-color: #f2cd5f;
- text-align: center;
- border: .1em solid #CCA832;
- border-radius: .5em;
-}
-@media (max-width: 30em) {
- .fundraiser {
- display: none;
- }
-}
--->
-</style>
-<div class="fundraiser">
-<div class="donate_btn">
-<p><a href="https://donate.fsf.org";>Donate Now</a></p>
-</div>
-
-<p><strong>For thirty years, the Free Software Foundation has been
-seen as a guiding light for the free software movement, fighting for
-user freedom.</strong></p>
-
-<p><a href="//www.fsf.org/appeal/">Help keep our light burning
-brightly</a> by donating to push us towards our goal of raising
-$450,000 by <i>January 31st</i>.</p>
-
-<div class="crm-amount-bar"><div class="crm-amount-high">$450k</div>
-<div class="crm-amount-fill"><div
-class="crm-amount-low">69k
-so far</div></div>
-</div><!-- /crm-amount-bar -->
-</div><!-- /fundraiser -->
-
<div id="toplinks">
<a href="#content">Skip to main text</a>
<span class="gnun-split"></span>
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-2.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- body-include-2.html 11 Dec 2015 06:36:34 -0000 1.3
+++ body-include-2.html 27 Nov 2019 11:16:08 -0000 1.4
@@ -1,30 +1,12 @@
<!-- start of server/body-include-2 -->
-<div class="fundraiser">
-<div class="donate_btn">
-<p><a href="https://donate.fsf.org";>Donate Now</a></p>
-</div>
-
-<p><strong>For thirty years, the Free Software Foundation has been
-seen as a guiding light for the free software movement, fighting for
-user freedom.</strong></p>
-
-<p><a href="//www.fsf.org/appeal/">Help keep our light burning
-brightly</a> by donating to push us towards our goal of raising
-$450,000 by <i>January 31st</i>.</p>
-
-<div class="crm-amount-bar"><div class="crm-amount-high">$450k</div>
-<div class="crm-amount-fill"><div
-class="crm-amount-low"><!--#echo var="amount" -->k
-so far</div></div>
-</div><!-- /crm-amount-bar -->
-</div><!-- /fundraiser -->
+<div style="clear: both"></div>
<div id="header">
<div id="fsf-frame">
-<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
-<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post">
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p><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&gid=31";
+ method="post" class="header">
<div>
<input name="postURL" type="hidden" value="" />
<input type="hidden" name="group[25]" value="1" />
@@ -42,24 +24,90 @@
<div id="gnu-banner">
<a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] "
/><strong>GNU</strong> Operating System</a>
-</div><!-- /gnu-banner -->
-
+ <img src="/graphics/heckert_gnu.transp.small.png"
+ alt=" [A GNU head] " /><strong>GNU</strong> Operating System</a>
<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
-
+</div><!-- /gnu-banner -->
+<div style="clear:both"></div>
</div><!-- /header -->
<div id="navigation">
-
<ul>
- <li id="tabAboutGNU"><a href="/gnu/gnu.html">About GNU</a></li>
- <li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">Philosophy</a></li>
- <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
- <li id="tabEducation"><a href="/education/education.html">Education</a></li>
- <li id="tabSoftware"><a href="/software/software.html">Software</a></li>
- <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
- <li id="tabHelp"><a href="/help/help.html">Help GNU</a></li>
+<!--#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" -->
+ <a href="/gnu/gnu.html">ABOUT GNU</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabAboutGNU"><a href="/gnu/gnu.html">ABOUT GNU</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/philosophy\//" -->
+ <li id="tabPhilosophy" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/philosophy/philosophy.html">PHILOSOPHY</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">PHILOSOPHY</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/licenses\//" -->
+ <li id="tabLicenses" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/licenses/licenses.html">LICENSES</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabLicenses"><a href="/licenses/licenses.html">LICENSES</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/education\//" -->
+ <li id="tabEducation" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/education/education.html">EDUCATION</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabEducation"><a href="/education/education.html">EDUCATION</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/software\//" -->
+ <li id="tabSoftware" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/software/software.html">SOFTWARE</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabSoftware"><a href="/software/software.html">SOFTWARE</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/(doc|manual)\//" -->
+ <li id="tabDoc" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/doc/doc.html">DOCS</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabDoc"><a href="/doc/doc.html">DOCS</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/help\//" -->
+ <li id="tabHelp" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/help/help.html">HELP GNU</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabHelp"><a href="/help/help.html">HELP GNU</a></li>
+<!--#endif -->
+ <li id="more-links"><a href="#fsf-links">More ▼</a></li>
</ul>
-
+ <div style="clear:both"></div>
</div><!-- /navigation -->
<!-- end of server/body-include-2 -->
+
Index: head-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/head-include-2.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- head-include-2.html 12 Dec 2015 07:08:52 -0000 1.8
+++ head-include-2.html 27 Nov 2019 11:16:08 -0000 1.9
@@ -1,89 +1,3 @@
<!-- start of head-include-2.html -->
<meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="stylesheet" href="/combo.css" media="screen" />
-<link rel="stylesheet" href="/mini.css" media="handheld" />
-<link rel="stylesheet" href="/layout.min.css" media="screen" />
-<link rel="stylesheet" href="/print.min.css" media="print" />
-<style type="text/css" media="print,screen">
-<!--#include virtual="/server/banners/sofar.html"
- --><!--#set
- var="crm_amount_fill"
- value=".crm-amount-fill {
- background: #f2cd5f;
- color: black;
- border-radius: 1em;
- padding-right: .3em; padding-left: .3em;
- width: $percent%;
-}
-"
---><!--#echo var="crm_amount_fill"
---><!--#if expr="$LANGUAGE_PREFIX = /[.](ar|fa|he)/"
- --><!--#set
- var="crm_floats"
- value=".crm-amount-high {
- float: left;
-}
-div.donate_btn {
- float: left;
-}"
- --><!--#else --><!--#set
- var="crm_floats"
- value=".crm-amount-high {
- float: right;
-}
-div.donate_btn {
- float: right;
-}"
- --><!--#endif --><!--#echo var="crm_floats" -->
-</style>
-<style type="text/css" media="print,screen">
-<!--
-div.fundraiser {
- font-family: "FreeSans", sans-serif;
- padding: .5em 1.5% .5em 1.5%;
- background-color: #ced7ff;
- background: -webkit-linear-gradient(#b4c2ff, white);
- background: -o-linear-gradient(#b4c2ff, white);
- background: -moz-linear-gradient(#b4c2ff, white);
- background: linear-gradient(#b4c2ff, white);
- border-top: .2em solid #5272fd;
-}
-.fundraiser a {
- color: black;
-}
-.crm-amount-high {
- float: right;
- padding: 0 .3em;
- background-color: #4a5a6a;
- border-radius: 1em;
-}
-.crm-amount-bar {
- border-radius: 1em;
- background-color: #778796;
- color: white;
- border: .1em solid #4a5a6a;
- margin-bottom: .5em;
-}
-div.donate_btn {
- float: right;
- margin: 1.5em 0 0 1.5em;
-}
-.donate_btn a{
- display: block;
- text-decoration: none;
- font-weight:bold;
- padding: 0.4em 1em;
- color: black;
- background-color: #f2cd5f;
- text-align: center;
- border: .1em solid #CCA832;
- border-radius: 1em;
-}
-@media (max-width: 30em) {
- .fundraiser {
- display: none;
- }
-}
--->
-</style>
<!-- end of head-include-2.html -->
Index: education-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/education-menu.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- education-menu.html 8 Apr 2019 13:38:08 -0000 1.1
+++ education-menu.html 27 Nov 2019 11:16:08 -0000 1.2
@@ -1,65 +1,128 @@
-<div id="education-content">
-<ul id="edu-navigation">
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-contents/" -->
- <li class="active">
+<div id="navlinks">
+<p style="display: none"><a href="#start-article">Skip directory
contents</a></p>
+<h3>Education</h3>
+<ul>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-contents/" -->
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/edu-contents.html">Contents</a>
+ <a class="active navbar"
href="/education/edu-contents.html#main-heading">Contents</a>
<span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a class="navbar"
href="/education/edu-contents.html#main-heading">Contents</a><!--#endif -->
</li>
-<!--#else -->
- <li><a href="/education/edu-contents.html">Contents</a></li>
-<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-cases/" -->
- <li class="active">
+ <li><!--#if expr="$REQUEST_URI = /\/edu-cases/" -->
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/edu-cases.html">Case Studies</a>
+ <a class="active navbar"
href="/education/edu-cases.html#main-heading">Case studies</a>
<span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a class="navbar" href="/education/edu-cases.html#main-heading">Case
studies</a><!--#endif -->
+ <ul>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-cases-argentina/" -->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a
href="/education/edu-cases-argentina.html#main-heading">Argentina</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a
href="/education/edu-cases-argentina.html#main-heading">Argentina</a><!--#endif
-->
+ <ul>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-cases-argentina-ecen[.]/" -->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a class="active"
href="/education/edu-cases-argentina-ecen.html#main-heading">ECEN</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a
href="/education/edu-cases-argentina-ecen.html#main-heading">ECEN</a><!--#endif
-->
+ </li>
+ </ul>
+ </li>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-cases-india/" -->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a class="active"
href="/education/edu-cases-india.html#main-heading">India</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a
href="/education/edu-cases-india.html#main-heading">India</a><!--#endif -->
+ <ul>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-cases-india-ambedkar/" -->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a class="active"
href="/education/edu-cases-india-ambedkar.html#main-heading">Ambedkar</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a
href="/education/edu-cases-india-ambedkar.html#main-heading">Ambedkar</a><!--#endif
-->
+ </li>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-cases-india-irimpanam/" -->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a class="active"
href="/education/edu-cases-india-irimpanam.html#main-heading">Irimpanam</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a
href="/education/edu-cases-india-irimpanam.html#main-heading">Irimpanam</a><!--#endif
-->
+ </li>
+ </ul>
+ </li>
+ </ul>
</li>
-<!--#else -->
- <li><a href="/education/edu-cases.html">Case Studies</a></li>
-<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-(resources|software)/" -->
- <li class="active">
+ <li><!--#if expr="$REQUEST_URI = /\/edu-.*(-resources|projects)/" -->
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/edu-resources.html">Resources</a>
+ <a class="active navbar"
href="/education/edu-resources.html#main-heading">Resources</a>
<span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a class="navbar"
href="/education/edu-resources.html#main-heading">Resources</a><!--#endif -->
+ <ul>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-software/" -->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a class="active navbar"
href="/education/edu-software.html#main-heading">Software</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a class="navbar"
href="/education/edu-software.html#main-heading">Software</a><!--#endif -->
+ <ul>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-software-gcompris[.]/" -->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a class="active"
href="/education/edu-software-gcompris.html#main-heading">Gcompris</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a
href="/education/edu-software-gcompris.html#main-heading">Gcompris</a><!--#endif
-->
</li>
-<!--#else -->
- <li><a href="/education/edu-resources.html">Resources</a></li>
-<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-projects/" -->
- <li class="active">
+ <li><!--#if expr="$REQUEST_URI = /\/edu-software-gimp[.]/" -->
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/edu-software.html">Educational Software</a>
+ <a class="active"
href="/education/edu-edu-software-gimp.html#main-heading">Gimp</a>
<span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a
href="/education/edu-software-gimp.html#main-heading">Gimp</a><!--#endif -->
+ </li>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-software-tuxpaint[.]/" -->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a class="active"
href="/education/edu-edu-software-tuxpaint.html#main-heading">Tuxpaint</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a
href="/education/edu-software-tuxpaint.html#main-heading">Tuxpaint</a><!--#endif
-->
+ </li>
+ </ul>
+ </li>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-projects/" -->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a class="active"
href="/education/edu-projects.html#main-heading">Groups & projects</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a href="/education/edu-projects.html#main-heading">Groups &
projects</a><!--#endif -->
+ </li>
+ <li><!--#if expr="$REQUEST_URI = /\/edu-free-learning-resources.html/"
-->
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a class="active"
href="/education/edu-free-learning-resources.html#main-heading">Free
learning</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a
href="/education/edu-free-learning-resources.html#main-heading">Free
learning</a><!--#endif -->
+ </li>
+ </ul>
</li>
-<!--#else -->
- <li><a href="/education/edu-software.html">Educational Software</a></li>
-<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-faq/" -->
- <li class="active">
+ <li><!--#if expr="$REQUEST_URI = /\/edu-faq/" -->
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/edu-faq.html">FAQ</a>
+ <a class="active navbar"
href="/education/edu-faq.html#main-heading">FAQ</a>
<span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a class="navbar"
href="/education/edu-faq.html#main-heading">FAQ</a><!--#endif -->
</li>
-<!--#else -->
- <li><a href="/education/edu-faq.html">FAQ</a></li>
-<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-team/" -->
- <li class="active">
+ <li><!--#if expr="$REQUEST_URI = /\/edu-team/" -->
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/edu-team.html">Our Team</a>
+ <a class="active navbar" href="/education/edu-team.html#main-heading">Our
team</a>
<span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
+ <!--#echo encoding="none" var="MARK_END" --><!--#else -->
+ <a class="navbar" href="/education/edu-team.html#main-heading">Our
team</a><!--#endif -->
</li>
-<!--#else -->
- <li><a href="/education/edu-team.html">Our Team</a></li>
-<!--#endif -->
</ul>
-</div> <!-- id="education-content" -->
-
+</div>
Index: edu-software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-software.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-software.html 8 Apr 2019 13:56:39 -0000 1.2
+++ edu-software.html 27 Nov 2019 11:16:08 -0000 1.3
@@ -1,14 +1,22 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-
<title>Educational Free Software
- GNU Project - Free Software Foundation</title>
+<link rel="stylesheet" type="text/css" href="education.css" media="screen" />
+<style type="text/css" media="screen">
+<!--
+#navlinks {
+ background: #f3fbea;
+}
+-->
+</style>
<!--#include virtual="/education/po/edu-software.translist" -->
-<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/server/staging/banner.html" -->
<!--#include virtual="/server/staging/education-menu.html" -->
+<div class="article">
<p class="edu-breadcrumb">
<a href="/education/education.html">Education</a> →
+<a href="/education/edu-resources.html">Educational Resources</a> →
Educational Free Software</p>
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
@@ -17,30 +25,33 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
-<h2>Educational Free Software</h2>
-
-<p>(You can also check the
-<a href="/software/free-software-for-education.html">
-list of educational software</a> that we recommend.)</p>
+<h2 id="main-heading">Educational Free Software</h2>
+<hr class="thin">
+<p id="start-article"><em>The GNU project maintains a
+<a href="/software/free-software-for-education.html">list of high
+quality free programs for education at all levels</a> that we
+recommend.</em></p>
+<hr class="thin">
-<div class="emph-box">
+<div class="important">
<p>Before addressing the subject in this section, we would like to
-remind our readers that the word "Free" in "Free Software" <strong>does
+remind our readers that the word “free” in “free
+software” <strong>does
not refer to price</strong> but to <strong>liberty</strong>. Free
-Software is software that grants you <strong>freedom</strong>, namely
+software is software that grants you <strong>freedom</strong>, namely
the freedom to run, copy, distribute, study, change and improve the
software. To learn more, see the <a href="/philosophy/free-sw.html">
-Free Software definition</a>.</p>
+free software definition</a>.</p>
</div>
<h3>What you will find in this section</h3>
-<p>These pages do not constitute an exhaustive listing of available
+<p>This page does not constitute an exhaustive listing of available
educational free programs. Our aim is to present some examples so as to
illustrate how educational institutions can put into practice and
-effectively apply the freedoms that Free Software grants them. For each
+effectively apply the freedoms that free software grants them. For each
program described, we will show how those freedoms were actually
applied.</p>
@@ -63,10 +74,10 @@
the GNU Project recommends in order to protect the users' fundamental
freedoms. A GNU program does not recommend the use of any nonfree
program, and it does not refer the user to any nonfree documentation
-for Free Software, as defined in our campaign for
+for free software, as defined in our campaign for
<a href="/philosophy/free-doc.html">free documentation</a>.</p>
-<p>People who wish to migrate to Free Software or are looking for a free
+<p>People who wish to migrate to free software or are looking for a free
libre program to accomplish a particular task, should refer to the
<a href="http://directory.fsf.org";>Free Software Directory</a>, which
consists of a catalog of more than 6,000 free programs that run on
@@ -77,7 +88,7 @@
education, from pre-elementary school to highly specialized levels,
including university and research.</p>
-<p>If you know of a Free Software program that is being used by an
+<p>If you know of a free software program that is being used by an
educational institution for specific purposes, or has been modified or
otherwise adapted by its users to meet their own educational needs,
please let us know by sending an email to
@@ -89,7 +100,7 @@
<a href="mailto:address@hidden";><address@hidden></a>.
</p></div>
-
+</div>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -131,7 +142,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/04/08 13:56:39 $
+$Date: 2019/11/27 11:16:08 $
<!-- timestamp end -->
</p>
</div>
Index: nav-bar/test9/edu-software-tuxpaint.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- nav-bar/test9/edu-software-tuxpaint.html 2 Nov 2015 11:32:53 -0000
1.22
+++ nav-bar/test9/edu-software-tuxpaint.html 27 Nov 2019 11:16:09 -0000
1.23
@@ -1,51 +1,49 @@
-<!--#include virtual="/server/html5-header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.79 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-
<title>Tux Paint
- GNU Project - Free Software Foundation</title>
-
-<!--#include virtual="/education/po/edu-software-tuxpaint.translist" -->
-
+<link rel="stylesheet" type="text/css" href="/server/staging/education.css"
media="screen" />
<style type="text/css" media="screen,print">
<!--
-#content .stamp { float: right; width: 12em; margin: 0 1em; }
-#content .stamp img, #content .stamp p {
- width: 100%; padding: 0; margin: 0;
+#navlinks {
+ background: #f3fbea;
}
-#content .stamp p { margin-bottom: 2em; font-style: italic; }
-@media (max-width: 50em) {
- #content #flowers { width: 14em; float: right; }
+.pict {
+ width: 24em;
+ border: .2em solid #bbb;
+ margin: 2em auto;
}
-@media (max-width: 37em) {
- #content #flowers { width: 100%; }
- #content .stamp { float: none; margin: auto; }
+.stamp {
+ display: inline-block;
+ vertical-align: top;
+ width: 10.8em;
+ padding: 0 .5em 1em;
+}
+.stamp img, #content .stamp p {
+ width: 100%;
+ padding: 0;
+ margin: 0;
+}
+.stamp p {
+ font-size: .9em;
+ font-style: italic;
+}
+@media (max-width: 35em) {
+ #flowers {
+ width: 11.8em;
+ }
}
-->
</style>
-
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
-
-<div id="education-content">
-
-<!-- begin edu navigation bar -->
-<ul id="edu-navigation">
- <li><a href="/education/edu-contents.html">Education Contents</a></li>
- <li><a href="/education/edu-cases.html">Case Studies</a></li>
- <li class="active"><a href="/education/edu-resources.html">Educational
- Resources</a></li>
- <li><a href="/education/edu-projects.html">Education Projects</a></li>
- <li><a href="/education/edu-faq.html">FAQ</a></li>
- <li><a href="/education/edu-team.html">The Education Team</a></li>
-</ul><!-- end edu navigation bar -->
-
-</div> <!-- id="edu-content" -->
-
+<!--#include virtual="/education/po/edu-software-tuxpaint.translist" -->
+<!--#include virtual="/server/staging/banner.html" -->
+<!--#include virtual="/server/staging/education-menu.html" -->
+<div class="article">
<p class="edu-breadcrumb"><a href="/education/education.html">Education</a>
→
<a href="/education/edu-resources.html">Educational Resources</a> →
<a href="/education/edu-software.html">Educational Free Software</a> →
Tux Paint</p>
-
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -53,20 +51,11 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
-
-<h2 class="c">Tux Paint</h2>
+<h2 id="main-heading" class="c">Tux Paint</h2>
<h3>Description</h3>
-<div class="landscape">
-
-<!-- GNUN: localize URL /education/misc/tuxpaint-start-sm.png,
/education/misc/tuxpaint-start.png -->
-
-<a href="/education/misc/tuxpaint-start.png">
-<img src="/education/misc/tuxpaint-start-sm.png"
-alt="Screenshot of the Tux Paint interface."/></a>
-</div>
-
+<div class="announcement italic">
<p>Tux Paint is a cross-platform drawing program created specifically
for children. Little kids as young as 3 years old have no difficulty in
finding their way around its clear and intuitive interface which
@@ -75,6 +64,7 @@
is a white canvas for the child to draw making use of a wide variety of
tools and paint brushes. As a start, the child can load outlined
pictures to be colored, as in a coloring-book.</p>
+</div>
<p>The program includes all of the most common drawing tools such as
lines and brushes for free-hand drawing and coloring, geometric shapes,
@@ -82,6 +72,13 @@
while painting and a special tool called "Magic" for impressive effects:
rainbow, glitter, chalk, blur, flip, and more.</p>
+<div class="pict">
+<!-- GNUN: localize URL /education/misc/tuxpaint-start-sm.png,
/education/misc/tuxpaint-start.png -->
+<a href="/education/misc/tuxpaint-start.png">
+<img src="/education/misc/tuxpaint-start-sm.png"
+alt="Screenshot of the Tux Paint interface."/></a>
+</div>
+
<p>Along with the Magic tool, the other popular feature among children
is "Stamp", which contains loads of pictures and clip art that can
be "stamped" on the canvas, such as plants and flowers, animals, holiday
@@ -102,13 +99,6 @@
<h3>Who's Using It and How</h3>
-<div class="landscape">
-
-<a href="/education/misc/tuxpaint-stamps.jpg">
-<img src="/education/misc/tuxpaint-stamps-sm.jpg"
-alt="Screenshot of the Tux Paint interface in Malayalam with native
flowers."/></a>
-</div>
-
<p>Comments by <a href="http://tuxpaint.org/comments/";>home users</a>
and stories from <a href="http://tuxpaint.org/schools/";>schools</a>
using Tux Paint are presented in the official website. There are reports
@@ -122,6 +112,12 @@
in as many work stations as needed, which is specially important for
schools.</p>
+<div class="pict">
+<a href="/education/misc/tuxpaint-stamps.jpg">
+<img src="/education/misc/tuxpaint-stamps-sm.jpg"
+alt="Screenshot of the Tux Paint interface in Malayalam with native
flowers."/></a>
+</div>
+
<p>Another significant freedom that Free Software guarantees is the
freedom to modify the program so as to adapt it to the user's needs and
to redistribute copies of the modified version. It is thanks to this
@@ -129,30 +125,26 @@
those spoken by minority groups. In fact, translations into less widely
spoken languages have been provided by the users themselves. This is so
because most of the time, companies whose business consists of
-development of non-free software adopt policies on the basis of market
+development of nonfree software adopt policies on the basis of market
size: if the market is not large enough to ensure profit, they are
generally reluctant to invest on it.</p>
-<div id="flowers">
+<div id="flowers" class="pict">
<div class="stamp">
+<a href="/education/misc/anthoorium.jpg">
+<img src="/education/misc/anthoorium-sm.jpg"
+alt="Image of the Anthoorium flower." /></a>
+<p class="c"><a href="/education/misc/anthoorium.ogg">Listen</a> to a student
+pronounce the name of the Anthoorium flower in Malayalam.</p>
+</div> <!-- /stamp -->
+<div class="stamp">
<a href="/education/misc/appooppanthaady.jpg">
<img src="/education/misc/appooppanthaady-sm.jpg"
alt="Image of the Appooppan Thaady flower." /></a>
-
<p class="c"><a href="/education/misc/appooppanthady.ogg">Listen</a> to a
student
pronounce the name of the Appooppan Thaady flower in Malayalam.</p>
</div> <!-- /stamp -->
-
-<div class="stamp">
-
-<a href="/education/misc/anthoorium.jpg">
-<img src="/education/misc/anthoorium-sm.jpg"
-alt="Image of the Anthoorium flower." /></a>
-
-<p class="c"><a href="/education/misc/anthoorium.ogg">Listen</a> to a student
-pronounce the name of the Anthoorium flower in Malayalam.</p>
-</div> <!-- /stamp -->
</div> <!-- /#flowers -->
<p>A good example of how software freedom can be applied in Tux Paint is
@@ -205,20 +197,20 @@
or children, can actually influence and improve information
technology when software freedom is granted.</p>
+<div class="infobox">
<hr />
-
-<h4>Credits</h4>
-
+<h3>Credits</h3>
<p>Images of the Tux Paint interface in Malayalam with native flowers,
of the Appooppan Thaady and Anthoorium flowers, as well as both sound
files are courtesy of the Vocational Higher Secondary School Irimpanam
and are licensed under CC-BY-SA,
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/";>
Creative Commons Attribution-ShareAlike 3.0 Unported</a>.</p>
-
+</div>
+</div>
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
<div id="footer">
<div class="unprintable">
@@ -247,7 +239,7 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014, 2016 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -257,7 +249,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/11/02 11:32:53 $
+$Date: 2019/11/27 11:16:09 $
<!-- timestamp end -->
</p>
</div>
Index: education.css
===================================================================
RCS file: education.css
diff -N education.css
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ education.css 27 Nov 2019 11:16:08 -0000 1.1
@@ -0,0 +1,233 @@
+/* Stylesheet for the Education section of https://www.gnu.org,
+created November 27, 2019.
+This file is in the public domain. */
+
+/*** Changes to layout.css ***/
+
+body {
+ border-top: .2em solid #a42e2b;
+}
+hr.thin {
+ clear: none; /* or define a different class */
+}
+a[href]:visited {
+ color: #004caa;
+}
+.italic {
+ font-style: italic;
+}
+
+.announcement, .important {
+ font-size: inherit;
+ padding: .1em 1em .7em;
+ margin: 1.5em 0;
+ color: #333;
+ background: none;
+}
+.announcement blockquote { margin: 0; }
+.announcement p, .important p { margin: .5em 0 0; }
+.announcement ul, .important ul { margin: 0 1em; }
+.announcement ul li, .important ul li { margin-top: .5em; }
+.announcement h3, .important h3 {
+ font-size: 1.3em;
+ margin: .4em 0;
+}
+/* For information that isn't part of the article. The border is
+ green. */
+.announcement { border-left: .3em solid #22b965; }
+/* For important information inside an article. The border is orange. */
+.important { border-left: .3em solid #fc7; }
+.note, .edu-note p{
+ border: .15em solid #22b965;
+}
+
+#searcher, #header {
+ background: #f9ffff;
+}
+#translations {
+ background: white;
+ border-top: .1em solid #ddd;
+ border-bottom: .2em solid #ddd;
+}
+
+#content .edu-breadcrumb {
+ font-size: .9em;
+ font-weight: normal;
+ padding-top: .6em;
+}
+a[href], a[href]:visited {
+ color: #004caa;
+}
+a[href]:active, a[href]:hover {
+ color: #777;
+ text-decoration: none;
+}
+
+/*** From graphics.css ***/
+
+.infobox {
+ font-size: .9em;
+ line-height: 1.3em;
+ margin: 2.5em 0 0;
+}
+.infobox h3 {
+ font-size: 1.2em;
+ margin-top: 0;
+}
+.infobox p {
+ margin: .3em 0 0;
+}
+.infobox hr {
+ display: block;
+ width: 15em; max-width: 100%;
+ height: 1px;
+ background: #999;
+ border: none;
+ margin: 0 0 1em 0;
+}
+
+
+/*** New ***/
+
+/* Navigation */
+
+#content {
+ position: relative;
+}
+#navlinks {
+ font-size: .9em;
+ border: .1em solid #ddd;
+ margin-top: 1em;
+}
+#navlinks h3, #navlinks h4, #navlinks a {
+ display: none;
+}
+#navlinks ul {
+ display: inline;
+ padding: 0;
+ margin: 0;
+}
+#navlinks a.navbar {
+ display: inline-block;
+ font-weight: bold;
+}
+#navlinks a {
+ white-space: nowrap;
+ padding: .1em .4em;
+ margin: .1em .2em .1em 0;
+}
+
+#TOC {
+ font-size: .9em;
+ text-align: center;
+ padding: .2em 3% 1.2em;
+ margin: 1em auto;
+}
+#TOC h3 {
+ display: none;
+}
+#TOC h4 {
+ font-size: 1em;
+ margin: 1em 0 .2em;
+}
+#TOC ul, #TOC ul li, #navlinks ul li {
+ display: inline;
+ padding: 0;
+ margin: 0;
+}
+#TOC a {
+ display: inline-block;
+ white-space: nowrap;
+ padding: .1em .4em;
+ border: 1px solid #ddd;
+ margin: .3em;
+}
+
+@media (min-width: 57em) {
+ .article, .translators-notes {
+ margin-left: 11.1rem;
+ }
+ #navlinks {
+ position: absolute;
+ height: 100%;
+ top: -1em; left: 0;
+ width: 11rem;
+ padding: 0 0 1.5em;
+ border: none;
+ border-right: .1em solid #ddd;
+ padding-bottom: 2.5rem;
+ }
+ #navlinks h3 {
+ font-size: 1.1em;
+ text-align: center;
+ padding: 1em .5em 0;
+ margin-top: 0;
+ }
+ #navlinks h4 {
+ font-size: 1em;
+ margin: .5em 1em .2em;
+ }
+ #navlinks ul, #navlinks ul li {
+ line-height: 1.2em;
+ padding: 0;
+ margin: 0;
+ list-style: none;
+ }
+ #navlinks h3, #navlinks h4, #navlinks ul, #navlinks ul li,
+ #navlinks a, #navlinks a.navbar {
+ display: block;
+ }
+ #navlinks a {
+ white-space: normal;
+ padding: .15em .5em 0 1.5em;
+ margin: .2em 0;
+ }
+ #navlinks li li a {
+ padding-left: 3em;
+ }
+ #navlinks li li li a {
+ padding-left: 4.5em;
+ }
+}
+
+@media (min-width: 63em) {
+ #navlinks {
+ width: 12rem;
+ }
+ .article, .translators-notes {
+ padding: 0 2%;
+ margin-left: 12.1rem;
+ }
+}
+
+/* Article */
+
+h3 {
+ padding-top: .5em;
+}
+#about-dir {
+ font-size: .9em;
+ color: #444;
+}
+#about-page {
+ font-style: italic;
+}
+#about-dir p, #about-page p {
+ margin: .5em 0;
+}
+
+/* Links */
+
+#TOC a , #navlinks a {
+ text-decoration: none;
+}
+.edu-breadcrumb a:hover, #navlinks a:hover, #navlinks a:hover {
+ text-decoration: underline;
+}
+#navlinks a.active, #navlinks a.active:visited {
+ color: black;
+ font-style: italic;
+}
+#navlinks a.active:hover {
+ text-decoration: none;
+}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging body-include-1.html body-inc...,
Therese Godefroy <=