www/server/staging/nav-bar/test9 philosophy.htm...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 15/08/29 21:11:19

Modified files:
        server/staging/nav-bar/test9: philosophy.html home2.fr.html 
                                      home5.html tag-base.html 

Log message:
        Search tags after including the tag base rather than before.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home2.fr.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/tag-base.html?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: philosophy.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy.html     28 Aug 2015 21:36:11 -0000      1.7
+++ philosophy.html     29 Aug 2015 21:11:18 -0000      1.8
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!--#include 
virtual="/server/staging/nav-bar/test9/tag-base.html?$DOCUMENT_NAME" -->
+<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
 <!-- Parent-Version: 1.77 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
@@ -154,7 +154,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/08/28 21:36:11 $
+$Date: 2015/08/29 21:11:18 $
 <!-- timestamp end -->
 </p>
 </div>

Index: home2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home2.fr.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- home2.fr.html       29 Aug 2015 18:50:48 -0000      1.11
+++ home2.fr.html       29 Aug 2015 21:11:18 -0000      1.12
@@ -1,6 +1,6 @@
 <!--#set var="ENGLISH_PAGE" value="/home.en.html" -->
 <!--#include virtual="/server/header.fr.html" -->
-<!--#include 
virtual="/server/staging/nav-bar/test9/tag-base.html?$ENGLISH_PAGE" -->
+<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
 <!-- Parent-Version: 1.77 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
@@ -282,7 +282,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/08/29 18:50:48 $
+$Date: 2015/08/29 21:11:18 $
 
 <!-- timestamp end -->
 </p>

Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- home5.html  29 Aug 2015 18:50:48 -0000      1.41
+++ home5.html  29 Aug 2015 21:11:18 -0000      1.42
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!--#include 
virtual="/server/staging/nav-bar/test9/tag-base.html?/home5.en.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
 <!-- Parent-Version: 1.77 -->
 
 <title>The GNU Operating System and the Free Software Movement</title>
@@ -12,16 +12,16 @@
 <!--#include virtual="/po/home.translist" -->
 <!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
 
-<p class="no-display">GNU is the only operating system developed
-specifically to give its users freedom.  What is GNU, and what freedom
-is at stake?</p>
-
 <!--#if expr="$TAGS" -->
 <div class="page-tags"><strong>Tags</strong>:
 <!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
 </div>
 <!--#endif -->
 
+<p class="no-display">GNU is the only operating system developed
+specifically to give its users freedom.  What is GNU, and what freedom
+is at stake?</p>
+
 <div id="home">
 
 <div class="first-column">
@@ -264,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/08/29 18:50:48 $
+$Date: 2015/08/29 21:11:18 $
 <!-- timestamp end -->
 </p>
 </div>

Index: tag-base.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/tag-base.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tag-base.html       29 Aug 2015 18:50:48 -0000      1.4
+++ tag-base.html       29 Aug 2015 21:11:18 -0000      1.5
@@ -1,4 +1,11 @@
-<!--#set var="q" value="$QUERY_STRING"
- --><!--#if  expr="$q = 
/\/home(2|5)?[^-+a-zA-Z0-9](html|[a-z][a-z].html|[a-z][a-z]-[a-z][a-z].html)/" 
--><!--#set var="TAGS" value=" aboutfs gnuhistory gnulinux copyright patents 
cultural " --><!--#endif
- --><!--#if  expr="$q = 
/^philosophy[^-+a-zA-Z0-9](html|[a-z][a-z].html|[a-z][a-z]-[a-z][a-z].html)/" 
--><!--#set var="TAGS" value=" aboutfs netservices hardware copyright drm noip 
patents cultural terminology proprietary fsf " --><!--#endif
+<!--#set var="q" value="$DOCUMENT_URI"
+ --><!--#if  expr="$q = 
/\/test9\/home(2|5)([^-+_a-zA-Z0-9][a-z][a-z]|.[a-z][a-z]-[a-z][a-z])?[^-+_a-zA-Z0-9]html/"
 --><!--#set var="TAGS" value=" aboutfs gnuhistory gnulinux copyright patents 
cultural " --><!--#endif
+ --><!--#if  expr="$q = 
/^\/keepingup([^-+_a-zA-Z0-9][a-z][a-z]|.[a-z][a-z]-[a-z][a-z])?[^-+_a-zA-Z0-9]html/"
 --><!--#set var="TAGS" value=" info fsf gnu " --><!--#endif
+ --><!--#if  expr="$q = 
/^\/accessibility\/accessibility([^-+_a-zA-Z0-9][a-z][a-z]|.[a-z][a-z]-[a-z][a-z])?[^-+_a-zA-Z0-9]html/"
 --><!--#set var="TAGS" value=" xx " --><!--#endif
+ --><!--#if  expr="$q = 
/^\/award\/2003\/2003-call([^-+_a-zA-Z0-9][a-z][a-z]|.[a-z][a-z]-[a-z][a-z])?[^-+_a-zA-Z0-9]html/"
 --><!--#set var="TAGS" value=" bbb " --><!--#endif
+ --><!--#if  expr="$q = 
/^\/bulletins\/bull12([^-+_a-zA-Z0-9][a-z][a-z]|.[a-z][a-z]-[a-z][a-z])?[^-+_a-zA-Z0-9]html/"
 --><!--#set var="TAGS" value=" nn " --><!--#endif
+ --><!--#if  expr="$q = 
/^\/bulletins\/bull18([^-+_a-zA-Z0-9][a-z][a-z]|.[a-z][a-z]-[a-z][a-z])?[^-+_a-zA-Z0-9]html/"
 --><!--#set var="TAGS" value=" rr " --><!--#endif
+ --><!--#if  expr="$q = 
/^\/bulletins\/bull24([^-+_a-zA-Z0-9][a-z][a-z]|.[a-z][a-z]-[a-z][a-z])?[^-+_a-zA-Z0-9]html/"
 --><!--#set var="TAGS" value=" ff " --><!--#endif
+ --><!--#if  expr="$q = 
/^\/doc\/other-free-books([^-+_a-zA-Z0-9][a-z][a-z]|.[a-z][a-z]-[a-z][a-z])?[^-+_a-zA-Z0-9]html/"
 --><!--#set var="TAGS" value=" jgf n " --><!--#endif
+ --><!--#if  expr="$q = 
/\/test9\/philosophy([^-+_a-zA-Z0-9][a-z][a-z]|.[a-z][a-z]-[a-z][a-z])?[^-+_a-zA-Z0-9]html/"
 --><!--#set var="TAGS" value=" aboutfs netservices hardware copyright drm noip 
patents cultural terminology proprietary fsf " --><!--#endif
  -->