www-commits
[Top][All Lists]
Advanced

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

www/server/staging/nav-bar/test9 body-include-1...


From: Therese Godefroy
Subject: www/server/staging/nav-bar/test9 body-include-1...
Date: Tue, 04 Mar 2014 09:54:42 +0000

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/03/04 09:54:42

Modified files:
        server/staging/nav-bar/test9: body-include-1.html 
                                      body-include-1.fr.html 
                                      body-include-2.html 
                                      body-include-2.fr.html 
                                      edu-schools5.html 
                                      education3.fr.html 
                                      free-distros2.fr.html home5.html 
                                      other-free-books2.fr.html 
                                      philosophy2.fr.html 

Log message:
        Adjust layout5.css; update all test files and includes to layout5.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1.fr.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.fr.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-schools5.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education3.fr.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/free-distros2.fr.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/other-free-books2.fr.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy2.fr.html?cvsroot=www&r1=1.9&r2=1.10

Patches:
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-1.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- body-include-1.html 3 Mar 2014 13:43:52 -0000       1.8
+++ body-include-1.html 4 Mar 2014 09:54:41 -0000       1.9
@@ -6,25 +6,6 @@
  <a href="/accessibility/">Accessibility</a>
 </div> <!-- /toplinks -->
 
-<div id="fsf-frame">
-<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a><br
 />GNU's main sponsor<br />+++</p>
-
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Newsletter</a></p>
-<form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div>
-  <input name="postURL" type="hidden" value="" />
-  <input type="hidden" name="group[25]" value="1" /> <input name="cancelURL" 
type="hidden"
-value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-  <input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-<p><label></label>
-<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80" 
value="email address"/>
-<input type="submit" name="_qf_Edit_next" value="Sign up" /></p>
-</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
-
 <div id="searcher">
  <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
   <div><label class="netscape4" for="phrase">Search:</label>

Index: body-include-1.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-1.fr.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- body-include-1.fr.html      3 Mar 2014 20:14:51 -0000       1.5
+++ body-include-1.fr.html      4 Mar 2014 09:54:41 -0000       1.6
@@ -6,25 +6,6 @@
  <a href="/accessibility/">Accessibilité</a>
 </div> <!-- /toplinks -->
 
-<div id="fsf-frame">
-<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>REJOIGNEZ&nbsp;LA&nbsp;FSF</a><br
 />principal sponsor de GNU<br />+++</p>
-
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Lettre d'information</a> (traduite)</p>
-<form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div>
-<input name="postURL" type="hidden" value="" />
-<input type="hidden" name="group[25]" value="1" />
-<input name="cancelURL" type="hidden"
-value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-<input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-<label></label>
-<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80" 
value="adresse courriel"/> <input type="submit" name="_qf_Edit_next" 
value="S'abonner" />
-</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
-
 <div id="searcher">
  <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
   <div><label class="netscape4" for="phrase">Search:</label>

Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- body-include-2.html 3 Mar 2014 13:41:00 -0000       1.7
+++ body-include-2.html 4 Mar 2014 09:54:41 -0000       1.8
@@ -2,10 +2,30 @@
 
 <div id="header">
 
+<div id="fsf-frame">
+<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a><br
 />+++</p>
+
+<div id="fssbox">
+<p><a href="http://www.fsf.org/fss";>Newsletter</a></p>
+<form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
+<div>
+  <input name="postURL" type="hidden" value="" />
+  <input type="hidden" name="group[25]" value="1" /> <input name="cancelURL" 
type="hidden"
+value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
+  <input name="_qf_default" type="hidden" value="Edit:cancel" />
+</div>
+<p><label></label>
+<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80" 
value="email address"/>
+<input type="submit" name="_qf_Edit_next" value="Sign up" /></p>
+</form>
+</div><!-- /fssbox -->
+</div><!-- /fsf-frame -->
+
 <div id="gnu-banner">
  <a href="/">
- <img src="heckert_gnu.small.png" alt=" [A GNU head] " />Système 
d'exploitation <strong>GNU</strong></a>
+ <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] " 
/><strong>GNU</strong> Operating System</a>
 </div><!-- /gnu-banner -->
+<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free 
Software Foundation</a></p>
 
 </div><!-- /header -->
 

Index: body-include-2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.fr.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- body-include-2.fr.html      3 Mar 2014 20:00:58 -0000       1.3
+++ body-include-2.fr.html      4 Mar 2014 09:54:41 -0000       1.4
@@ -2,10 +2,30 @@
 
 <div id="header">
 
+<div id="fsf-frame">
+<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>REJOIGNEZ&nbsp;LA&nbsp;FSF</a></p><hr
 />
+
+<div id="fssbox">
+<p><a href="http://www.fsf.org/fss";>Lettre d'information</a> (traduite)</p>
+<form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
+<div>
+<input name="postURL" type="hidden" value="" />
+<input type="hidden" name="group[25]" value="1" />
+<input name="cancelURL" type="hidden"
+value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
+<input name="_qf_default" type="hidden" value="Edit:cancel" />
+</div>
+<label></label>
+<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80" 
value="adresse courriel"/> <input type="submit" name="_qf_Edit_next" 
value="S'abonner" />
+</form>
+</div><!-- /fssbox -->
+</div><!-- /fsf-frame -->
+
 <div id="gnu-banner">
  <a href="/">
  <img src="heckert_gnu.small.png" alt=" [A GNU head] " />Système 
d'exploitation <strong>GNU</strong></a>
 </div><!-- /gnu-banner -->
+<p id="fsf-support">Soutenu par la <a href="#mission-statement">Free Software 
Foundation</a></p>
 
 </div><!-- /header -->
 
@@ -22,3 +42,4 @@
 </div><!--  /navigation -->
 
 <!-- end of server/body-include-2.html -->
+

Index: edu-schools5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools5.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- edu-schools5.html   3 Mar 2014 14:23:18 -0000       1.23
+++ edu-schools5.html   4 Mar 2014 09:54:41 -0000       1.24
@@ -1,4 +1,18 @@
-<!--#include virtual="/server/header.html" -->
+<!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.75 -->
 
@@ -24,93 +38,22 @@
 <body>
 <div class="inner">
 
-<!-- start of server/body-include-1.html -->
-<!--#set var="HTML_BODY" value="yes" -->
-
-<div id="toplinks">
- <a href="#content">Skip to main text</a>&nbsp;&nbsp;&nbsp;&nbsp;
- <a href="/accessibility/">Accessibility</a>
-</div> <!-- /toplinks -->
-
-<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="Why GNU/Linux?" onfocus="this.value=''" />
-  <input type="submit" value="Search" />
-  </div><!-- unnamed label -->
- </form>
-</div><!-- /searcher -->
-
-<!--#if expr="$TRANSLATION_LIST" -->
-<!--#echo encoding="none" var="TRANSLATION_LIST" -->
-<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
-<!-- if initial translation list isn't included before banner.html,
-     then the file may use an old boilerplate that contains
-     div#translations in its body, and we mustn't duplicate it here. -->
-<!--#include virtual="/server/gnun/initial-translations-list.html" -->
-<!--#endif -->
-<!-- end of server/body-include-1.html -->
-
-<!-- start of server/body-include-2.html -->
-
-<div id="header">
-
-<div id="fsf-frame">
-<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a><br
 />+++</p>
-
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Newsletter</a></p>
-<form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div>
-  <input name="postURL" type="hidden" value="" />
-  <input type="hidden" name="group[25]" value="1" /> <input name="cancelURL" 
type="hidden"
-value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-  <input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-<p><label></label>
-<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80" 
value="email address"/>
-<input type="submit" name="_qf_Edit_next" value="Sign up" /></p>
-</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
-
-<div id="gnu-banner">
- <a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] " 
/><strong>GNU</strong> Operating System</a>
-</div><!-- /gnu-banner -->
-<p id="fsf-support">Supported by the <a href="#mission-statement">Free 
Software Foundation</a></p>
-
-</div><!-- /header -->
-
-<div id="navigation">
- <ul>
-  <li id="tabAboutGNU"><a href="/gnu/gnu.html">About&nbsp;GNU</a></li>
-  <li id="tabPhilosophy"><a 
href="/philosophy/philosophy.html">Philosophy</a></li>
-  <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
-  <li id="tabEducation"><a href="/education/education.html">Education</a></li>
-  <li id="tabSoftware"><a href="/software/software.html">Software</a></li>
-  <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
-  <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
- </ul>
-</div><!--  /navigation -->
-
-<!-- end of server/body-include-2.html -->
+<!--#include virtual="body-include-1.html" -->
+<!--#include virtual="body-include-2.html" -->
 
 <div id="content">
 
 <!-- end of 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-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>
+ <li><a href="/education/edu-team.html">The Education Team</a></li>
 </ul>
 <!-- end edu navigation bar -->
 
@@ -121,10 +64,8 @@
 <a href="/education/education.html#indepth">In Depth</a> &rarr;
 Why Schools Should Exclusively Use Free Software</div>
 
-<!--GNUN: OUT-OF-DATE NOTICE-->
-<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#include virtual="/server/top-addendum.html" -->
-<!--#endif-->
+
 <h2>Why Schools Should Exclusively Use Free Software</h2>
 
 <p>by <a href="http://www.stallman.org/";>Richard Stallman</a></p>
@@ -261,7 +202,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2014/03/03 14:23:18 $
+$Date: 2014/03/04 09:54:41 $
 <!-- timestamp end -->
 </p>
 

Index: education3.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education3.fr.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- education3.fr.html  3 Mar 2014 20:14:52 -0000       1.8
+++ education3.fr.html  4 Mar 2014 09:54:41 -0000       1.9
@@ -25,7 +25,7 @@
 
 <!-- start of head-include-2.html -->
 <link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout4.css" media="screen" />
+<link rel="stylesheet" href="layout5.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 -->
@@ -48,12 +48,12 @@
 
 <!-- begin edu navigation bar -->
 <ul id="edu-navigation">
-  <li><a href="/education/edu-contents.html">Table des matières</a></li>
-  <li><a href="/education/edu-cases.html">Études de cas</a></li>
-  <li><a href="/education/edu-resources.html">Ressources pédagogiques</a></li>
-  <li><a href="/education/edu-projects.html">Projets pédagogiques</a></li>
+  <li><a href="/education/edu-contents.html">Sommaire</a></li>
+  <li><a href="/education/edu-cases.html">Études de cas</a></li>
+  <li><a href="/education/edu-resources.html">Ressources pédag.</a></li>
+  <li><a href="/education/edu-projects.html">Projets pédag.</a></li>
   <li><a href="/education/edu-faq.html">FAQ</a></li>
-  <li><a href="/education/edu-team.html">L'équipe éducation</a></li>
+  <li><a href="/education/edu-team.html">Qui nous sommes</a></li>
 </ul>
 <!-- end edu navigation bar -->
 
@@ -272,13 +272,14 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Traduction : Pierrick L'Ébraly.<br /> Révision : <a
-href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a></div>
+href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a>
+</div>
 
 
  <p><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2014/03/03 20:14:52 $
+$Date: 2014/03/04 09:54:41 $
 
 <!-- timestamp end -->
 </p>

Index: free-distros2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/free-distros2.fr.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- free-distros2.fr.html       3 Mar 2014 20:48:26 -0000       1.12
+++ free-distros2.fr.html       4 Mar 2014 09:54:41 -0000       1.13
@@ -44,78 +44,9 @@
 <body>
 <div class="inner">
 
-<!-- start of server/body-include-1.html -->
-<!--#set var="HTML_BODY" value="yes" -->
+<!--#include virtual="body-include-1.fr.html" -->
+<!--#include virtual="body-include-2.fr.html" -->
 
-<div id="toplinks">
- <a href="#content">Lire l'article</a>&nbsp;&nbsp;&nbsp;&nbsp;
- <a href="/accessibility/">Accessibilité</a>
-</div> <!-- /toplinks -->
-
-<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 -->
-
-<!--#if expr="$TRANSLATION_LIST" -->
-<!--#echo encoding="none" var="TRANSLATION_LIST" -->
-<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
-<!-- if initial translation list isn't included before banner.html,
-     then the file may use an old boilerplate that contains
-     div#translations in its body, and we mustn't duplicate it here. -->
-<!--#include virtual="/server/gnun/initial-translations-list.html" -->
-<!--#endif -->
-<!-- end of server/body-include-1.html -->
-
-<!-- start of server/body-include-2.html -->
-
-<div id="header">
-
-<div id="fsf-frame">
-<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>REJOIGNEZ&nbsp;LA&nbsp;FSF</a><br
 />+++</p>
-
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Lettre d'information</a> (traduite)</p>
-<form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div>
-<input name="postURL" type="hidden" value="" />
-<input type="hidden" name="group[25]" value="1" />
-<input name="cancelURL" type="hidden"
-value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-<input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-<label></label>
-<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80" 
value="adresse courriel"/> <input type="submit" name="_qf_Edit_next" 
value="S'abonner" />
-</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
-
-<div id="gnu-banner">
- <a href="/">
- <img src="heckert_gnu.small.png" alt=" [A GNU head] " />Système 
d'exploitation <strong>GNU</strong></a>
-</div><!-- /gnu-banner -->
-<p id="fsf-support">Soutenu par la <a href="#mission-statement">Free Software 
Foundation</a><p>
-
-</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">
 <!--#include virtual="/server/top-addendum.fr.html" -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
@@ -376,7 +307,7 @@
 <!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2014/03/03 20:48:26 $
+$Date: 2014/03/04 09:54:41 $
 
 <!-- timestamp end -->
 </p>

Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- home5.html  3 Mar 2014 16:38:27 -0000       1.10
+++ home5.html  4 Mar 2014 09:54:42 -0000       1.11
@@ -20,7 +20,6 @@
 <link rel="alternate" title="Planet GNU" 
href="http://planet.gnu.org/rss20.xml"; type="application/rss+xml" />
 
 <!--#include virtual="/po/home.translist" -->
-
 <!-- start of server/banner.html -->
 <!-- start of head-include-2.html -->
 
@@ -36,78 +35,8 @@
 <body>
 <div  class="inner">
 
-<!-- start of server/body-include-1.html -->
-<!--#set var="HTML_BODY" value="yes" -->
-
-<div id="toplinks">
- <a href="#content">Skip to main text</a>&nbsp;&nbsp;&nbsp;&nbsp;
- <a href="/accessibility/">Accessibility</a>
-</div> <!-- /toplinks -->
-
-<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="Why GNU/Linux?" onfocus="this.value=''" />
-  <input type="submit" value="Search" />
-  </div><!-- unnamed label -->
- </form>
-</div><!-- /searcher -->
-
-<!--#if expr="$TRANSLATION_LIST" -->
-<!--#echo encoding="none" var="TRANSLATION_LIST" -->
-<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
-<!-- if initial translation list isn't included before banner.html,
-     then the file may use an old boilerplate that contains
-     div#translations in its body, and we mustn't duplicate it here. -->
-<!--#include virtual="/server/gnun/initial-translations-list.html" -->
-<!--#endif -->
-<!-- end of server/body-include-1.html -->
-
-<!-- start of server/body-include-2.html -->
-
-<div id="header">
-
-<div id="fsf-frame">
-<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a><br
 />+++</p>
-
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Newsletter</a></p>
-<form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div>
-  <input name="postURL" type="hidden" value="" />
-  <input type="hidden" name="group[25]" value="1" /> <input name="cancelURL" 
type="hidden"
-value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-  <input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-<p><label></label>
-<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80" 
value="email address"/>
-<input type="submit" name="_qf_Edit_next" value="Sign up" /></p>
-</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
-
-<div id="gnu-banner">
- <a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] " 
/><strong>GNU</strong> Operating System</a>
-</div><!-- /gnu-banner -->
-<p id="fsf-support">Supported by the <a href="#mission-statement">Free 
Software Foundation</a></p>
-
-</div><!-- /header -->
-
-<div id="navigation">
- <ul>
-  <li id="tabAboutGNU"><a href="/gnu/gnu.html">About&nbsp;GNU</a></li>
-  <li id="tabPhilosophy"><a 
href="/philosophy/philosophy.html">Philosophy</a></li>
-  <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
-  <li id="tabEducation"><a href="/education/education.html">Education</a></li>
-  <li id="tabSoftware"><a href="/software/software.html">Software</a></li>
-  <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
-  <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
- </ul>
-</div><!--  /navigation -->
-
-<!-- end of server/body-include-2.html -->
+<!--#include virtual="body-include-1.html" -->
+<!--#include virtual="body-include-2.html" -->
 <div id="content">
 
 <!-- end of server/banner.html -->
@@ -274,11 +203,50 @@
 
 </div><!-- for id="content", starts in the include above -->
 
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!-- begin server/footer-text.html -->
+
+<div id="fsf-links">
+ <ul>
+               <li><a href="/">GNU&nbsp;home&nbsp;page</a></li>
+               <li><a 
href="http://www.fsf.org/";>FSF&nbsp;home&nbsp;page</a></li>
+               <li><a href="/graphics/graphics.html">GNU&nbsp;Art</a></li>
+               <li><a href="/fun/fun.html">GNU&nbsp;Fun</a></li>
+               <li><a href="/people/people.html">GNU's&nbsp;Who?</a></li>
+               <li><a 
href="http://directory.fsf.org";>Free&nbsp;Software&nbsp;Directory</a></li>
+               <li><a href="/server/sitemap.html">Site&nbsp;map</a></li>
+ </ul>
+</div><!-- /fsf-links -->
+
+<div id="mission-statement">
+
+<blockquote><a href="http://www.fsf.org";><img id="fsfbanner" 
src="logo-fsf.org-notext.png" alt=" [Logo de la Free Software Foundation] 
"/></a><strong>“Our
+mission is to preserve, protect and promote the freedom to use, study,
+copy, modify, and redistribute computer software, and to defend the
+rights of Free Software users.”</strong></blockquote>
+ 
+<div id="support-fsf">
+<div id="join-fsf">
+ <p><a class="button small" 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
+   JOIN THE FSF!  </a></p>
+</div> <!-- /join-fsf -->
+
+<p>The <a href="http://www.fsf.org";>Free Software
+Foundation</a> is the principal organizational sponsor of the <a
+href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Support GNU and 
the FSF</strong>
+ <a href="http://shop.fsf.org/";>by <a
+href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
+href="http://www.fsf.org/join";>joining the FSF as an associate
+member</a> or by making a
+donation, either <a href="http://donate.fsf.org/";>directly to the FSF</a> 
+or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via 
Flattr</a>.</p>
+</div> <!-- /support-fsf -->
+
+<p id="backtotop"><a href="#header">Back to Top</a></p>
+
+</div> <!-- /mission-statement -->
+
+<!-- end server/footer-text.html -->
 
-<p id="sisters">The FSF also has sister organizations in <a 
href="http://www.fsfe.org";>Europe</a>, <a
-href="http://www.fsfla.org/";>Latin America</a> and <a
-href="http://fsf.org.in/";>India</a>.</p>
 
 <div id="fs-gang">
 <div class="img-container">
@@ -316,7 +284,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2014/03/03 16:38:27 $
+$Date: 2014/03/04 09:54:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: other-free-books2.fr.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/nav-bar/test9/other-free-books2.fr.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- other-free-books2.fr.html   3 Mar 2014 20:48:26 -0000       1.13
+++ other-free-books2.fr.html   4 Mar 2014 09:54:42 -0000       1.14
@@ -35,7 +35,7 @@
 
 <!-- start of head-include-2.html -->
 <link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout4.css" media="screen" />
+<link rel="stylesheet" href="layout5.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 -->
@@ -536,7 +536,7 @@
 <!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2014/03/03 20:48:26 $
+$Date: 2014/03/04 09:54:42 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy2.fr.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy2.fr.html 3 Mar 2014 15:25:42 -0000       1.9
+++ philosophy2.fr.html 4 Mar 2014 09:54:42 -0000       1.10
@@ -40,77 +40,10 @@
 <body>
 <div  class="inner">
 
-<!-- start of server/body-include-1.html -->
-<!--#set var="HTML_BODY" value="yes" -->
+<!--#include virtual="body-include-1.fr.html" -->
+<!--#include virtual="body-include-2.fr.html" -->
 
-<div id="toplinks">
- <a href="#content">Lire l'article</a>&nbsp;&nbsp;&nbsp;&nbsp;
- <a href="/accessibility/">Accessibilité</a>
-</div> <!-- /toplinks -->
-
-<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 -->
-
-<!--#if expr="$TRANSLATION_LIST" -->
-<!--#echo encoding="none" var="TRANSLATION_LIST" -->
-<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
-<!-- if initial translation list isn't included before banner.html,
-     then the file may use an old boilerplate that contains
-     div#translations in its body, and we mustn't duplicate it here. -->
-<!--#include virtual="/server/gnun/initial-translations-list.html" -->
-<!--#endif -->
-<!-- end of server/body-include-1.html -->
-<!-- start of server/body-include-2.html -->
-
-<div id="header">
-
-<div id="fsf-frame">
-<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>REJOIGNEZ&nbsp;LA&nbsp;FSF</a><br
 />+++</p>
-
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Lettre d'information</a> (traduite)</p>
-<form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div>
-<input name="postURL" type="hidden" value="" />
-<input type="hidden" name="group[25]" value="1" />
-<input name="cancelURL" type="hidden"
-value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-<input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-<label></label>
-<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80" 
value="adresse courriel"/> <input type="submit" name="_qf_Edit_next" 
value="S'abonner" />
-</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
-
-<div id="gnu-banner">
- <a href="/">
- <img src="heckert_gnu.small.png" alt=" [A GNU head] " />Système 
d'exploitation <strong>GNU</strong></a>
-</div><!-- /gnu-banner -->
-<p id="fsf-support">Soutenu par la <a href="#mission-statement">Free Software 
Foundation</a><p>
-
-</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">
+<div id="content">
 <!--#include virtual="/server/top-addendum.fr.html" -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
 
@@ -284,7 +217,7 @@
 <!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2014/03/03 15:25:42 $
+$Date: 2014/03/04 09:54:42 $
 
 <!-- timestamp end -->
 </p>



reply via email to

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