www/server/staging/nav-bar/test9 education.html...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 15/10/08 16:05:44

Modified files:
        server/staging/nav-bar/test9: education.html education.ar.html 

Log message:
        Simplify the style of education.html.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.ar.html?cvsroot=www&r1=1.5&r2=1.6

Patches:
Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- education.html      7 Oct 2015 10:55:29 -0000       1.30
+++ education.html      8 Oct 2015 16:05:43 -0000       1.31
@@ -9,36 +9,15 @@
 <!--#include virtual="/education/po/education.translist" -->
 <style type="text/css" media="screen">
 <!--
-#content #education:after {
-   clear: both; content: ""; display: block;
-   height: 0px; visibility: hidden; width: 0px;
-}
 #content #video-container {
-   float: left; max-width: 40em;
-   margin: 1em 0 0 0;
+   max-width: 40em;
+   margin: 2em auto;
 }
 #content #video-container p { text-align: justify; }
 #rms-movie { width: 100%; margin-bottom: .3em; }
-#content #indepth { text-align: left; margin: 1em 0 0 1em; }
-#content #indepth ul { padding: 0 1em; margin-top: 0; }
-#content #indepth li { padding-bottom: 1em; }
-#content #indepth h3 { padding: 1em; margin: 0; }-->
-<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
-<!--
-#content #indepth { text-align: right; margin: 1em 1em 0 0; }
-#content #video-container { float: right; } -->
-<!--#endif -->
-<!--
address@hidden (max-width: 68em) {
-   #content #video-container, #content #indepth {
-      float: none; margin: 2em auto 0 auto ;
-   }
-   #content #video-container { width: 40em; max-width: 100%; }
-   #content #indepth { width: 39.5em; max-width: 98%; }
-}
 -->
 </style>
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
 
 <div id="education-content">           
 
@@ -66,14 +45,14 @@
 <h2>Free Software and Education</h2>
 </div>
 
+<h3>How Does Free Software Relate to Education?</h3>
+
 <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>
 
-<h3>How Does Free Software Relate to Education?</h3>
-
 <p>Software freedom plays a fundamental role in education. 
 Educational institutions of all levels should use and teach Free 
 Software because it is the only software that allows them to accomplish 
@@ -110,7 +89,6 @@
 explains briefly and to the point the principles of Free Software and 
 how they connect to education.</p>
 
-<div id="education">
 <div id="video-container">
 <!-- GNUN: localize URL /education/rms-education-es.ogv -->
 <video  id="rms-movie" controls="controls">
@@ -150,9 +128,7 @@
 </p></div> <!-- /.emph-box -->
 </div> <!-- /#video-container -->
 
-<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>
@@ -164,11 +140,9 @@
 <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>
-</div> <!-- /#education -->
 </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">
 
@@ -207,7 +181,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/10/07 10:55:29 $
+$Date: 2015/10/08 16:05:43 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education.ar.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.ar.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- education.ar.html   23 Sep 2015 15:51:49 -0000      1.5
+++ education.ar.html   8 Oct 2015 16:05:44 -0000       1.6
@@ -16,33 +16,12 @@
 <!--#include virtual="/education/po/education.translist" -->
 <style type="text/css" media="screen">
 <!--
-#content #education:after {
-   clear: both; content: ""; display: block;
-   height: 0px; visibility: hidden; width: 0px;
-}
 #content #video-container {
-   float: left; max-width: 40em;
-   margin: 1em 0 0 0;
+   max-width: 40em;
+   margin: 2em auto;
 }
 #content #video-container p { text-align: justify; }
 #rms-movie { width: 100%; margin-bottom: .3em; }
-#content #indepth { text-align: left; margin: 1em 0 0 1em; }
-#content #indepth ul { padding: 0 1em; margin-top: 0; }
-#content #indepth li { padding-bottom: 1em; }
-#content #indepth h3 { padding: 1em; margin: 0; }-->
-<!--#if expr="$LANGUAGE_SUFFIX = /\\.(ar|fa|he)/" -->
-<!--
-#content #indepth { text-align: right; margin: 1em 1em 0 0; }
-#content #video-container { float: right; } -->
-<!--#endif -->
-<!--
address@hidden (max-width: 68em) {
-   #content #video-container, #content #indepth {
-      float: none; margin: 2em auto 0 auto ;
-   }
-   #content #video-container { width: 40em; max-width: 100%; }
-   #content #indepth { width: 39.5em; max-width: 98%; }
-}
 -->
 </style>
 
@@ -76,13 +55,13 @@
 <h2>البرمجيات الحرة والتعليم</h2>
 </div>
 
+<h3>ما علاقة البرجيات الحرة بالتعليم؟</h3>
+
 <blockquote class="note"><p>
 نبحث عن ألعاب تعليمية حرة، أو ألعاب يمكن 
إستخدامها لأغراض تعليمية. راسلنا
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
 </p></blockquote>
 
-<h3>ما علاقة البرجيات الحرة بالتعليم؟</h3>
-
 <p>حرية إستخدام البرمجيات تلعب دور هام في 
العملية التعليمية. على المؤسسات
 التعليمية في مختلف المستويات أن تستخدم 
ونَدْرس البرمجيات الحرة لأنها الوحيدة
 من نوعها التى تسمح لتلك المؤسسات تحقيق 
رسالتها الجوهرية: نشر المعرفة البشرية
@@ -111,9 +90,7 @@
 Stallman</a> بإختصار وفي صميم الموضوع مبادئ 
البرمجيات الحرة وكيفترتبط
 بالتعليم.</p>
 
-<div id="education">
 <div id="video-container">
-
 <!-- GNUN: localize URL /education/rms-education-es.ogv -->
 <video  id="rms-movie" controls="controls">
   <source
@@ -151,9 +128,8 @@
 </p></div> 
 <!-- /.emph-box -->
 </div> 
-
 <!-- /#video-container -->
-<blockquote class="note" id="indepth">
+
 <h3>في العمق</h3>
 
 <ul>
@@ -167,8 +143,6 @@
 <li>مقالة بواسطة د/ ف. ساسي كومار Dr. V. Sasi Kumar عن 
 <a
 href="/education/edu-system-india.html"> النظام التعليمي في 
الهند. </a></li>
 </ul>
-</blockquote>
-</div> <!-- /education -->
 
 <div class="translators-notes">
 
@@ -225,7 +199,7 @@
 <p class="unprintable"><!-- timestamp start -->
 حُدثت:
 
-$Date: 2015/09/23 15:51:49 $
+$Date: 2015/10/08 16:05:44 $
 
 <!-- timestamp end -->
 </p>