[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 education.html...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 education.html... |
|
Date: |
Fri, 21 Aug 2015 18:43:41 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/08/21 18:43:41
Modified files:
server/staging/nav-bar/test9: education.html body-include-2.html
Added files:
server/staging/nav-bar/test9: banner.html philosophy.html
philosophy-menu.html
Log message:
Make navbar buttons 'active' with SSIs.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/banner.html?cvsroot=www&rev=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy-menu.html?cvsroot=www&rev=1.1
Patches:
Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- education.html 8 Nov 2014 18:17:47 -0000 1.16
+++ education.html 21 Aug 2015 18:43:40 -0000 1.17
@@ -2,6 +2,7 @@
<!-- 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>
@@ -26,7 +27,7 @@
-->
<!--#endif -->
</style>
-<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
<div id="education-content">
@@ -195,7 +196,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/11/08 18:17:47 $
+$Date: 2015/08/21 18:43:40 $
<!-- timestamp end -->
</p>
</div>
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- body-include-2.html 27 Apr 2014 17:35:55 -0000 1.17
+++ body-include-2.html 21 Aug 2015 18:43:40 -0000 1.18
@@ -1,11 +1,11 @@
-<!-- start of server/body-include-2.html -->
+<!-- start of server/body-include-2 -->
<div id="header">
<div id="fsf-frame">
<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>GNU/FSF Newsletter</a></p>
-<form
action="https://crm.fsf.org/civicrm/profile/create&reset=1&gid=31";
method="post">
+<p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
+<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post">
<div>
<input name="postURL" type="hidden" value="" />
<input type="hidden" name="group[25]" value="1" />
@@ -13,8 +13,9 @@
<input name="_qf_default" type="hidden" value="Edit:cancel" />
</div>
<p>
- <input type="text" id="frmEmail" name="email-Primary" size="18"
maxlength="80" value="email address"
- onfocus="this.value=''" /><input type="submit" name="_qf_Edit_next"
value="Sign up" />
+ <input type="text" id="frmEmail" name="email-Primary" size="18"
maxlength="80"
+ value="email address" onfocus="this.value=''"/>
+ <input type="submit" name="_qf_Edit_next" value="Sign up" />
</p>
</form>
</div><!-- /fssbox -->
@@ -24,20 +25,50 @@
<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">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
</div><!-- /header -->
<div id="navigation">
+
<ul>
+<!--#if expr="${TAGS} = /gnu/" -->
+ <li id="tabAboutGNU" class="active"><a
href="/gnu/gnu.html">About GNU</a></li>
+<!--#else -->
<li id="tabAboutGNU"><a href="/gnu/gnu.html">About GNU</a></li>
+<!--#endif -->
+<!--#if expr="${TAGS} = /philo/" -->
+ <li id="tabPhilosophy" class="active"><a
href="/philosophy/philosophy.html">Philosophy</a></li>
+<!--#else -->
<li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">Philosophy</a></li>
+<!--#endif -->
+<!--#if expr="${TAGS} = /licenses/" -->
+ <li id="tabLicenses" class="active"><a
href="/licenses/licenses.html">Licenses</a></li>
+<!--#else -->
<li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
+<!--#endif -->
+<!--#if expr="${TAGS} = /education/" -->
+ <li id="tabEducation" class="active"><a
href="/education/education.html">Education</a></li>
+<!--#else -->
<li id="tabEducation"><a href="/education/education.html">Education</a></li>
+<!--#endif -->
+<!--#if expr="${TAGS} = /software/" -->
+ <li id="tabSoftware" class="active"><a
href="/software/software.html">Software</a></li>
+<!--#else -->
<li id="tabSoftware"><a href="/software/software.html">Software</a></li>
+<!--#endif -->
+<!--#if expr="${TAGS} = /doc/" -->
+ <li id="tabDoc" class="active"><a href="/doc/doc.html">Documentation</a></li>
+<!--#else -->
<li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
+<!--#endif -->
+<!--#if expr="${TAG} = /help/" -->
+ <li id="tabHelp" class="active"><a
href="/help/help.html">Help GNU</a></li>
+<!--#else -->
<li id="tabHelp"><a href="/help/help.html">Help GNU</a></li>
+<!--#endif -->
</ul>
-</div><!-- /navigation -->
-<!-- end of server/body-include-2.html -->
+</div><!-- /navigation -->
+<!-- end of server/body-include-2 -->
Index: banner.html
===================================================================
RCS file: banner.html
diff -N banner.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ banner.html 21 Aug 2015 18:43:40 -0000 1.3
@@ -0,0 +1,15 @@
+<!-- start of server/banner.html -->
+<!-- start of head-include-2.html -->
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="/combo.css" media="screen" />
+<link rel="stylesheet" href="/mini.css" media="handheld" />
+<link rel="stylesheet" href="/layout.min.css" media="screen" />
+<link rel="stylesheet" href="/print.min.css" media="print" />
+<!-- end of head-include-2.html -->
+</head>
+<body>
+<div class="inner">
+<!--#include virtual="/server/body-include-1.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-2.html" -->
+<div id="content">
+<!-- end of server/banner.html -->
Index: philosophy.html
===================================================================
RCS file: philosophy.html
diff -N philosophy.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy.html 21 Aug 2015 18:43:40 -0000 1.1
@@ -0,0 +1,156 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<!--#set var="TAGS" value="philo intro" -->
+
+<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" -->
+
+<div id="education-content">
+
+<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
+
+</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 -->
+<h2>Philosophy of the GNU Project</h2>
+
+<blockquote><p>
+See <a href="http://audio-video.gnu.org/";>audio-video.gnu.org</a>
+for recordings of Richard Stallman's speeches.
+</p></blockquote>
+
+<p><em>Free software</em> means that the software's users have
+freedom. (The issue is not about price.) We developed the GNU
+operating system so that users can have freedom in their
+computing.</p>
+
+<p>Specifically, free software means users have
+the <a href="/philosophy/free-sw.html">four essential freedoms</a>:
+(0) to run the program, (1) to study and change the program in source
+code form, (2) to redistribute exact copies, and (3) to distribute
+modified versions.</p>
+
+<p>Software differs from material objects—such as chairs,
+sandwiches, and gasoline—in that it can be copied and changed
+much more easily. These facilities are why software is useful; we
+believe a program's users should be free to take advantage of them,
+not solely its developer.</p>
+
+<p>For further reading, please select a section
+from the menu above.</p>
+
+<p>We also maintain a list of <a href="/philosophy/latest-articles.html">most
recently added articles</a>.</p>
+
+<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">
+ Why we must insist on free software</a></li>
+ <li><a href="/philosophy/proprietary.html">
+ Proprietary software is often malware</a></li>
+ <li><a href="/gnu/gnu.html">History of GNU/Linux</a></li>
+ <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic
Idealism</a></li>
+ <li><a href="/philosophy/free-doc.html">Why Free Software Needs
+ Free Documentation</a></li>
+ <li><a href="/philosophy/selling.html">Selling Free Software</a> is OK!</li>
+ <li><a href="/philosophy/fs-motives.html">Motives For Writing Free
Software</a></li>
+ <li><a href="/philosophy/right-to-read.html">The Right to Read: A
+ Dystopian Short Story</a> by <a href="http://www.stallman.org/";>
+ Richard Stallman</a></li>
+ <li><a href="/philosophy/open-source-misses-the-point.html">Why
+ "Open Source" misses the point of Free Software</a></li>
+ <li><a
href="/philosophy/when-free-software-isnt-practically-superior.html">When Free
Software Isn't (Practically) Superior</a></li>
+ <li><a href="/philosophy/government-free-software.html">Measures governments
can use to promote free software</a></li>
+ <li><a href="/education/education.html">Free software in education</a></li>
+</ul>
+
+<p>
+<!-- please leave both these ID attributes here. ... -->
+<a id="TOCFreedomOrganizations">We</a>
+<a id="FreedomOrganizations">also</a>
+<!-- ... we removed this as an H$ section as it was duplicating the -->
+<!-- same information on links.html, but it's possible that some users -->
+<!-- have the URLs bookmarked or on their pages. -len -->
+keep a list of
+<a href="/links/links.html#FreedomOrganizations">Organizations
+that Work for Freedom in
+Computer Development and Electronic Communications</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 & GNU inquiries to
+<a href="mailto:address@hidden";><address@hidden></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";><address@hidden></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";>
+ <address@hidden></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>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © 2013, 2015 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: 2015/08/21 18:43:40 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
Index: philosophy-menu.html
===================================================================
RCS file: philosophy-menu.html
diff -N philosophy-menu.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy-menu.html 21 Aug 2015 18:43:41 -0000 1.1
@@ -0,0 +1,30 @@
+<!-- begin philosophy/philosophy-menu.html -->
+
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<!--#if expr="${TAGS} = /intro/" -->
+ <li class="active"><a
href="/philosophy/philosophy.html">Introduction</a></li>
+<!--#else -->
+ <li><a href="/philosophy/philosophy.html">Introduction</a></li>
+<!--#endif -->
+ <li><a href="http://audio-video.gnu.org/";>Audio and video</a></li>
+<!--#if expr="${TAGS} = /essays/" -->
+ <li class="active"><a
href="/philosophy/essays-and-articles.html">Essays and articles</a></li>
+<!--#else -->
+ <li><a href="/philosophy/essays-and-articles.html">Essays and
articles</a></li>
+<!--#endif -->
+<!--#if expr="${TAGS} = /speeches/" -->
+ <li class="active"><a
href="/philosophy/speeches-and-interview.html">Speeches and interviews</a></li>
+<!--#else -->
+ <li><a href="/philosophy/speeches-and-interview.html">Speeches and
interviews</a></li>
+<!--#endif -->
+<!--#if expr="${TAGS} = /other/" -->
+ <li class="active"><a href="/philosophy/third-party-ideas.html">Third
party ideas</a></li>
+<!--#else -->
+ <li><a href="/philosophy/third-party-ideas.html">Third party
ideas</a></li>
+<!--#endif -->
+ <li><a href="/server/sitemap.html#directory-philosophy">All philosophy
articles</a></li>
+</ul>
+<!-- end edu navigation bar -->
+
+<!-- end philosophy/philosophy-menu.html -->
- www/server/staging/nav-bar/test9 education.html...,
Therese Godefroy <=