httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject 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
Date Thu, 29 May 2003 19:05:48 GMT
nd          2003/05/29 12:05:48

  Modified:    docs/manual/style/css Tag: APACHE_2_0_BRANCH manual-chm.css
                        manual.css
               docs/manual/style/lang Tag: APACHE_2_0_BRANCH de.xml en.xml
                        ja.xml ko.xml ru.xml
               docs/manual/style/xsl Tag: APACHE_2_0_BRANCH common.xsl
                        directiveindex.xsl faq.xsl indexpage.xsl
                        manualpage.xsl moduleindex.xsl quickreference.xsl
                        sitemap.xsl synopsis.xsl
  Log:
  backport x-language links.
  
  in 2.0.47 we can distribute it with a reasonable server configuration
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +4 -0      httpd-2.0/docs/manual/style/css/manual-chm.css
  
  Index: manual-chm.css
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/css/manual-chm.css,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- manual-chm.css	18 Apr 2003 02:02:51 -0000	1.1.2.1
  +++ manual-chm.css	29 May 2003 19:05:46 -0000	1.1.2.2
  @@ -4,4 +4,8 @@
       font-size: 95%;
   }
   
  +h1 {
  +    margin: 0 0 0.5em 0;
  +}
  +
   /* the end */
  
  
  
  1.17.2.8  +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.17.2.7
  retrieving revision 1.17.2.8
  diff -u -r1.17.2.7 -r1.17.2.8
  --- manual.css	6 May 2003 22:39:35 -0000	1.17.2.7
  +++ manual.css	29 May 2003 19:05:46 -0000	1.17.2.8
  @@ -164,7 +164,7 @@
   /* ====================== */
   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 @@
   /* 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            */
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.7   +3 -2      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.3.2.6
  retrieving revision 1.3.2.7
  diff -u -r1.3.2.6 -r1.3.2.7
  --- de.xml	9 Apr 2003 12:55:57 -0000	1.3.2.6
  +++ de.xml	29 May 2003 19:05:47 -0000	1.3.2.7
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   <!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
  -<!-- English revision: 1.6.2.2 -->
  +<!-- English revision: 1.6.2.4 -->
   
   <!--                   -->
   <!-- Language: German  -->
  @@ -8,7 +8,7 @@
   
   <!-- Some strings might be used in other contexts, than stated in the -->
   <!-- comments...                                                      -->
  -<messages lang="de">
  +<messages lang="de" langname="Deutsch">
    <!-- Used for the moduleindex -->
    <message name="corefeatures">Kernfunktionen und Multi-Processing-Module</message>
    <message name="othermodules">Andere Module</message>
  @@ -85,4 +85,5 @@
   
    <!-- footer line -->
    <message name="maintainedby">Gepflegt durch das</message>
  + <message name="langavail">Verfgbare Sprachen</message>
   </messages>
  
  
  
  1.6.2.4   +2 -1      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.6.2.3
  retrieving revision 1.6.2.4
  diff -u -r1.6.2.3 -r1.6.2.4
  --- en.xml	9 Apr 2003 12:55:57 -0000	1.6.2.3
  +++ en.xml	29 May 2003 19:05:47 -0000	1.6.2.4
  @@ -7,7 +7,7 @@
   
   <!-- Some strings might be used in other contexts, than stated in the -->
   <!-- comments...                                                      -->
  -<messages lang="en">
  +<messages lang="en" langname="English">
    <!-- Used for the moduleindex -->
    <message name="corefeatures">Core Features and Multi-Processing Modules</message>
    <message name="othermodules">Other Modules</message>
  @@ -81,4 +81,5 @@
   
    <!-- footer line -->
    <message name="maintainedby">Maintained by the</message>
  + <message name="langavail">Available Languages</message>
   </messages>
  
  
  
  1.6.2.3   +2 -1      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.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- ja.xml	9 Apr 2003 12:55:57 -0000	1.6.2.2
  +++ ja.xml	29 May 2003 19:05:47 -0000	1.6.2.3
  @@ -8,7 +8,7 @@
   
   <!-- Some strings might be used in other contexts, than stated in the -->
   <!-- comments...                                                      -->
  -<messages lang="ja">
  +<messages lang="ja" langname="Japanese">
    <!-- Used for the moduleindex -->
    <message name="corefeatures">$B%3%"5!G=$H(B MPM</message>
    <message name="othermodules">$BB>$N%b%8%e!<%k(B</message>
  @@ -76,4 +76,5 @@
   
    <!-- footer line -->
    <message name="maintainedby">Maintained by the</message>
  + <message name="langavail">Available Languages</message>
   </messages>
  
  
  
  1.1.2.2   +2 -1      httpd-2.0/docs/manual/style/lang/ko.xml
  
  Index: ko.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/ko.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- ko.xml	10 May 2003 16:47:24 -0000	1.1.2.1
  +++ ko.xml	29 May 2003 19:05:47 -0000	1.1.2.2
  @@ -8,7 +8,7 @@
   
   <!-- Some strings might be used in other contexts, than stated in the -->
   <!-- comments...                                                      -->
  -<messages lang="ko">
  +<messages lang="ko" langname="Korean">
    <!-- Used for the moduleindex -->
    <message name="corefeatures">ٽ ɰ ó </message>
    <message name="othermodules">ٸ </message>
  @@ -85,4 +85,5 @@
   
    <!-- footer line -->
    <message name="maintainedby">Maintained by the</message>
  + <message name="langavail"> </message>
   </messages>
  
  
  
  1.1.2.3   +2 -1      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.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- ru.xml	9 Apr 2003 12:55:57 -0000	1.1.2.2
  +++ ru.xml	29 May 2003 19:05:47 -0000	1.1.2.3
  @@ -8,7 +8,7 @@
   
   <!-- Some strings might be used in other contexts, than stated in the -->
   <!-- comments...                                                      -->
  -<messages lang="ru">
  +<messages lang="ru" langname="Russian">
    <!-- Used for the moduleindex -->
    <message name="corefeatures">   - </message>
    <message name="othermodules"> </message>
  @@ -70,4 +70,5 @@
   
    <!-- footer line -->
    <message name="maintainedby"> </message>
  + <message name="langavail">Available Languages</message>
   </messages>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.12 +62 -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.20.2.11
  retrieving revision 1.20.2.12
  diff -u -r1.20.2.11 -r1.20.2.12
  --- common.xsl	21 Apr 2003 03:31:07 -0000	1.20.2.11
  +++ common.xsl	29 May 2003 19:05:47 -0000	1.20.2.12
  @@ -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,64 @@
   </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" />
  +
  +<xsl:if test="not($is-chm)">
  +<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:if test="$messages/@lang != .">
  +                    <xsl:attribute name="hreflang">
  +                        <xsl:value-of select="." />
  +                    </xsl:attribute>
  +                    <xsl:attribute name="rel">alternate</xsl:attribute>
  +                </xsl:if>
  +                <xsl:attribute name="title">
  +                    <xsl:choose>
  +                    <xsl:when test=". != 'fr'"> <!-- no language file avail. -->
  +                        <xsl:value-of select="document(concat('../lang/', ., '.xml'))
  +                                              /messages/@langname" />
  +                    </xsl:when>
  +                    <xsl:otherwise>
  +                        <xsl:text>Fran&#231;ais</xsl:text>
  +                    </xsl:otherwise>
  +                    </xsl:choose>
  +                </xsl:attribute>
  +
  +                &nbsp;
  +                <xsl:value-of select="." />
  +                &nbsp;
  +            </a>
  +            <xsl:if test="position() != last()">
  +                <xsl:text> |&#xA;</xsl:text>
  +            </xsl:if>
  +        </xsl:for-each>
  +    </p>&lf;
  +</div> <!-- /.{$position}lang -->
  +</xsl:if>
  +</xsl:template>
  +<!-- /langavail -->
   
   
   <!-- ==================================================================== -->
  
  
  
  1.6.2.5   +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.6.2.4
  retrieving revision 1.6.2.5
  diff -u -r1.6.2.4 -r1.6.2.5
  --- directiveindex.xsl	20 Apr 2003 03:08:31 -0000	1.6.2.4
  +++ directiveindex.xsl	29 May 2003 19:05:47 -0000	1.6.2.5
  @@ -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.1.2.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.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- faq.xsl	20 Apr 2003 03:08:31 -0000	1.1.2.3
  +++ faq.xsl	29 May 2003 19:05:47 -0000	1.1.2.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.1.2.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.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- indexpage.xsl	20 Apr 2003 03:08:31 -0000	1.1.2.5
  +++ indexpage.xsl	29 May 2003 19:05:47 -0000	1.1.2.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.1.2.6   +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.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- manualpage.xsl	20 Apr 2003 03:08:31 -0000	1.1.2.5
  +++ manualpage.xsl	29 May 2003 19:05:47 -0000	1.1.2.6
  @@ -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.3.2.10  +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.3.2.9
  retrieving revision 1.3.2.10
  diff -u -r1.3.2.9 -r1.3.2.10
  --- moduleindex.xsl	20 Apr 2003 03:08:31 -0000	1.3.2.9
  +++ moduleindex.xsl	29 May 2003 19:05:47 -0000	1.3.2.10
  @@ -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.7.2.6   +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.7.2.5
  retrieving revision 1.7.2.6
  diff -u -r1.7.2.5 -r1.7.2.6
  --- quickreference.xsl	20 Apr 2003 03:08:31 -0000	1.7.2.5
  +++ quickreference.xsl	29 May 2003 19:05:47 -0000	1.7.2.6
  @@ -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.4.2.8   +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.4.2.7
  retrieving revision 1.4.2.8
  diff -u -r1.4.2.7 -r1.4.2.8
  --- sitemap.xsl	20 Apr 2003 03:08:31 -0000	1.4.2.7
  +++ sitemap.xsl	29 May 2003 19:05:47 -0000	1.4.2.8
  @@ -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.5.2.10  +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.5.2.9
  retrieving revision 1.5.2.10
  diff -u -r1.5.2.9 -r1.5.2.10
  --- synopsis.xsl	20 Apr 2003 03:08:31 -0000	1.5.2.9
  +++ synopsis.xsl	29 May 2003 19:05:47 -0000	1.5.2.10
  @@ -99,6 +99,8 @@
                       </xsl:choose>
                   </h1>&lf;
   
  +                <xsl:call-template name="langavail" />&lf;
  +
                   <!-- Description and module-headers -->
                   <table class="module">
                   <tr>
  
  
  

Mime
View raw message