www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/server/staging/nav-bar/test9 layout7.css ed...

From: Therese Godefroy
Subject: www/server/staging/nav-bar/test9 layout7.css ed...
Date: Wed, 23 Apr 2014 07:14:16 +0000 
CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/04/23 07:14:16

Modified files:
        server/staging/nav-bar/test9: layout7.css 
Added files:
        server/staging/nav-bar/test9: education.html 

Log message:
        Add education.html; make the notes resize better and adjust 
margins/paddings.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.html?cvsroot=www&rev=1.12

Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- layout7.css 22 Apr 2014 11:36:55 -0000      1.35
+++ layout7.css 23 Apr 2014 07:14:15 -0000      1.36
@@ -716,12 +716,17 @@
    float: right;
    text-align: center;
    font-style: normal;
-   width: 17em; max-width: 100%;
-   padding: 0 .5em;
+   width: 20em; max-width: 100%;
+   padding: 0;
    margin: .3em 1em 1em 1em;
    border: .3em solid #3465a4;
 }
-#content .note p { font-size: 1.1em; line-height: 1.4em; }
+#content .note p {
+   font-size: 1.1em;
+   line-height: 1.4em;
+   padding: 0 1em;
+   margin: 1em 0;
+}
 #content .note strong { font-size: 1.2em; }
 
 /* For the note about Free Software Free Society */
@@ -834,7 +839,7 @@
 /* For images in the Education section (and elsewhere?) */
 #content .photo {
    float: right;
-   width: 27.5em; max-width: 100%;
+   width: 30em; max-width: 100%;
    margin: .3em 0 1em 0;
 }
 #content .photo img, #content .photo p {

Index: education.html
===================================================================
RCS file: education.html
diff -N education.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ education.html      23 Apr 2014 07:14:15 -0000      1.12
@@ -0,0 +1,232 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+<head>
+<!-- start of server/head-include-1.html -->
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rev="made" href="mailto:address@hidden"; />
+<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
+<meta name="ICBM" content="42.355469,-71.058627" />
+<meta name="DC.title" content="gnu.org" />
+<!-- end of server/head-include-1.html --><!-- end of server/header.html -->
+<!-- Parent-Version: 1.76 -->
+
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+
+<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;
+   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>
+
+<!-- start of server/banner.html -->
+<!-- start of head-include-2.html -->
+
+<link rel="stylesheet" href="combo.css" media="screen" />
+<link rel="stylesheet" href="layout7.css" media="screen" />
+
+<link rel="stylesheet" href="/mini.css" media="handheld" />
+
+<link rel="stylesheet" href="/print.css" media="print" />
+
+<!-- end of head-include-2.html --></head>
+<body>
+<div  class="inner">
+
+<!--#include virtual="/server/body-include-1.html" -->
+
+<!--#include virtual="/server/body-include-2.html" -->
+
+<div id="content">
+
+<!-- end of server/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><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="education-content" -->
+
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+
+<div class="center">
+<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>
+
+<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 
+their essential missions: to disseminate human knowledge and to prepare 
+students to be good members of their community. The source code and the 
+methods of Free Software are part of human knowledge. On the contrary, 
+proprietary software is secret, restricted knowledge, which is the 
+opposite of the mission of educational institutions. Free Software 
+supports education, proprietary software forbids education.</p>
+
+<p>Free Software is not just a technical question; it is an ethical,
+social, and political question. It is a question of the human rights
+that the users of software ought to have. Freedom and cooperation are
+essential values of Free Software. The GNU System implements these
+values and the principle of sharing, since sharing is good and
+beneficial to human progress.</p>
+
+<p>To learn more, see the 
+<a href="/philosophy/free-sw.html">Free Software definition</a> 
+and our article on 
+<a href="/philosophy/shouldbefree.html">why software should be free</a>
+(as in freedom).</p>
+
+
+<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 
+operating system. As a result, today it is possible for anyone to use a 
+computer in freedom.</p>
+
+<p>In this six-minutes video 
+<a href="http://www.fsf.org/about/leadership/#rms";>Richard Stallman</a> 
+explains briefly and to the point the principles of Free Software and 
+how they connect to education.</p>
+
+<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>
+
+<!-- GNUN: localize URL /education/rms-education-es.ogv -->
+<video  id="rms-movie" controls="controls">
+  <source
+    src="http://www.gnu.org/education/rms-education-es.ogv";
+    type='video/ogg; codecs="theora, vorbis"' />
+</video>
+
+<p>
+<!-- TRANSLATORS: Please replace the link to the video with subtitles in
+     English with a link to the video with subtitles in your language, 
+     if it exists. --> 
+<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>
+
+<p>
+<!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. -->
+
+Transcriptions of this video are available in
+
+<a href="/education/misc/rms-education-es-translation-to-en.txt">English</a>, 
+<a href="/education/misc/rms-education-es-transcription.txt">Spanish</a>, and 
+<a href="/education/misc/edu-misc.html#transcription-rms-education">
+   other languages</a>. 
+</p>
+
+<p> 
+<!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. --> 
+
+SubRip subtitle files are also available for download in
+<a href="/education/misc/rms-education-es-sub.en.srt">English</a>, 
+<a href="/education/misc/rms-education-es-sub.es.srt">Spanish</a>, and
+<a href="/education/misc/edu-misc.html#subtitles-rms-education">other 
+   languages</a>. 
+</p>
+
+</div> <!-- for id="content", starts in the include above -->
+
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<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
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2014/04/23 07:14:15 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]