You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2003/05/02 00:54:36 UTC
cvs commit: httpd-2.0/docs/manual/style/xsl common.xsl directiveindex.xsl faq.xsl indexpage.xsl manualpage.xsl moduleindex.xsl quickreference.xsl sitemap.xsl synopsis.xsl
nd 2003/05/01 15:54:36
Modified: docs/conf httpd-std.conf.in httpd-win.conf
docs/manual/style/css manual.css
docs/manual/style/lang de.xml en.xml ja.xml ru.xml
docs/manual/style/xsl common.xsl directiveindex.xsl faq.xsl
indexpage.xsl manualpage.xsl moduleindex.xsl
quickreference.xsl sitemap.xsl synopsis.xsl
Log:
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.
Revision Changes Path
1.37 +4 -1 httpd-2.0/docs/conf/httpd-std.conf.in
Index: httpd-std.conf.in
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- httpd-std.conf.in 23 Apr 2003 15:23:46 -0000 1.36
+++ httpd-std.conf.in 1 May 2003 22:54:34 -0000 1.37
@@ -571,13 +571,16 @@
# 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>
#
1.83 +4 -1 httpd-2.0/docs/conf/httpd-win.conf
Index: httpd-win.conf
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- httpd-win.conf 23 Apr 2003 15:23:47 -0000 1.82
+++ httpd-win.conf 1 May 2003 22:54:35 -0000 1.83
@@ -494,13 +494,16 @@
# 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>
#
1.24 +44 -1 httpd-2.0/docs/manual/style/css/manual.css
Index: manual.css
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/css/manual.css,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- manual.css 9 Apr 2003 14:54:42 -0000 1.23
+++ manual.css 1 May 2003 22:54:35 -0000 1.24
@@ -162,7 +162,7 @@
/* ====================== */
h1 {
padding: 0.2em;
- margin: 0 0 0.5em 0;
+ margin: 0;
border: 1px solid #405871;
background-color: inherit;
color: #036;
@@ -744,6 +744,49 @@
/* in general */
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 */
1.11 +1 -0 httpd-2.0/docs/manual/style/lang/de.xml
Index: de.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/de.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- de.xml 9 Apr 2003 12:21:21 -0000 1.10
+++ de.xml 1 May 2003 22:54:35 -0000 1.11
@@ -85,4 +85,5 @@
<!-- footer line -->
<message name="maintainedby">Gepflegt durch das</message>
+ <message name="langavail">Available Languages</message>
</messages>
1.11 +1 -0 httpd-2.0/docs/manual/style/lang/en.xml
Index: en.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/en.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- en.xml 9 Apr 2003 12:21:21 -0000 1.10
+++ en.xml 1 May 2003 22:54:35 -0000 1.11
@@ -81,4 +81,5 @@
<!-- footer line -->
<message name="maintainedby">Maintained by the</message>
+ <message name="langavail">Available Languages</message>
</messages>
1.10 +1 -0 httpd-2.0/docs/manual/style/lang/ja.xml
Index: ja.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/ja.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ja.xml 9 Apr 2003 12:21:21 -0000 1.9
+++ ja.xml 1 May 2003 22:54:35 -0000 1.10
@@ -76,4 +76,5 @@
<!-- footer line -->
<message name="maintainedby">Maintained by the</message>
+ <message name="langavail">Available Languages</message>
</messages>
1.5 +1 -0 httpd-2.0/docs/manual/style/lang/ru.xml
Index: ru.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/ru.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ru.xml 9 Apr 2003 12:21:21 -0000 1.4
+++ ru.xml 1 May 2003 22:54:35 -0000 1.5
@@ -70,4 +70,5 @@
<!-- footer line -->
<message name="maintainedby">��������� ��������������</message>
+ <message name="langavail">Available Languages</message>
</messages>
1.32 +41 -0 httpd-2.0/docs/manual/style/xsl/common.xsl
Index: common.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/common.xsl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- common.xsl 21 Apr 2003 03:26:55 -0000 1.31
+++ common.xsl 1 May 2003 22:54:35 -0000 1.32
@@ -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']"/>
@@ -294,6 +298,43 @@
</div> <!-- /footer -->
</xsl:template>
<!-- /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>
+
+
+ <xsl:value-of select="." />
+
+ </a>
+ <xsl:if test="position() != last()"> | </xsl:if>
+ </xsl:for-each>
+ </p>&lf;
+</div> <!-- /.{$position}lang -->
+</xsl:template>
+<!-- /langavail -->
<!-- ==================================================================== -->
1.11 +2 -0 httpd-2.0/docs/manual/style/xsl/directiveindex.xsl
Index: directiveindex.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/directiveindex.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- directiveindex.xsl 20 Apr 2003 02:52:34 -0000 1.10
+++ directiveindex.xsl 1 May 2003 22:54:35 -0000 1.11
@@ -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 -->
1.4 +3 -1 httpd-2.0/docs/manual/style/xsl/faq.xsl
Index: faq.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/faq.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- faq.xsl 20 Apr 2003 02:52:34 -0000 1.3
+++ faq.xsl 1 May 2003 22:54:35 -0000 1.4
@@ -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 -->
1.6 +2 -0 httpd-2.0/docs/manual/style/xsl/indexpage.xsl
Index: indexpage.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/indexpage.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- indexpage.xsl 20 Apr 2003 02:52:34 -0000 1.5
+++ indexpage.xsl 1 May 2003 22:54:35 -0000 1.6
@@ -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;
1.7 +4 -2 httpd-2.0/docs/manual/style/xsl/manualpage.xsl
Index: manualpage.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/manualpage.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- manualpage.xsl 20 Apr 2003 02:52:34 -0000 1.6
+++ manualpage.xsl 1 May 2003 22:54:35 -0000 1.7
@@ -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">
1.13 +3 -1 httpd-2.0/docs/manual/style/xsl/moduleindex.xsl
Index: moduleindex.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/moduleindex.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- moduleindex.xsl 20 Apr 2003 02:52:34 -0000 1.12
+++ moduleindex.xsl 1 May 2003 22:54:35 -0000 1.13
@@ -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 -->
1.13 +2 -0 httpd-2.0/docs/manual/style/xsl/quickreference.xsl
Index: quickreference.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/quickreference.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- quickreference.xsl 20 Apr 2003 02:52:34 -0000 1.12
+++ quickreference.xsl 1 May 2003 22:54:35 -0000 1.13
@@ -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 -->
1.12 +2 -0 httpd-2.0/docs/manual/style/xsl/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/sitemap.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sitemap.xsl 20 Apr 2003 02:52:34 -0000 1.11
+++ sitemap.xsl 1 May 2003 22:54:35 -0000 1.12
@@ -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 -->
1.15 +2 -0 httpd-2.0/docs/manual/style/xsl/synopsis.xsl
Index: synopsis.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/synopsis.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- synopsis.xsl 20 Apr 2003 02:52:34 -0000 1.14
+++ synopsis.xsl 1 May 2003 22:54:35 -0000 1.15
@@ -99,6 +99,8 @@
</xsl:choose>
</h1>&lf;
+ <xsl:call-template name="langavail" />&lf;
+
<!-- Description and module-headers -->
<table class="module">
<tr>