[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 body-include-2...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 body-include-2... |
|
Date: |
Thu, 03 Sep 2015 19:03:12 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/09/03 19:03:12
Modified files:
server/staging/nav-bar/test9: body-include-2.html
philosophy-menu.html
footer-text.html layout7.css
software.html education.html
philosophy.html
edu-software-gcompris.html
Log message:
Go back to including the philosophy menu the usual way; page-tags at
the end. Define tags after header.html in normal pages and before OUT-OF-DATE
marker in pages with edu navbar. Add a list of links to software.html. Adjust
style.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy-menu.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/footer-text.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.79&r2=1.80
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/software.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gcompris.html?cvsroot=www&r1=1.10&r2=1.11
Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- body-include-2.html 1 Sep 2015 14:15:16 -0000 1.25
+++ body-include-2.html 3 Sep 2015 19:03:11 -0000 1.26
@@ -36,18 +36,18 @@
<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
-<!--#if expr="$REQUEST_URI = /\/gnu/ || $REQUEST_URI = /\/fry\//" -->
+<!--#if expr="$REQUEST_URI = /gnu\//" -->
<li id="tabAboutGNU" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="gnu.html">About GNU</a>
+ <a href="/gnu/about-gnu.html">About GNU</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabAboutGNU"><a href="gnu.html">About GNU</a></li>
+ <li id="tabAboutGNU"><a href="/gnu/about-gnu.html">About GNU</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /\/philosophy/ || $REQUEST_URI =
/rms-nyu-2001-transcript/" -->
+<!--#if expr="$REQUEST_URI = /\/philosophy/ || $REQUEST_URI =
/rms-nyu-2001-transcript/ || $REQUEST_URI = /essays-and-articles/" -->
<li id="tabPhilosophy" class="active">
<!--#echo encoding="none" var="MARK_START" -->
<a href="philosophy.html">Philosophy</a>
@@ -58,15 +58,15 @@
<li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /\/licenses/ || $REQUEST_URI = /\/copyleft/" -->
+<!--#if expr="$REQUEST_URI = /\/licenses\// || $REQUEST_URI = /\/copyleft/" -->
<li id="tabLicenses" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="licenses.html">Licenses</a>
+ <a href="/licenses/licenses.html">Licenses</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabLicenses"><a href="licenses.html">Licenses</a></li>
+ <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
<!--#endif -->
<!--#if expr="$REQUEST_URI = /\/edu/ || $REQUEST_URI = /\/encyclopedia/" -->
@@ -94,39 +94,28 @@
<!--#if expr="$REQUEST_URI = /\/doc/ || $REQUEST_URI = /\/manual/ ||
$REQUEST_URI = /books/" -->
<li id="tabDoc" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="doc.html">Documentation</a>
+ <a href="/doc/doc.html">Documentation</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabDoc"><a href="doc.html">Documentation</a></li>
+ <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
<!--#endif -->
<!--#if expr="$REQUEST_URI = /\/help/" -->
<li id="tabHelp" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="help.html">Help GNU</a>
+ <a href="/help/help.html">Help GNU</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabHelp"><a href="help.html">Help GNU</a></li>
+ <li id="tabHelp"><a href="/help/help.html">Help GNU</a></li>
<!--#endif -->
</ul>
</div><!-- /navigation -->
-<!--#if expr="$REQUEST_URI = /\/philosophy/ || $REQUEST_URI =
/rms-nyu-2001-transcript/" -->
-<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
-<!--#elif expr="$REQUEST_URI = /\/software/ || $REQUEST_URI = /\/distros/ ||
$REQUEST_URI = /\/gethelp/" -->
-<!--#include virtual="/server/staging/nav-bar/test9/software-menu.html" -->
-<!--#endif -->
-
-<!--#if expr="$TAGS && $REQUEST_URI != /\/edu/" -->
-<div class="page-tags"><strong>Page keywords</strong>:
-<span class="gnun-split"></span>
<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
-</div>
-<!--#endif -->
<!-- end of server/body-include-2 -->
Index: philosophy-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy-menu.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy-menu.html 26 Aug 2015 18:22:55 -0000 1.3
+++ philosophy-menu.html 3 Sep 2015 19:03:11 -0000 1.4
@@ -2,12 +2,13 @@
<!-- begin edu navigation bar -->
<ul id="edu-navigation">
- <li><a href="/philosophy/essays-and-articles.html">Essays &
articles</a></li>
- <li><a href="/philosophy/speeches-and-interview.html">Speeches &
interviews</a></li>
- <li><a href="/philosophy/third-party-ideas.html">Third party ideas</a></li>
- <li><a href="/server/sitemap.html#directory-philosophy">All
articles</a></li>
- <li><a href="http://audio-video.gnu.org/";>Audio & video</a></li>
+ <li><a href="essays-and-articles.html">Essays & articles</a></li>
+ <li><a
href="/philosophy/speeches-and-interview.html">Speeches & interviews</a></li>
+ <li><a
href="/philosophy/third-party-ideas.html">Third party ideas</a></li>
+ <li><a
href="/server/sitemap.html#directory-philosophy">All articles</a></li>
+ <li><a href="http://audio-video.gnu.org/";>Audio & video</a></li>
</ul>
<!-- end edu navigation bar -->
+<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
<!-- end philosophy/philosophy-menu.html -->
Index: footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/footer-text.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- footer-text.html 1 Sep 2015 14:15:17 -0000 1.15
+++ footer-text.html 3 Sep 2015 19:03:11 -0000 1.16
@@ -1,6 +1,7 @@
<!-- begin server/footer-text.html -->
+
<div id="all-tags">
-<strong>All keywords</strong>: <!--#set var="TAGS" value="all" -->
+<!--#set var="TAGS" value="all" -->
<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
</div><!-- /all-tags -->
@@ -11,6 +12,7 @@
<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="https://directory.fsf.org/wiki/Main_Page";>Free Software Directory</a></li>
<li><a href="/server/sitemap.html">Site map</a></li>
</ul>
</div><!-- /fsf-links -->
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- layout7.css 1 Sep 2015 14:15:17 -0000 1.79
+++ layout7.css 3 Sep 2015 19:03:11 -0000 1.80
@@ -209,7 +209,7 @@
font-size: .9em;
font-family: "FreeSans", sans-serif;
font-weight: bold;
- padding: .6em 1.5em 0 1.2em;
+ padding: .6em 1.7em 0 1.7em;
margin: 0;
}
#toplinks a, #toplinks a:visited {
@@ -225,7 +225,7 @@
display: block;
text-align: right;
font-weight: bold;
- padding: .3em 1.5%;
+ padding: .3em 2%;
background-color: #d1d4d7;
}
#searcher input {
@@ -280,7 +280,7 @@
}
#translations p {
padding: .2em 0;
- margin: 0 1.5%;
+ margin: 0 2%;
background-color: #f0f2f4;
}
#translations span {
@@ -309,7 +309,7 @@
#header {
font-family: "FreeSans", sans-serif;
- margin: 0 1.5%;
+ margin: 0 2%;
background-color: white;
}
#header:after {
@@ -408,7 +408,7 @@
/* For "normal" pages */
@media (max-width: 40em) {
- #gnu-banner, p, dd, dt, li, h3, h4 { clear: both }
+ #gnu-banner { clear: both }
}
#gnu-banner {
@@ -514,18 +514,18 @@
#all-tags, .page-tags {
font-family: "FreeSans", sans-serif;
font-size: .9em;
- margin: .6em 1.5%;
+ margin: .6em 2%;
color: #555;
}
#all-tags {
text-align: center;
- line-height: 1.7em;
+ line-height: 1.6em;
margin: 2em 1.6em; }
-#content .page-tags { margin: .6em 0; }
+#content .page-tags { margin: .4em 0; }
#all-tags a, #all-tags a:visited,
.page-tags a, .page-tags a:visited {
- padding: .1em .4em .2em .4em;
+ padding: .2em .4em;
line-height: 1.5em;
color: #555;
text-decoration: none;
@@ -542,10 +542,11 @@
}
#content {
text-align: left;
- padding: 0 1.5% 1em 1.5%; margin-top: 0;
+ padding: 0 2% 1em 2%; margin-top: 0;
}
#content h1, #content h2 {
font-weight:bold;
+ text-align: center;
padding: 0;
margin: 1em 0 1.3em 0;
color: #334683; text-shadow: #999 1px 1px 0;
@@ -553,6 +554,8 @@
#content h1 { font-size: 2.4em; }
#content h2 { font-size: 2em; }
+#content h2 { font-size: 2em; }
+#content h2 { font-size: 2em; }
#content h3, #content h4, #content h5, #content h6, #content p {
margin-top: 1em ;
}
@@ -618,7 +621,7 @@
#mission-statement {
font-size: 0.9em;
- margin: 2em 1.5% 1em 1.5%;
+ margin: 2em 2% 1em 2%;
}
#mission-statement blockquote {
font-weight: bold;
@@ -646,7 +649,7 @@
#backtotop a, #backtotop a:visited { color: #333; }
#backtotop a:hover { color: #777; }
-#sisters { font-size: .9em; margin: 0 1.5% 1.5em 1.5%; }
+#sisters { font-size: .9em; margin: 0 2% 1.5em 2%; }
/*** FOOTER ***/
@@ -654,7 +657,7 @@
#footer {
clear: both;
font-size: .9em;
- padding: 1.11em 1.5%;
+ padding: 1.11em 2%;
color: #333;
background-color: #f0f2f4;
border-top: 1px solid #c9cccf;
@@ -694,6 +697,7 @@
}
#home h2 {
+ text-align: left;
text-shadow: none;
padding: 0;
margin-top: .7em; margin-bottom: .6em;
@@ -818,9 +822,9 @@
float: right;
text-align: center;
font-style: normal;
- width: 20em; max-width: 90%;
+ max-width: 20em;
padding: 0;
- margin: .3em 1em 1em 1em;
+ margin: .3em 0 1em 1em;
border: .3em solid #3465a4;
}
#content .note p {
@@ -830,21 +834,28 @@
margin: 1em 0;
}
#content .note strong { font-size: 1.2em; }
+#content .summary li { padding-bottom: .3em; }
address@hidden (max-width: 40em) {
+ #content .note { float: none; margin: auto; }
+}
/* For the note about Free Software Free Society */
#content blockquote#fsfs p { padding: .3em 0; }
/* For small tables of contents. */
#content .summary {
+ clear: right;
float: right;
- max-width: 22em;
+ max-width: 24em;
padding: 1em;
- margin: .3em 1em 1em 1em;
+ margin: .3em 0 1em 1em;
background: #f0f2f4;
border: 1px solid #c9cccf;
}
#content .summary li { padding-bottom: .3em; }
-
address@hidden (max-width: 44em) {
+ #content div.summary { float: none; margin: auto; }
+}
/*** TRANSLATED PAGES ***/
@@ -863,7 +874,7 @@
#outdated {
text-align: center;
padding: .7em 3%;
- margin: 1em;
+ margin: 1em 0;
background-color: #f0f2f4;
border: .3em solid #d1d4d7;
}
@@ -895,16 +906,13 @@
font-size: .9em; font-weight: bold;
line-height: 1.8em;
padding: 0;
- margin: 0 -1.6%;
+ margin: 0 -2.2%;
}
#edu-navigation li {
display: inline; white-space: nowrap;
list-style-type: none;
padding: 0;
}
-#edu-navigation li.current {
- border-bottom: 4px solid #971611;
-}
#edu-navigation li a, #edu-navigation li a:visited {
padding: .3em .45em .35em .45em;
color: #222; text-decoration: none;
@@ -916,12 +924,11 @@
#edu-navigation li.active a:hover {
text-decoration: underline;
}
-
#content .edu-breadcrumb {
font-size: .9em;
font-weight: bold;
text-align: left;
- margin: .7em 0 0 0;
+ margin: .4em 0 0 0;
color: #555;
}
#content .edu-breadcrumb a,
@@ -1161,11 +1168,11 @@
/* Still used in some outdated translations? */
#translations h3, #translations h4 {
font-size: 1em; font-weight: bold;
- padding: 1em 1.5% 0 1.5%;
+ padding: 1em 2% 0 2%;
margin: 0;
}
#translations ul {
- margin: 1em 1.5%;
+ margin: 1em 2%;
background: #f0f2f4;
}
#translations li {
Index: software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/software.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- software.html 1 Sep 2015 14:25:18 -0000 1.11
+++ software.html 3 Sep 2015 19:03:11 -0000 1.12
@@ -5,13 +5,14 @@
<!--#include virtual="/software/po/software.translist" -->
<style type="text/css" media="print,screen">
+<!--
#dynamic-duo {
float: right;
width: 20em;
font-style: normal;
text-align: center;
padding: .8em;
- margin: .3em 1em 1em 1em;
+ margin: .3em 0 1em 1em;
border: .5em solid #acc890;
}
#dynamic-duo p strong {
@@ -23,7 +24,17 @@
padding: .5em .8em .7em .8em;
margin: .5em;
border-width: 1px;
-}
+} -->
+#content div.summary { float: left; margin: .3em 1em 1em 0; }
+<!--#if expr="$LANGUAGE_SUFFIX = /\\.(ar|fa|he)/" -->
+<!--
+#content #dynamic-duo { float: left; margin: .3em 1em 1em 0; }
+#content div.summary { float: right; margin: .3em 0 1em 1em; }
+<!--#endif -->
+<!--
address@hidden (max-width: 50em) {
+ #content #dynamic-duo { display: none; }
+} -->
</style>
<!--#include virtual="/server/fs-gang-definitions.html" -->
@@ -31,14 +42,17 @@
<h2>GNU Software</h2>
-<blockquote id="dynamic-duo">
-<p><strong>Download distributions</strong></p>
-<p><a href="/distros/free-distros.html">
-<img src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux"
/></a></p>
-<p class="highlight-para">If you're looking for a whole system to
-install, see our <a href="/distros/free-distros.html">list of
-GNU/Linux distributions which are entirely free software</a>.</p>
-</blockquote>
+<div class="summary">
+<h4 class="c">A few useful links</h4>
+<ul>
+ <li><strong><a href="/distros/free-distros.html">Wholly free GNU/Linux
Distributions</a></strong></li>
+ <li><a href="/distros/distros.html">GNU/Linux Distributions</a></li>
+ <li><a href="http://directory.fsf.org/wiki/GNU/";>Free Software
Directory</a></li>
+ <li><a href="/manual/manual.html">Manuals</a></li>
+ <li><a href="/software/devel.html">Development resources</a></li>
+ <li><a href="/help/gethelp.html">Get help</a></li>
+</ul>
+</div>
<p><a href="/gnu/about-gnu.html">GNU</a> is an operating system which is
100% free software. It was launched in 1983 by Richard Stallman (rms)
@@ -77,6 +91,15 @@
<h3 id="getgnu">How to get GNU software</h3>
+<blockquote id="dynamic-duo">
+<p><strong>Download distributions</strong></p>
+<p><a href="/distros/free-distros.html">
+<img src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux"
/></a></p>
+<p class="highlight-para">If you're looking for a whole system to
+install, see our <a href="/distros/free-distros.html">list of
+GNU/Linux distributions which are entirely free software</a>.</p>
+</blockquote>
+
<p>GNU software is available by several different methods:</p>
<ul>
@@ -262,7 +285,7 @@
</p>
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<!--#include virtual="/server/fs-gang.html" -->
@@ -321,7 +344,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/01 14:25:18 $
+$Date: 2015/09/03 19:03:11 $
<!-- timestamp end -->
</p>
</div>
Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- education.html 1 Sep 2015 14:15:17 -0000 1.21
+++ education.html 3 Sep 2015 19:03:11 -0000 1.22
@@ -2,15 +2,17 @@
<!-- Parent-Version: 1.76 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-<!--#set var="TAGS" value=" education " -->
<title>Free Software and Education - GNU Project - Free Software
Foundation</title>
<!--#include virtual="/education/po/education.translist" -->
<style type="text/css" media="screen">
<!--
-#content #video-container { margin: 1em 0 2em 0; }
-#content #video-container p { margin: 0; }
+#content #video-container {
+ float: left; width: 40em;
+ padding-bottom: 2em; margin: 1em 0;
+}
+#content #video-container p { text-align: justify; margin: 0; }
#rms-movie { width: 100%; margin-bottom: 1em; }
#content #indepth {
text-align: left;
@@ -25,8 +27,18 @@
<!--#if expr="$LANGUAGE_SUFFIX = /\\.(ar|fa|he)/" -->
<!--
#content #indepth { text-align: right; }
--->
+#content #video-container { float: right; } -->
<!--#endif -->
+<!--
address@hidden (max-width: 66em) {
+ #content #video-container { float: none; width: 100%;
+ max-width: 40em; margin: auto; }
+ #content #indepth { float: none; margin: auto }
+}
address@hidden (max-width: 40em) {
+ #content blockquote#free-games { float: none; margin: auto }
+}
+-->
</style>
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
@@ -45,12 +57,8 @@
</div> <!-- id="education-content" -->
-<!--#if expr="$TAGS" -->
-<div class="page-tags"><strong>Page keywords</strong>:
-<span class="gnun-split"></span>
+<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
-</div>
-<!--#endif -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -60,17 +68,17 @@
<!--#endif -->
<div class="center">
-<h2 class="center">Free Software and Education</h2>
+<h2>Free Software and Education</h2>
</div>
-<h3>How Does Free Software Relate to Education?</h3>
-
-<blockquote class="note"><p>
+<blockquote id="free-games" 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";><address@hidden></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
@@ -122,9 +130,8 @@
<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>
+(ogv) free format.<span class="gnun-split"></span>
-<p>
<!-- TRANSLATORS: please add the link to your language here in the first
place, followed by a comma. -->
@@ -134,9 +141,8 @@
<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>
+<span class="gnun-split"></span>
-<p>
<!-- TRANSLATORS: please add the link to your language here in the first
place, followed by a comma. -->
@@ -205,7 +211,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/01 14:15:17 $
+$Date: 2015/09/03 19:03:11 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy.html 1 Sep 2015 14:15:18 -0000 1.9
+++ philosophy.html 3 Sep 2015 19:03:11 -0000 1.10
@@ -1,12 +1,21 @@
<!--#include virtual="/server/header.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
<!-- Parent-Version: 1.77 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>Philosophy of the GNU Project
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/philosophy.translist" -->
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
+<!--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 -->
<h2>Philosophy of the GNU Project</h2>
@@ -39,10 +48,6 @@
<h3 id="introduction">Introduction</h3>
-<!-- I don't think it's good idea to link specific translation -->
-<!-- (e.g. foo.fr.html) from here. It would be better to link them -->
-<!-- from philosophy.fr.html and the original documents. -mhatta -->
-
<ul>
<li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
<li><a href="/philosophy/free-software-even-more-important.html">
@@ -134,7 +139,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/01 14:15:18 $
+$Date: 2015/09/03 19:03:11 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-gcompris.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-gcompris.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- edu-software-gcompris.html 1 Sep 2015 14:25:18 -0000 1.10
+++ edu-software-gcompris.html 3 Sep 2015 19:03:11 -0000 1.11
@@ -1,5 +1,4 @@
<!--#include virtual="/server/header.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
<!-- Parent-Version: 1.77 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
@@ -29,12 +28,8 @@
<a href="/education/edu-software.html">Educational Free Software</a> →
GCompris</p>
-<!--#if expr="$TAGS" -->
-<div class="page-tags"><strong>Page keywords</strong>:
-<span class="gnun-split"></span>
+<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
-</div>
-<!--#endif -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -43,7 +38,7 @@
<!--#endif -->
<!--#endif -->
-<h2>GCompris</h2>
+<h2 class="c">GCompris</h2>
<h3>Description</h3>
@@ -170,7 +165,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/01 14:25:18 $
+$Date: 2015/09/03 19:03:11 $
<!-- timestamp end -->
</p>
</div>
- www/server/staging/nav-bar/test9 body-include-2...,
Therese Godefroy <=