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

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index ecdddbd19517bddbca6305ccf3ad8683d1d91452..43de0f753c1e16c13eaf2226f003be588f69416d 100644 (file)
--- 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 d1f0dcc706ce47f02023578939ff7daffacb4715..c2a3bf385a41f8ea8a65d951aa0582ddeb24424b 100644 (file)
--- 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 5c71c31e6df6bd7c2834a9bcdfd9378e7628e549..e01f115afb5cd3e11eaaf05d65bb1ec8751f9e9b 100644 (file)
--- 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 14f1629115747b0b2be5606656083c85cc03aa3f..47b7e3b650bcb8a2ff209ba2fb0801abb03c07f3 100644 (file)
--- 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 09b893074c0c9ef4347598f130491ea60a51f2a5..28c5207604d122fab19c39ffabe4ed452090cbbd 100644 (file)
--- 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 f2ff89d9cf3c68fc7c18698a69ab9123716eb9d4..a636fb742212b706b85f52aa79c85644062b8038 100644 (file)
--- 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 12d2b0af04ce55fd3c1e57905ff63b45fb826de6..9f05a47acae30dc81b3cecb0eaa501dde78076f4 100644 (file)
--- 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 8dc7425223da460a12059414478b22b5b9c91636..ffa299114b5a2a85eb752b9ef4d5c310c935ac17 100644 (file)
--- 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']"/>
@@ -296,6 +300,43 @@
 <!-- /bottom -->
 
 
+<!-- ==================================================================== -->
+<!-- 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                                      -->
 <!-- ==================================================================== -->

diff --git a/docs/manual/style/xsl/directiveindex.xsl b/docs/manual/style/xsl/directiveindex.xsl
index b72584dec2dfb664150730212ea8513dd371136c..ced0264bee463bde4e80d86d8f98d155d150446c 100644 (file)
--- 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 48691111111d76941899abca5751ac28b033409b..a44df01c5b7b1ef560050e8f0cdd6bc3f9892727 100644 (file)
--- 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 4478d86246824429552ab884434efbd0ca6cdef8..3e132c449a00d276ab227b2875a904d4899b6581 100644 (file)
--- 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 e46ede83f3f5f7c1f32a0fdc2245c674faad8525..4a988cfe7f5503f30bda4372694e440888df55ba 100644 (file)
--- 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 2c34bd3cc318ac9ad7e6613638d64abdf43d3f12..c9292c6e7ad78fad412af1ad17f50aba6fb1965f 100644 (file)
--- 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 ba1bc817ccb03095075ad0b6e7738888b6d262a8..d86822e88ca0ce6b0008ebaa75e1fe19aa04950e 100644 (file)
--- 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 e9c1e918203eec3f95def44800ed006b047c7d3c..fbf463f548d4b3e9e1c50dbf96c49eab360249c9 100644 (file)
--- 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 b165583c932ed0b172afb7ccd70e71946c2301ae..f7f77ba7145c6930bdd59b6b85b38fbbbbf39a82 100644 (file)
--- 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>