www/education edu-software-gcompris.html edu-so...

[Dora Scilipoti]

CVSROOT:        /web/www
Module name:    www
Changes by:     Dora Scilipoti <dora>   14/04/25 11:27:43

Modified files:
        education      : edu-software-gcompris.html 
                         edu-software-tuxpaint.html education.html 

Log message:
        Update to new layout.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-gcompris.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-tuxpaint.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.html?cvsroot=www&r1=1.60&r2=1.61

Patches:
Index: edu-software-gcompris.html
===================================================================
RCS file: /web/www/www/education/edu-software-gcompris.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- edu-software-gcompris.html  12 Apr 2014 12:39:34 -0000      1.19
+++ edu-software-gcompris.html  25 Apr 2014 11:27:42 -0000      1.20
@@ -27,6 +27,7 @@
 <a href="/education/edu-resources.html">Educational Resources</a> &rarr; 
 <a href="/education/edu-software.html">Educational Free Software</a> &rarr;
 GCompris</p>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -34,15 +35,16 @@
 <!--#include virtual="/server/top-addendum.html" -->
 <!--#endif -->
 <!--#endif -->
+
 <h2>GCompris</h2>
 
 <h3>Description</h3>
 
-<div style="width: 300px; margin: 0px 0px 0px 30px; float: right;">
+<div class="photo">
 
 <a href="/education/misc/gcompris.jpg">
-<img src="/education/misc/gcompris-sm.jpg" alt="Screenshot of the GCompris 
-interface showing the various boards."/></a>
+<img class="recessed" src="/education/misc/gcompris-sm.jpg" 
+alt="Screenshot of the GCompris interface showing the various boards."/></a>
 </div>
 
 <p>GCompris is a cross-platform complete educational suite for children 
@@ -151,7 +153,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2014 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -161,7 +163,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 12:39:34 $
+$Date: 2014/04/25 11:27:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-software-tuxpaint.html
===================================================================
RCS file: /web/www/www/education/edu-software-tuxpaint.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- edu-software-tuxpaint.html  12 Apr 2014 12:39:34 -0000      1.24
+++ edu-software-tuxpaint.html  25 Apr 2014 11:27:42 -0000      1.25
@@ -8,6 +8,20 @@
 <!--#include virtual="/education/po/edu-software-tuxpaint.translist" -->
 <!--#include virtual="/server/banner.html" -->
 
+<style type="text/css" media="screen,print">
+<!--
+#content .stamp {
+   float: right;
+   width: 15em; max-width: 100%;
+   margin: 0 0 1em 0;
+}
+#content .stamp img, #content .stamp p {
+   width: 90%;
+   padding: 0 9%;
+}
+-->
+</style>
+
 <div id="education-content">
 
 <!-- begin edu navigation bar -->
@@ -27,6 +41,7 @@
 <a href="/education/edu-resources.html">Educational Resources</a> &rarr; 
 <a href="/education/edu-software.html">Educational Free Software</a> &rarr;
 Tux Paint</p>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -34,17 +49,18 @@
 <!--#include virtual="/server/top-addendum.html" -->
 <!--#endif -->
 <!--#endif -->
+
 <h2>Tux Paint</h2>
 
 <h3>Description</h3>
 
-<div style="width: 330px; margin: 30px 0px 30px 30px; float: right;">
+<div class="photo">
 
 <!-- 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>
+<img class="recessed" src="/education/misc/tuxpaint-start-sm.png" 
+alt="Screenshot of the Tux Paint interface."/></a>
 </div>
 
 <p>Tux Paint is a cross-platform drawing program created specifically 
@@ -82,11 +98,11 @@
 
 <h3>Who's Using It and How</h3>
 
-<div style="with: 320px; margin:0px 0px 0px 30px; float: right;">
+<div class="photo">
 
 <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>
+<img class="recessed" 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>
@@ -113,25 +129,25 @@
 size: if the market is not large enough to ensure profit, they are
 generally reluctant to invest on it.</p>
 
-<div style="width: 170px; margin: 0px 0px 0px 30px; float: right;">
+<blockquote class="stamp">
 
 <a href="/education/misc/appooppanthaady.jpg">
-<img src="/education/misc/appooppanthaady-sm.jpg" 
+<img src="appooppanthaady-sm.jpg"
 alt="Image of the Appooppan Thaady flower." /></a>
 
-<p><a href="/education/misc/appooppanthady.ogg">Listen</a> to a student 
+<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> <!-- style -->
+</blockquote> <!-- /stamp -->
 
-<div style="width: 160px;  margin: 0px 0px 0px 30px; float: right;">
+<blockquote class="stamp">
 
 <a href="/education/misc/anthoorium.jpg">
-<img src="/education/misc/anthoorium-sm.jpg" 
+<img src="anthoorium-sm.jpg"
 alt="Image of the Anthoorium flower." /></a>
 
-<p><a href="/education/misc/anthoorium.ogg">Listen</a> to a student 
+<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> <!-- style -->
+</blockquote> <!-- /stamp -->
 
 <p>A good example of how software freedom can be applied in Tux Paint is
 the work done by 11 and 12 years old students from the
@@ -225,7 +241,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2014 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -235,7 +251,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 12:39:34 $
+$Date: 2014/04/25 11:27:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education.html
===================================================================
RCS file: /web/www/www/education/education.html,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- education.html      14 Apr 2014 19:18:33 -0000      1.60
+++ education.html      25 Apr 2014 11:27:42 -0000      1.61
@@ -1,19 +1,27 @@
 <!--#include virtual="/server/html5-header.html" -->
-<!-- Parent-Version: 1.76 -->
-
+<!-- Parent-Version: 1.77 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
-<title>Free Software and Education - GNU Project - Free Software 
Foundation</title>
+<title>Free Software and Education 
+- GNU Project - Free Software Foundation</title>
 
 <!--#include virtual="/education/po/education.translist" -->
 
 <style type="text/css" media="screen">
+<!--
 #rms-movie { min-width: 60%; max-width: 100%; }
+
 #content #indepth {
    text-align: left;
-   padding: 0 .4em .8em 1.2em;
-   margin: 0 1em 1em 1em;
+   margin-top: 0;
+}
+#content #indepth ul {
+   padding: 0 1em;
+   margin-top: 0;
 }
+#content #indepth li { padding-bottom: 1em; }
+#content #indepth h3 { padding: 1em; margin: 0; }
+-->
 </style>
 
 <!--#include virtual="/server/banner.html" -->
@@ -185,7 +193,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/14 19:18:33 $
+$Date: 2014/04/25 11:27:42 $
 <!-- timestamp end -->
 </p>
 </div>