www/server body-include-1.html gnun/initial-tra...

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       13/02/28 11:53:35

Modified files:
        server         : body-include-1.html 
        server/gnun    : initial-translations-list.html 

Log message:
        Prepare for new translation lists.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-1.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/initial-translations-list.html?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: body-include-1.html
===================================================================
RCS file: /web/www/www/server/body-include-1.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- body-include-1.html 9 Oct 2012 04:18:15 -0000       1.5
+++ body-include-1.html 28 Feb 2013 11:53:34 -0000      1.6
@@ -1,6 +1,15 @@
 <!-- start of server/body-include-1.html -->
+<!--#set var="HTML_BODY" value="yes" -->
 <div id="toplinks"><a href="#content">Skip to content</a> |
 <span class="netscape4">
 <a href="#navigation">Skip to navigation</a> |</span>
 <a href="/accessibility/">Accessibility</a></div>
+<!--#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 -->

Index: gnun/initial-translations-list.html
===================================================================
RCS file: /web/www/www/server/gnun/initial-translations-list.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnun/initial-translations-list.html 16 Feb 2013 10:56:12 -0000      1.2
+++ gnun/initial-translations-list.html 28 Feb 2013 11:53:34 -0000      1.3
@@ -1,10 +1,15 @@
 <!-- begin /server/initial-translations-list.html -->
+<!--#if expr="$HTML_BODY != yes " -->
+<!-- HTML head: set a flag for further expansion in body-include*.html. -->
+<!--#set var="INITIAL_TRANSLATIONS_LIST" value="included" -->
+<!--#elif expr="$INITIAL_TRANSLATIONS_LIST != expanded" -->
+<!-- HTML body: expand unless already expanded. -->
 <div id="translations">
-<ul class="translations-list">
-<!-- English -->
-<li><!--#set var="translation"
-       value="<a href=\"$REQUEST_URI\">English</a>&nbsp;[en]"
-  --><!--#echo encoding="none" var="translation" --></li>
-</ul>
+<p dir="ltr"><!--#set var="translation"
+          value="<a href=\"$REQUEST_URI\">English</a>&nbsp;[en]" -->
+<span class="original"><!--#echo encoding="none" var="translation" --></span>
+</p>
 </div>
+<!--#set var="INITIAL_TRANSLATIONS_LIST" value="expanded" -->
+<!--#endif -->
 <!-- end /server/initial-translations-list.html -->