www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/server/staging/nav-bar/test9 layout2.css ba...


From: Therese Godefroy
Subject: www/server/staging/nav-bar/test9 layout2.css ba...
Date: Tue, 04 Feb 2014 17:06:07 +0000

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

Modified files:
        server/staging/nav-bar/test9: layout2.css banner-edu.html 
                                      edu-schools2.fr.html 

Log message:
        Include the banner by hand, remove conditionals from disclaimer, fix 
style.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout2.css?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/banner-edu.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-schools2.fr.html?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: layout2.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout2.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- layout2.css 4 Feb 2014 16:44:51 -0000       1.1
+++ layout2.css 4 Feb 2014 17:06:05 -0000       1.2
@@ -593,6 +593,9 @@
    background-color: #ff3;
 }
 
+/* For the note saying the page is a translation. */
+.trans-disclaimer { font-weight: bold; }
+
 /* For outdated translations  */
 #outdated {
    padding: .5em;

Index: banner-edu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/banner-edu.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- banner-edu.html     4 Feb 2014 16:45:04 -0000       1.1
+++ banner-edu.html     4 Feb 2014 17:06:05 -0000       1.2
@@ -60,9 +60,6 @@
 
 <!-- start of server/body-include-2.html -->
 
-<!-- Begin fundraising banner -->
-<!-- End fundraising banner -->
-
 <div id="header">
 
 <div id="fssbox">
@@ -93,5 +90,7 @@
 
 <!-- end of server/body-include-2.html -->
 
+<div id="content">
+
 <!-- end of banner.fr.html -->
 

Index: edu-schools2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools2.fr.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-schools2.fr.html        4 Feb 2014 16:45:09 -0000       1.1
+++ edu-schools2.fr.html        4 Feb 2014 17:06:06 -0000       1.2
@@ -10,7 +10,105 @@
 Projet GNU - Free Software Foundation</title>
 
 <!--#include virtual="/education/po/edu-schools.translist" -->
-<!--#include virtual="banner-edu.fr.html" -->
+<!-- start of banner.fr.html -->
+
+<!-- start of head-include-2.html -->
+<link rel="stylesheet" href="/combo.css" media="screen" />
+<link rel="stylesheet" href="layout2.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 -->
+
+<link rel="stylesheet" href="style.fr.css" media="all" />
+</head>
+<body>
+<div class="inner">
+
+<!-- start of server/body-include-1.html -->
+
+<div id="toplinks">
+<div class="links">
+ <a href="#content">Lire l'article</a>&nbsp;&nbsp;&nbsp;&nbsp;
+ <a href="/accessibility/">Accessibilité</a>&nbsp;&nbsp;&nbsp;&nbsp;
+ <span class="fsf"><a 
href="#mission-statement">À&nbsp;propos&nbsp;de&nbsp;la&nbsp;FSF</a></span>
+</div> <!-- /links -->
+
+<div id="searcher">
+ <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
+  <div><label class="netscape4" for="phrase">Search:</label>
+  <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
+         value="Pourquoi GNU/Linux?" onfocus="this.value=''" />
+  <input type="submit" value="Rechercher" />
+  </div><!-- unnamed label -->
+ </form>
+</div><!-- /searcher -->
+</div><!-- /toplinks -->
+
+<div id="translations">
+<p>
+<span dir="ltr" class="original"><a lang="en" hreflang="en" 
href="/education/edu-schools.en.html">English</a>&nbsp;[en]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="ar" hreflang="ar" 
href="/education/edu-schools.ar.html">العربية</a>&nbsp;[ar]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="bg" hreflang="bg" 
href="/education/edu-schools.bg.html">български</a>&nbsp;[bg]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="ca" hreflang="ca" 
href="/education/edu-schools.ca.html">català</a>&nbsp;[ca]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="de" hreflang="de" 
href="/education/edu-schools.de.html">Deutsch</a>&nbsp;[de]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="el" hreflang="el" 
href="/education/edu-schools.el.html">ελληνικά</a>&nbsp;[el]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="es" hreflang="es" 
href="/education/edu-schools.es.html">español</a>&nbsp;[es]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="fa" hreflang="fa" 
href="/education/edu-schools.fa.html">فارسی</a>&nbsp;[fa]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="fr" hreflang="fr" 
href="/education/edu-schools.fr.html">français</a>&nbsp;[fr]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="he" hreflang="he" 
href="/education/edu-schools.he.html">עברית</a>&nbsp;[he]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="hr" hreflang="hr" 
href="/education/edu-schools.hr.html">hrvatski</a>&nbsp;[hr]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="it" hreflang="it" 
href="/education/edu-schools.it.html">italiano</a>&nbsp;[it]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="ja" hreflang="ja" 
href="/education/edu-schools.ja.html">日本語</a>&nbsp;[ja]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="ml" hreflang="ml" 
href="/education/edu-schools.ml.html">മലയാളം</a>&nbsp;[ml]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="nl" hreflang="nl" 
href="/education/edu-schools.nl.html">Nederlands</a>&nbsp;[nl]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="pl" hreflang="pl" 
href="/education/edu-schools.pl.html">polski</a>&nbsp;[pl]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="pt-br" hreflang="pt-br" 
href="/education/edu-schools.pt-br.html">português&nbsp;do&nbsp;Brasil</a>&nbsp;[pt-br]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="ru" hreflang="ru" 
href="/education/edu-schools.ru.html">русский</a>&nbsp;[ru]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="ta" hreflang="ta" 
href="/education/edu-schools.ta.html">தமிழ்</a>&nbsp;[ta]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="uz" hreflang="uz" 
href="/education/edu-schools.uz.html">Oʻzbekcha</a>&nbsp;[uz]</span>&nbsp;&nbsp;
+</p>
+</div>
+<!-- end of server/body-include-1.html -->
+
+<!-- start of server/body-include-2.html -->
+
+<!-- Begin fundraising banner -->
+<!-- End fundraising banner -->
+
+<div id="header">
+
+<div id="fssbox">
+<p><strong>Recevez notre lettre électronique<br />mensuelle (traduite en 
français),<br /> le <a
+href="https://www.fsf.org/free-software-supporter/";>Free Software
+Supporter</a></strong></p>
+</div><!-- /fssbox -->
+
+<div id="logo">
+ <p><a href="/">
+ <img src="/graphics/heckert_gnu.small.png" alt=" [Une tête de GNU] " 
/>&nbsp;Le&nbsp;système&nbsp;d'exploitation&nbsp;<strong>GNU</strong></a></p>
+</div><!-- /logo -->
+
+</div><!-- /header -->
+
+
+<div id="navigation">
+ <ul>
+  <li id="tabAboutGNU"><a href="/gnu/gnu.html">À propos de GNU</a></li>
+  <li id="tabPhilosophy"><a 
href="/philosophy/philosophy.html">Philosophie</a></li>
+  <li id="tabLicenses"><a href="/licenses/licenses.html">Licences</a></li>
+  <li class="active" id="tabEducation"><a 
href="education.html">Éducation</a></li>
+  <li id="tabSoftware"><a href="/software/software.html">Logiciel</a></li>
+  <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
+  <li id="tabHelp"><a href="/help/help.html">Aidez GNU</a></li>
+ </ul>
+</div><!--  /navigation -->
+
+<!-- end of server/body-include-2.html -->
+
+<div id="content">
+
+<!-- end of banner.fr.html -->
+
 <div id="education-content">
 
 <!-- begin edu navigation bar -->
@@ -32,23 +130,18 @@
 href="/education/education.html#indepth">Pour aller plus loin</a> &rarr;
 Pourquoi les écoles doivent utiliser exclusivement du logiciel libre</p>
 
-<!--#if expr="${DISABLE_TOP_ADDENDUM} == yes" --><!--#else -->
-<!--#set var='link_to_english_page' value='' -->
-<!--#if expr="${ENGLISH_PAGE}" -->
 <!--#set var='link_to_english_page' 
          value='<a href="${ENGLISH_PAGE}">' -->
-<!--#endif -->
 <p class="trans-disclaimer"><!--#echo encoding="none" 
var="link_to_english_page" -->
 L'original de cette page est en anglais.
 <br />
-<!--#if expr="${ENGLISH_PAGE}" -->
 </a>
-<!--#endif -->
 </p>
-<!--#endif --><p>par <a href="http://www.stallman.org/";>Richard 
Stallman</a></p>
 
 <h2>Pourquoi les écoles doivent utiliser exclusivement du logiciel libre</h2>
 
+<p>par <a href="http://www.stallman.org/";>Richard Stallman</a></p>
+
 <p>Il existe des raisons très générales pour lesquelles tout utilisateur
 d'ordinateur doit exiger des logiciels libres : ils lui donnent la
 possibilité de contrôler son propre ordinateur. Avec les logiciels
@@ -259,7 +352,7 @@
 <!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2014/02/04 16:45:09 $
+$Date: 2014/02/04 17:06:06 $
 
 <!-- timestamp end -->
 </p>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]