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 2002/12/22 23:45:38 UTC
cvs commit: httpd-2.0/docs/manual/style/xsl common.xsl moduleindex.xsl sitemap.xsl synopsis.xsl
nd 2002/12/22 14:45:38
Modified: docs/manual/mod index.xml
docs/manual/style/css manual.css
docs/manual/style/xsl common.xsl moduleindex.xsl sitemap.xsl
synopsis.xsl
Log:
since nobody objected, apply proposed style changes:
- reintroduced the sidebar for the module index page (obvious ;-)
* didn't want to leave the section links so alone, thus added some
<seealso>s.
- changed the ordering of the core/MPMs as follows:
* core
* mpm_common
* alphabetical list of the mpms (ordered by their "natural" names).
- same appeared on the sitemap
- changed <h1> headings of the modulesynopsis files, so that they match the
titles in the sitemap. This should better reflect the nature of the
modules. (affects only core & MPMs)
Revision Changes Path
1.5 +4 -0 httpd-2.0/docs/manual/mod/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 23 Sep 2002 03:40:12 -0000 1.4
+++ index.xml 22 Dec 2002 22:45:38 -0000 1.5
@@ -14,6 +14,10 @@
directives</a>.
</p>
</summary>
+ <seealso><a href="../mpm.html">Multi-Processing Modules (MPMs)</a>
+ </seealso>
+ <seealso><a href="quickreference.html">Directive Quick Reference</a>
+ </seealso>
&sitemap;
</moduleindex>
1.19 +7 -3 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- manual.css 2 Dec 2002 21:58:35 -0000 1.18
+++ manual.css 22 Dec 2002 22:45:38 -0000 1.19
@@ -473,6 +473,10 @@
list-style-type: upper-alpha;
}
+dd.separate {
+ margin-bottom: 2em;
+}
+
li.separate {
margin-bottom: 1em;
}
@@ -537,7 +541,7 @@
padding: 0;
}
-/* #module-index div#quickview ul#toc, */
+#module-index div#quickview ul#toc,
#manual-page div#quickview ul#toc {
margin-left: 0;
}
@@ -552,14 +556,14 @@
display: none;
}
-/* #module-index div#quickview ul#toc, */
+#module-index div#quickview ul#toc,
#manual-page div#quickview ul#toc,
div#quickview #topics,
div#quickview .seealso {
padding-left: 15px;
}
-/* #module-index div#quickview ul#toc li, */
+#module-index div#quickview ul#toc li,
#manual-page div#quickview ul#toc li,
div#quickview #topics li,
div#quickview .seealso li {
1.22 +20 -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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- common.xsl 11 Dec 2002 20:33:02 -0000 1.21
+++ common.xsl 22 Dec 2002 22:45:38 -0000 1.22
@@ -811,4 +811,24 @@
</xsl:if>
</xsl:template>
+
+ <xsl:template name="module-translatename">
+ <xsl:param name="name"/>
+
+ <xsl:variable name="sname" select="translate($name,$lowercase,$uppercase)"/>
+
+ <xsl:choose>
+ <xsl:when test="starts-with($sname,'MOD_') or starts-with($sname,'MPM_')">
+ <xsl:value-of select="substring($name, 5)"/>
+ </xsl:when>
+ <xsl:when test="starts-with($sname,'MPMT_')">
+ <xsl:value-of select="substring($name, 6)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+ <!-- /module-translatename -->
+
</xsl:stylesheet>
1.7 +103 -20 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- moduleindex.xsl 11 Dec 2002 20:33:02 -0000 1.6
+++ moduleindex.xsl 22 Dec 2002 22:45:38 -0000 1.7
@@ -17,6 +17,7 @@
<body id="module-index">
<xsl:call-template name="top"/>
+ <div id="page-content">
<div id="preamble">
<h1>
<xsl:value-of select="title"/>
@@ -27,6 +28,59 @@
<xsl:apply-templates select="summary" />
</div>
+ <!-- /preamble -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <div id="quickview">
+ <ul id="toc">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <li>
+ <img src="{$path}/images/down.gif" alt="" />
+ <xsl:text> </xsl:text>
+ <a href="#core">
+ <xsl:value-of select="$messages/message[@name='corefeatures']"/>
+ </a>
+ </li>
+
+ <li>
+ <img src="{$path}/images/down.gif" alt="" />
+ <xsl:text> </xsl:text>
+ <a href="#other">
+ <xsl:value-of select="$messages/message[@name='othermodules']"/>
+ </a>
+ </li>
+ </ul>
+
+ <xsl:if test="seealso">
+ <h3>
+ <xsl:value-of select="$messages/message[@name='seealso']"/>
+ </h3>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <ul class="seealso">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <xsl:for-each select="seealso">
+ <li>
+ <xsl:apply-templates/>
+ </li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ </xsl:for-each>
+ </ul>
+ </xsl:if>
+ </div> <!-- /quickview -->
<xsl:text>
</xsl:text> <!-- insert line break -->
@@ -46,13 +100,48 @@
<xsl:text>
</xsl:text> <!-- insert line break -->
+ <!-- -->
+ <!-- put core and mpm_common on top -->
+ <!-- -->
<dl>
<xsl:text>
</xsl:text> <!-- insert line break -->
- <xsl:for-each select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis[status='MPM' or status='Core']">
- <xsl:sort select="name"/>
+ <dt>
+ <a href="{document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'core.xml')])/modulesynopsis/name}.html">
+ <xsl:value-of select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'core.xml')])/modulesynopsis/name"/>
+ </a>
+ </dt>
+ <dd>
+ <xsl:apply-templates select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'core.xml')])/modulesynopsis/description"/>
+ </dd>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <dt>
+ <a href="{document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'mpm_common.xml')])/modulesynopsis/name}.html">
+ <xsl:value-of select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'mpm_common.xml')])/modulesynopsis/name"/>
+ </a>
+ </dt>
+ <dd class="separate">
+ <xsl:apply-templates select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'mpm_common.xml')])/modulesynopsis/description"/>
+ </dd>
+ <!-- /core, mpm_common -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <xsl:variable name="modules" select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis[status='MPM' and name != 'mpm_common']"/>
+ <xsl:variable name="translist">
+ <xsl:call-template name="module-translist">
+ <xsl:with-param name="modules" select="$modules"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:for-each select="$modules">
+ <xsl:sort select="substring-before(substring-after($translist, concat('- ', translate(normalize-space(name),$lowercase,$uppercase), ' ')), ' -')"/>
<dt>
<a href="{name}.html">
@@ -67,6 +156,7 @@
</xsl:text> <!-- insert line break -->
</xsl:for-each>
+ <!-- /mpm -->
</dl>
</div>
<!-- /core section -->
@@ -118,6 +208,9 @@
</dl>
</div>
<!-- /modules section -->
+
+ </div>
+ <!-- /page-content -->
<xsl:text>
</xsl:text> <!-- insert line break -->
@@ -144,7 +237,7 @@
<xsl:variable name="letter" select="substring($letters-todo,1,1)"/>
<xsl:variable name="translist">
- <xsl:call-template name="module-trans">
+ <xsl:call-template name="module-translist">
<xsl:with-param name="modules" select="$modules"/>
</xsl:call-template>
</xsl:variable>
@@ -190,7 +283,7 @@
<xsl:param name="modules"/>
<xsl:variable name="translist">
- <xsl:call-template name="module-trans">
+ <xsl:call-template name="module-translist">
<xsl:with-param name="modules" select="$modules"/>
</xsl:call-template>
</xsl:variable>
@@ -208,7 +301,7 @@
</xsl:template>
<!-- /module-startletters -->
-
+
<!-- -->
<!-- define module name translations for sorting -->
@@ -232,7 +325,7 @@
' -')
-->
<!-- -->
- <xsl:template name="module-trans">
+ <xsl:template name="module-translist">
<xsl:param name="modules"/>
<xsl:text>-</xsl:text>
@@ -242,23 +335,13 @@
<xsl:text> </xsl:text>
<xsl:value-of select="$sname"/>
<xsl:text> </xsl:text>
-
- <xsl:choose>
- <xsl:when test="starts-with($sname,'MOD_') or starts-with($sname,'MPM_')">
- <xsl:value-of select="substring($sname, 5)"/>
- </xsl:when>
- <xsl:when test="starts-with($sname,'MPMT_')">
- <xsl:value-of select="substring($sname, 6)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$sname"/>
- </xsl:otherwise>
- </xsl:choose>
-
+ <xsl:call-template name="module-translatename">
+ <xsl:with-param name="name" select="$sname"/>
+ </xsl:call-template>
<xsl:text> -</xsl:text>
</xsl:for-each>
</xsl:template>
- <!-- /module-trans -->
+ <!-- /module-translist -->
</xsl:stylesheet>
1.7 +55 -48 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xsl 11 Dec 2002 20:33:02 -0000 1.6
+++ sitemap.xsl 22 Dec 2002 22:45:38 -0000 1.7
@@ -172,6 +172,9 @@
<xsl:call-template name="toplink"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div class="section">
<!-- Section heading -->
@@ -187,6 +190,9 @@
</xsl:if>
</h2>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<!-- category body -->
<ul>
<xsl:apply-templates select="page"/>
@@ -194,6 +200,9 @@
<xsl:apply-templates select="modulefilelist"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</div> <!-- /.section -->
</xsl:template>
<!-- /category -->
@@ -204,57 +213,57 @@
<!-- insert module list into sitemap -->
<!-- -->
<xsl:template match="category/modulefilelist">
- <ul>
+
+ <!-- create our own translation list first -->
+ <xsl:variable name="translist">
+ <xsl:text>-</xsl:text>
+
<xsl:for-each select="modulefile">
- <xsl:sort select="document(concat($basedir,'mod/',.))/modulesynopsis/name"/>
<xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
+
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$current/name"/>
+ <xsl:text> </xsl:text>
+ <xsl:call-template name="module-translatename">
+ <xsl:with-param name="name" select="$current/name"/>
+ </xsl:call-template>
+ <xsl:text> -</xsl:text>
+ </xsl:for-each>
+ </xsl:variable>
- <xsl:if test="$current/status='MPM' or $current/status='Core'">
- <xsl:variable name="name"><xsl:choose>
- <xsl:when test="starts-with($current/name,'mpm_')">
- <xsl:value-of select="substring($current/name,5)"/>
- </xsl:when>
+ <ul>
+ <!-- put core and mpm_common on top -->
+ <li>
+ <a href="mod/core.html">
+ <xsl:value-of select="$messages/message[@name='apachecore']"/>
+ </a>
+ </li>
- <xsl:otherwise>
- <xsl:value-of select="$current/name"/>
- </xsl:otherwise>
- </xsl:choose></xsl:variable>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
- <li>
- <a href="mod/{$current/name}.html"><xsl:choose>
- <xsl:when test="$name='core'">
- <xsl:value-of select="$messages/message[@name='apachecore']"/>
- </xsl:when>
-
- <xsl:when test="$name='common'">
- <xsl:value-of select="$messages/message[@name='apachempmcommon']"/>
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:value-of select="$messages/message[@name='apachempm']"/>
- <xsl:text> </xsl:text>
- <xsl:value-of select="$name"/>
- </xsl:otherwise></xsl:choose>
- </a>
- </li>
+ <li>
+ <a href="mod/mpm_common.html">
+ <xsl:value-of select="$messages/message[@name='apachempmcommon']"/>
+ </a>
+ </li>
<xsl:text>
</xsl:text> <!-- insert line break -->
- </xsl:if>
- </xsl:for-each>
- <!-- /core,mpm -->
-
<xsl:for-each select="modulefile">
- <xsl:sort select="document(concat($basedir,'mod/',.))/modulesynopsis/name"/>
+ <xsl:sort select="substring-before(substring-after($translist, concat('- ', document(concat($basedir,'mod/',.))/modulesynopsis/name, ' ')), ' -')"/>
+
<xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
- <xsl:if test="$current/status!='MPM' and $current/status!='Core' and $current/status!='Obsolete'">
+ <xsl:if test="$current/status='MPM' and $current/name!='mpm_common'">
+ <xsl:variable name="name" select="substring-before(substring-after($translist, concat('- ', $current/name, ' ')), ' -')"/>
+
<li>
<a href="mod/{$current/name}.html">
- <xsl:value-of select="$messages/message[@name='apachemodule']"/>
+ <xsl:value-of select="$messages/message[@name='apachempm']"/>
<xsl:text> </xsl:text>
- <xsl:value-of select="$current/name"/>
+ <xsl:value-of select="$name"/>
</a>
</li>
@@ -263,33 +272,31 @@
</xsl:if>
</xsl:for-each>
- <!-- /other modules -->
</ul>
+ <!-- /core, mpm -->
- <!-- obsolete modules -->
-<!--
<ul>
<xsl:for-each select="modulefile">
- <xsl:sort select="document(concat($basedir,'mod/',.))/modulesynopsis/name"/>
+ <xsl:sort select="substring-before(substring-after($translist, concat('- ', document(concat($basedir,'mod/',.))/modulesynopsis/name, ' ')), ' -')"/>
+
<xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
- <xsl:if test="$current/status='Obsolete'">
+ <xsl:if test="$current/status!='MPM' and $current/status!='Core' and $current/status!='Obsolete'">
<li>
- <a href="mod/obs_{$current/name}.html">
- <xsl:value-of select="$messages/message[@name='obsoleteapachemodule']"/>
+ <a href="mod/{$current/name}.html">
+ <xsl:value-of select="$messages/message[@name='apachemodule']"/>
<xsl:text> </xsl:text>
<xsl:value-of select="$current/name"/>
</a>
</li>
-
+
<xsl:text>
-</xsl:text>
+</xsl:text> <!-- insert line break -->
</xsl:if>
</xsl:for-each>
- </ul>
--->
- <!-- /obsolete modules -->
+ </ul>
+ <!-- /other modules -->
</xsl:template>
<!-- /category/modulefilelist -->
1.7 +28 -8 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- synopsis.xsl 11 Dec 2002 20:33:02 -0000 1.6
+++ synopsis.xsl 22 Dec 2002 22:45:38 -0000 1.7
@@ -32,14 +32,34 @@
<div id="preamble">
<h1>
- <xsl:if test="status='Obsolete'">
- <xsl:value-of select="$messages/message[@name='obsoleteapachemodule']"/>
- </xsl:if>
- <xsl:if test="status!='Obsolete'">
- <xsl:value-of select="$messages/message[@name='apachemodule']"/>
- </xsl:if>
- <xsl:text> </xsl:text>
- <xsl:value-of select="name"/>
+ <xsl:choose>
+ <xsl:when test="status='Core'">
+ <xsl:value-of select="$messages/message[@name='apachecore']"/>
+ </xsl:when>
+
+ <xsl:when test="name='mpm_common'">
+ <xsl:value-of select="$messages/message[@name='apachempmcommon']"/>
+ </xsl:when>
+
+ <xsl:when test="status='MPM'">
+ <xsl:value-of select="$messages/message[@name='apachempm']"/>
+ <xsl:text> </xsl:text>
+ <xsl:call-template name="module-translatename">
+ <xsl:with-param name="name" select="name" />
+ </xsl:call-template>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:if test="status='Obsolete'">
+ <xsl:value-of select="$messages/message[@name='obsoleteapachemodule']"/>
+ </xsl:if>
+ <xsl:if test="status!='Obsolete'">
+ <xsl:value-of select="$messages/message[@name='apachemodule']"/>
+ </xsl:if>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="name"/>
+ </xsl:otherwise>
+ </xsl:choose>
</h1>
<xsl:text>