introduce cross-language links. The links to all available languages of a

document will show up on the top and the bottom of a page.
Additionally, change the default config to deliver the desired results.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99684 13f79535-47bb-0310-9956-ffa450edef68

16 files changed, 117 insertions, 7 deletions

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index ecdddbd195..43de0f753c 100644
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -571,13 +571,16 @@ ServerSignature On
     # the manual, even if you choose to move your DocumentRoot.  You may
     # comment this out if you do not care for the documentation.
     #
-    Alias /manual "@exp_manualdir@"
+    AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "@exp_manualdir@$1"
 
     <Directory "@exp_manualdir@">
         Options Indexes FollowSymLinks MultiViews
         AllowOverride None
         Order allow,deny
         Allow from all
+
+        SetEnvIf Request_URI ^/manual/(de|en|fr|ja|ko|ru)/ prefer-language=$1
+        RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
     </Directory>
 
     #
diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index d1f0dcc706..c2a3bf385a 100644
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -494,13 +494,16 @@ Alias /icons/ "@@ServerRoot@@/icons/"
 # the manual, even if you choose to move your DocumentRoot.  You may comment
 # this out if you do not care for the documentation.
 #
-Alias /manual "@@ServerRoot@@/manual"
+AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "@@ServerRoot@@/manual$1"
 
 <Directory "@@ServerRoot@@/manual">
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
     Order allow,deny
     Allow from all
+
+    SetEnvIf Request_URI ^/manual/(de|en|fr|ja|ko|ru)/ prefer-language=$1
+    RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
 </Directory>
 
 #
diff --git a/docs/manual/style/css/manual.css b/docs/manual/style/css/manual.css
index 5c71c31e6d..e01f115afb 100644
--- a/docs/manual/style/css/manual.css
+++ b/docs/manual/style/css/manual.css
@@ -162,7 +162,7 @@ div#quickview code.directive a:active {
 /* ====================== */
 h1 {
     padding: 0.2em;
-    margin: 0 0 0.5em 0;
+    margin: 0;
     border: 1px solid #405871;
     background-color: inherit;
     color: #036;
@@ -746,6 +746,49 @@ p {
     line-height: 1.3em;
 }
 
+/* translations           */
+/* ====================== */
+.toplang {
+    padding: 0;
+    margin: 0.2em 0.2em 1em 0;
+}
+
+.bottomlang {
+    padding: 0;
+    margin: 0 0.2em 0.2em 0;
+}
+
+.toplang p,
+.bottomlang p {
+    font-size: 13px;
+    text-align: right;
+    background-color: inherit;
+    color: #ccc;
+    margin: 0;
+    padding: 0;
+}
+
+.toplang p span,
+.bottomlang p span {
+    background-color: inherit;
+    color: #036;
+}
+
+.toplang p a:link,
+.toplang p a:visited,
+.bottomlang p a:link,
+.bottomlang p a:visited {
+    text-decoration: none;
+    font-weight: bold;
+}
+
+.toplang p a:hover,
+.toplang p a:active,
+.bottomlang p a:hover,
+.bottomlang p a:active {
+    font-weight: bold;
+}
+
 /* page footer            */
 /* ====================== */
 div#footer {
diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index 14f1629115..47b7e3b650 100644
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -85,4 +85,5 @@
 
  <!-- footer line -->
  <message name="maintainedby">Gepflegt durch das</message>
+ <message name="langavail">Available Languages</message>
 </messages>
diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index 09b893074c..28c5207604 100644
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -81,4 +81,5 @@
 
  <!-- footer line -->
  <message name="maintainedby">Maintained by the</message>
+ <message name="langavail">Available Languages</message>
 </messages>
diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml
index f2ff89d9cf..a636fb7422 100644
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -76,4 +76,5 @@
 
  <!-- footer line -->
  <message name="maintainedby">Maintained by the</message>
+ <message name="langavail">Available Languages</message>
 </messages>
diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 12d2b0af04..9f05a47aca 100644
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -70,4 +70,5 @@
 
  <!-- footer line -->
  <message name="maintainedby">ðÏÄÄÅÒÖËÁ ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ</message>
+ <message name="langavail">Available Languages</message>
 </messages>
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 8dc7425223..ffa299114b 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -277,6 +277,10 @@
 <!-- page bottom                                                          -->
 <!-- ==================================================================== -->
 <xsl:template name="bottom">
+<xsl:call-template name="langavail">
+    <xsl:with-param name="position" select="'bottom'" />
+</xsl:call-template>
+
 <div id="footer">&lf;
     <p class="apache">
         <xsl:value-of select="$messages/message[@name='maintainedby']"/>
@@ -297,6 +301,43 @@
 
 
 <!-- ==================================================================== -->
+<!-- build an "available languages" section                               -->
+<!-- ==================================================================== -->
+<xsl:template name="langavail">
+<xsl:param name="position" select="'top'" />
+<xsl:variable name="metafile" select="document(/*/@metafile)/metafile" />
+
+<div class="{$position}lang">&lf;
+    <p>
+        <span>
+            <xsl:value-of select="$messages/message[@name='langavail']" />
+            <xsl:text>: </xsl:text>
+        </span>
+
+        <xsl:for-each select="$metafile/variants/variant">
+        <xsl:sort select="." />
+
+            <a href="{$path}/{.}{$metafile/path}{$metafile/basename}.html">
+                <xsl:if test="$metafile/basename = 'index'">
+                    <xsl:attribute name="href">
+                        <xsl:value-of
+                            select="concat($path, '/', ., $metafile/path)" />
+                    </xsl:attribute>
+                </xsl:if>
+
+                &nbsp;
+                <xsl:value-of select="." />
+                &nbsp;
+            </a>
+            <xsl:if test="position() != last()"> | </xsl:if>
+        </xsl:for-each>
+    </p>&lf;
+</div> <!-- /.{$position}lang -->
+</xsl:template>
+<!-- /langavail -->
+
+
+<!-- ==================================================================== -->
 <!-- Process a documentation section                                      -->
 <!-- ==================================================================== -->
 <xsl:template match="section">
diff --git a/docs/manual/style/xsl/directiveindex.xsl b/docs/manual/style/xsl/directiveindex.xsl
index b72584dec2..ced0264bee 100644
--- a/docs/manual/style/xsl/directiveindex.xsl
+++ b/docs/manual/style/xsl/directiveindex.xsl
@@ -87,6 +87,8 @@
                 <xsl:value-of select="title" />
             </h1>&lf;
 
+            <xsl:call-template name="langavail" />&lf;
+
             <xsl:apply-templates select="summary" />&lf;
 
             <!-- letter bar -->
diff --git a/docs/manual/style/xsl/faq.xsl b/docs/manual/style/xsl/faq.xsl
index 4869111111..a44df01c5b 100644
--- a/docs/manual/style/xsl/faq.xsl
+++ b/docs/manual/style/xsl/faq.xsl
@@ -81,7 +81,9 @@
             <div id="preamble">        
                 <h1>
                     <xsl:value-of select="title" />
-                </h1>
+                </h1>&lf;
+
+                <xsl:call-template name="langavail" />&lf;
 
                 <xsl:apply-templates select="summary"/>
             </div>&lf; <!-- /#preamble -->
diff --git a/docs/manual/style/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl
index 4478d86246..3e132c449a 100644
--- a/docs/manual/style/xsl/indexpage.xsl
+++ b/docs/manual/style/xsl/indexpage.xsl
@@ -94,6 +94,8 @@
                 <xsl:value-of select="title"/>
             </h1>&lf;
 
+            <xsl:call-template name="langavail" />&lf;
+
             <form>
                 <xsl:call-template name="search.spec" />
             </form>&lf;
diff --git a/docs/manual/style/xsl/manualpage.xsl b/docs/manual/style/xsl/manualpage.xsl
index e46ede83f3..4a988cfe7f 100644
--- a/docs/manual/style/xsl/manualpage.xsl
+++ b/docs/manual/style/xsl/manualpage.xsl
@@ -79,9 +79,11 @@
             <div id="preamble">        
                 <h1>
                     <xsl:value-of select="title"/>
-                </h1>
+                </h1>&lf;
 
-                <xsl:apply-templates select="summary"/>
+                <xsl:call-template name="langavail" />&lf;
+
+                <xsl:apply-templates select="summary" />
             </div>&lf; <!-- /#preamble -->
           
             <xsl:if test="(not($is-chm) and count(section) > 1) or seealso">
diff --git a/docs/manual/style/xsl/moduleindex.xsl b/docs/manual/style/xsl/moduleindex.xsl
index 2c34bd3cc3..c9292c6e7a 100644
--- a/docs/manual/style/xsl/moduleindex.xsl
+++ b/docs/manual/style/xsl/moduleindex.xsl
@@ -75,7 +75,9 @@
                 <h1>
                     <xsl:value-of select="title" />
                 </h1>&lf;
-          
+
+                <xsl:call-template name="langavail" />&lf;
+
                 <xsl:apply-templates select="summary" />
             </div>&lf; <!-- /#preamble -->
 
diff --git a/docs/manual/style/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl
index ba1bc817cc..d86822e88c 100644
--- a/docs/manual/style/xsl/quickreference.xsl
+++ b/docs/manual/style/xsl/quickreference.xsl
@@ -75,6 +75,8 @@
                 <xsl:value-of select="title" />
             </h1>&lf;
 
+            <xsl:call-template name="langavail" />&lf;
+
             <xsl:apply-templates select="summary" />
         </div>&lf; <!-- /#preamble -->
 
diff --git a/docs/manual/style/xsl/sitemap.xsl b/docs/manual/style/xsl/sitemap.xsl
index e9c1e91820..fbf463f548 100644
--- a/docs/manual/style/xsl/sitemap.xsl
+++ b/docs/manual/style/xsl/sitemap.xsl
@@ -81,6 +81,8 @@
                     <xsl:value-of select="title" />
                 </h1>&lf;
 
+                <xsl:call-template name="langavail" />&lf;
+
                 <xsl:apply-templates select="summary" />
             </div>&lf; <!-- /#preamble -->
           
diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
index b165583c93..f7f77ba714 100644
--- a/docs/manual/style/xsl/synopsis.xsl
+++ b/docs/manual/style/xsl/synopsis.xsl
@@ -99,6 +99,8 @@
                     </xsl:choose>
                 </h1>&lf;
 
+                <xsl:call-template name="langavail" />&lf;
+
                 <!-- Description and module-headers -->
                 <table class="module">
                 <tr>