www/education education.html edu-software-gimp....

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/04/14 17:37:04

Modified files:
        education      : education.html edu-software-gimp.html 

Log message:
        Reorganize the text of education.html (Dora); resize videos.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.html?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-gimp.html?cvsroot=www&r1=1.16&r2=1.17

Patches:
Index: education.html
===================================================================
RCS file: /webcvs/www/www/education/education.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- education.html      12 Apr 2014 12:39:34 -0000      1.58
+++ education.html      14 Apr 2014 17:37:01 -0000      1.59
@@ -1,11 +1,21 @@
 <!--#include virtual="/server/html5-header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.76 -->
+
 <!--#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;
+}
+</style>
+
 <!--#include virtual="/server/banner.html" -->
 
 <div id="education-content">           
@@ -22,6 +32,7 @@
 <!-- end edu navigation bar -->
 
 </div> <!-- id="education-content" -->
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -36,10 +47,10 @@
 
 <h3>How Does Free Software Relate To Education?</h3>
 
-<blockquote class="note"><p>We are 
-looking for free educational games, or free games that can be used for 
-educational purposes. Contact <a 
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
+<blockquote class="note"><p>
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 </p></blockquote>
 
 <p>Software freedom plays a fundamental role in education. 
@@ -65,11 +76,8 @@
 <a href="/philosophy/shouldbefree.html">why software should be free</a>
 (as in freedom).</p>
 
-<div class="yui-gc">
-                  <div class="yui-u first">
-
-<h2>The Basics</h2>
 
+<h3>The Basics</h3>
 <p>The GNU Project was 
 <a href=" /gnu/initial-announcement.html">launched</a> in 1983 by 
 Richard Stallman to develop a Free Libre operating system: the GNU 
@@ -81,11 +89,26 @@
 explains briefly and to the point the principles of Free Software and 
 how they connect to education.</p>
 
-<!-- GNUN: localize URL /education/rms-education-es.ogv -->
+<blockquote class="note" id="indepth">
+<h3>In Depth</h3>
+
+<ul>
+<li>Learn about the <a href="/education/edu-why.html">Reasons Why</a> 
+educational institutions should use and teach exclusively Free Software.</li>
+
+<li>An article by Richard Stallman:
+<a href="/education/edu-schools.html">Why Schools Should Exclusively Use 
+Free Software</a></li>
+
+<li>An article by Dr. V. Sasi Kumar on the
+<a href="/education/edu-system-india.html">education system in India.</a></li>
+</ul>
+</blockquote>
 
-<video id="rms-movie" width="512" height="288" controls="controls">
+<!-- GNUN: localize URL /education/rms-education-es.ogv -->
+<video  id="rms-movie" controls="controls">
   <source
-    src="/education/rms-education-es.ogv"
+    src="http://www.gnu.org/education/rms-education-es.ogv";
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
 
@@ -96,8 +119,7 @@
 <a 
 href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv";>
 Download and watch the video</a> at a higher definition in the Ogg Theora 
-(ogv) free format.
-</p>
+(ogv) free format.</p>
 
 <p>
 <!-- TRANSLATORS: please add the link to your language here in the first 
@@ -122,25 +144,6 @@
    languages</a>. 
 </p>
 
-</div> <!-- class="yui-u first" --> 
-
-<div class="yui-u">
-
-<h2 id="indepth">In Depth</h2>
-
-<p>Learn about the <a href="/education/edu-why.html">Reasons Why</a> 
-educational institutions should use and teach exclusively Free Software.</p>
-
-<p>An article by Richard Stallman:
-<a href="/education/edu-schools.html">Why Schools Should Exclusively Use 
-Free Software</a></p>
-
-<p>An article by Dr. V. Sasi Kumar on the
-<a href="/education/edu-system-india.html">education system in India.</a></p>
-
-</div> <!-- class="yui-u" -->
-</div> <!-- class="yui-gc" -->
-
 </div> <!-- for id="content", starts in the include above -->
 
 <!--#include virtual="/server/footer.html" -->
@@ -182,7 +185,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 12:39:34 $
+$Date: 2014/04/14 17:37:01 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-software-gimp.html
===================================================================
RCS file: /webcvs/www/www/education/edu-software-gimp.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- edu-software-gimp.html      12 Apr 2014 12:39:34 -0000      1.16
+++ edu-software-gimp.html      14 Apr 2014 17:37:02 -0000      1.17
@@ -1,11 +1,20 @@
 <!--#include virtual="/server/html5-header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.76 -->
+
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
-<title>GIMP
-- GNU Project - Free Software Foundation</title>
+<title>GIMP - GNU Project - Free Software Foundation</title>
+
+<!--#include virtual="/education/po/education.translist" -->
+
+<style type="text/css" media="screen">
+#mani-movie {
+   display: block;
+   width: 100%; max-width: 40em;
+   margin: auto;
+}
+</style>
 
-<!--#include virtual="/education/po/edu-software-gimp.translist" -->
 <!--#include virtual="/server/banner.html" -->
 
 <div id="education-content">
@@ -113,13 +122,11 @@
 description of the video</a> is available for the visually impaired).
 </p>
 
-<div style=  "width:320px; margin-right:auto; margin-left:auto; 
padding-top:1em; padding-bottom:1em;">
-<video width="320" controls="controls">
+<video  id="mani-movie" controls="controls">
   <source
     src="http://audio-video.gnu.org/video/we_use_gnu-linux_low.ogv"; 
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
-</div>
 
 <p class="center">Watch and download the video as 
 <a href="http://audio-video.gnu.org/video/we_use_gnu-linux_high.ogv";>
@@ -289,7 +296,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 12:39:34 $
+$Date: 2014/04/14 17:37:02 $
 <!-- timestamp end -->
 </p>
 </div>