[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: |
Wed, 26 Feb 2014 19:08:18 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 14/02/26 19:08:18
Modified files:
server/staging/nav-bar/test9: body-include-1.html
body-include-1.fr.html
body-include-2-5.html
edu-schools5.html
Log message:
Layout5 with FSF button near top links.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1.fr.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2-5.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.12&r2=1.13
Patches:
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-1.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- body-include-1.html 11 Feb 2014 15:54:30 -0000 1.1
+++ body-include-1.html 26 Feb 2014 19:08:17 -0000 1.2
@@ -2,10 +2,10 @@
<!--#set var="HTML_BODY" value="yes" -->
<div id="toplinks">
-<div class="links">
<a href="#content">Skip to main text</a>
- <a href="/accessibility/">Accessibility</a>
-</div> <!-- /links -->
+ <a href="/accessibility/">Accessibility</a>
+ <span class="fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join the FSF!</a></span>
+</div> <!-- /toplinks -->
<div id="searcher">
<form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
@@ -16,7 +16,6 @@
</div><!-- unnamed label -->
</form>
</div><!-- /searcher -->
-</div><!-- /toplinks -->
<!--#if expr="$TRANSLATION_LIST" -->
<!--#echo encoding="none" var="TRANSLATION_LIST" -->
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- body-include-1.fr.html 12 Feb 2014 10:20:01 -0000 1.1
+++ body-include-1.fr.html 26 Feb 2014 19:08:17 -0000 1.2
@@ -2,10 +2,10 @@
<!--#set var="HTML_BODY" value="yes" -->
<div id="toplinks">
-<div class="links">
<a href="#content">Lire l'article</a>
- <a href="/accessibility/">Accessibilité</a>
-</div> <!-- /links -->
+ <a href="/accessibility/">Accessibilité</a>
+ <span class="fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Rejoignez la FSF</a></span>
+</div> <!-- /toplinks -->
<div id="searcher">
<form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
@@ -16,7 +16,6 @@
</div><!-- unnamed label -->
</form>
</div><!-- /searcher -->
-</div><!-- /toplinks -->
<!--#if expr="$TRANSLATION_LIST" -->
<!--#echo encoding="none" var="TRANSLATION_LIST" -->
Index: body-include-2-5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2-5.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- body-include-2-5.html 16 Feb 2014 10:18:45 -0000 1.3
+++ body-include-2-5.html 26 Feb 2014 19:08:17 -0000 1.4
@@ -3,12 +3,12 @@
<div id="header">
<div id="fssbox">
-<p><strong>Sign up for our monthly email newsletter, the<br /><a
+<p><strong>Sign up for our monthly newsletter, the<br /><a
href="https://www.fsf.org/free-software-supporter/";>Free Software
Supporter</a></strong></p>
</div><!-- /fssbox -->
-<div id="logo">
+<div id="gnu-banner">
<a href="/">
<img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] "
/><strong>GNU</strong> Operating System</a>
</div><!-- /logo -->
Index: edu-schools5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools5.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- edu-schools5.html 21 Feb 2014 21:29:18 -0000 1.12
+++ edu-schools5.html 26 Feb 2014 19:08:17 -0000 1.13
@@ -1,18 +1,4 @@
-<!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 -->
+<!--#include virtual="/server/header.html" -->
<!-- Parent-Version: 1.75 -->
@@ -23,6 +9,8 @@
<title>Why Schools Should Exclusively Use Free Software - GNU Project -
Free Software Foundation</title>
+<!--#include virtual="/education/po/edu-schools.translist" -->
+
<!-- start of banner.html -->
<!-- start of head-include-2.html -->
@@ -36,94 +24,23 @@
<body>
<div class="inner">
-<!-- start of server/body-include-1.html -->
-
-<div id="toplinks">
- <a href="#content">Skip to main text</a>
- <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 -->
-
-<div id="translations">
-<p>
-<span dir="ltr" class="original"><a lang="en" hreflang="en"
href="/education/edu-schools.en.html">English</a> [en]</span>
-<span dir="ltr"><a lang="ar" hreflang="ar"
href="/education/edu-schools.ar.html">اÙعربÙØ©</a> [ar]</span>
-<span dir="ltr"><a lang="bg" hreflang="bg"
href="/education/edu-schools.bg.html">бÑлгаÑÑки</a> [bg]</span>
-<span dir="ltr"><a lang="ca" hreflang="ca"
href="/education/edu-schools.ca.html">català </a> [ca]</span>
-<span dir="ltr"><a lang="de" hreflang="de"
href="/education/edu-schools.de.html">Deutsch</a> [de]</span>
-<span dir="ltr"><a lang="el" hreflang="el"
href="/education/edu-schools.el.html">ελληνικά</a> [el]</span>
-<span dir="ltr"><a lang="es" hreflang="es"
href="/education/edu-schools.es.html">español</a> [es]</span>
-<span dir="ltr"><a lang="fa" hreflang="fa"
href="/education/edu-schools.fa.html">ÙارسÛ</a> [fa]</span>
-<span dir="ltr"><a lang="fr" hreflang="fr"
href="/education/edu-schools.fr.html">français</a> [fr]</span>
-<span dir="ltr"><a lang="he" hreflang="he"
href="/education/edu-schools.he.html">×¢×ר×ת</a> [he]</span>
-<span dir="ltr"><a lang="hr" hreflang="hr"
href="/education/edu-schools.hr.html">hrvatski</a> [hr]</span>
-<span dir="ltr"><a lang="it" hreflang="it"
href="/education/edu-schools.it.html">italiano</a> [it]</span>
-<span dir="ltr"><a lang="ja" hreflang="ja"
href="/education/edu-schools.ja.html">æ¥æ¬èª</a> [ja]</span>
-<span dir="ltr"><a lang="ml" hreflang="ml"
href="/education/edu-schools.ml.html">മലയാളà´</a> [ml]</span>
-<span dir="ltr"><a lang="nl" hreflang="nl"
href="/education/edu-schools.nl.html">Nederlands</a> [nl]</span>
-<span dir="ltr"><a lang="pl" hreflang="pl"
href="/education/edu-schools.pl.html">polski</a> [pl]</span>
-<span dir="ltr"><a lang="pt-br" hreflang="pt-br"
href="/education/edu-schools.pt-br.html">português do Brasil</a> [pt-br]</span>
-<span dir="ltr"><a lang="ru" hreflang="ru"
href="/education/edu-schools.ru.html">ÑÑÑÑкий</a> [ru]</span>
-<span dir="ltr"><a lang="ta" hreflang="ta"
href="/education/edu-schools.ta.html">தமிழà¯</a> [ta]</span>
-<span dir="ltr"><a lang="uz" hreflang="uz"
href="/education/edu-schools.uz.html">Oʻzbekcha</a> [uz]</span>
-</p>
-</div>
-<!-- end of server/body-include-1.html -->
-
-<!-- start of server/body-include-2.html -->
-
-<div id="header">
-
-<div id="fssbox">
-<p><strong>Sign up for our monthly email newsletter, the<br /><a
-href="https://www.fsf.org/free-software-supporter/";>Free Software
-Supporter</a></strong></p>
-</div><!-- /fssbox -->
-
-<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 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 GNU</a></li>
- </ul>
-</div><!-- /navigation -->
-
-<!-- end of server/body-include-2.html -->
+<!--#include virtual="body-include-1.html" -->
+<!--#include virtual="body-include-2-5.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 -->
@@ -134,8 +51,10 @@
<a href="/education/education.html#indepth">In Depth</a> →
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>
@@ -223,41 +142,7 @@
</div><!-- for id="content", starts in the include above -->
-<!-- begin server/footer-text.html -->
-
-<div id="fsf-links">
- <ul>
- <li><a href="/">GNU home page</a></li>
- <li><a href="http://www.fsf.org/";>FSF home page</a></li>
- <li><a href="/graphics/graphics.html">GNU Art</a></li>
- <li><a href="/fun/fun.html">GNU Fun</a></li>
- <li><a href="/people/people.html">GNU's Who?</a></li>
- <li><a
href="http://directory.fsf.org";>Free Software Directory</a></li>
- <li><a href="/server/sitemap.html">Site 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=" [Free Software Foundation logo]
"/></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 <strong><a href="http://www.fsf.org";>Free Software
-Foundation</a></strong> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Support GNU and
the FSF</strong>
-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 -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
@@ -306,7 +191,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2014/02/21 21:29:18 $
+$Date: 2014/02/26 19:08:17 $
<!-- timestamp end -->
</p>
- www/server/staging/nav-bar/test9 body-include-1...,
Therese Godefroy <=