diff options
| author | Luca Toscano <elukey@apache.org> | 2016-04-29 08:31:53 +0200 |
|---|---|---|
| committer | Luca Toscano <elukey@apache.org> | 2016-04-29 08:31:53 +0200 |
| commit | 41df726ba7cf4e5835fa43b1b930d721cc9366c2 (patch) | |
| tree | 1d69190f38adcd7a34db5e8eca64cdb4ba027fe1 | |
| parent | Revert to 2.4.1 behavior and null the request and vhost as appropriate. PR 59333 (diff) | |
| download | apache2-41df726ba7cf4e5835fa43b1b930d721cc9366c2.tar.xz apache2-41df726ba7cf4e5835fa43b1b930d721cc9366c2.zip | |
Make the comments link always appear under "See also" in the right panel of each doc page.
Previously it was inconsistently placed right below the last section on top.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741557 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | docs/manual/style/xsl/manualpage.xsl | 23 | ||||
| -rw-r--r-- | docs/manual/style/xsl/synopsis.xsl | 18 |
2 files changed, 21 insertions, 20 deletions
diff --git a/docs/manual/style/xsl/manualpage.xsl b/docs/manual/style/xsl/manualpage.xsl index 4f1073aa10..32a3e05b82 100644 --- a/docs/manual/style/xsl/manualpage.xsl +++ b/docs/manual/style/xsl/manualpage.xsl @@ -38,12 +38,12 @@ <xsl:attribute name="class">no-sidebar</xsl:attribute> </xsl:if> - <xsl:call-template name="top"/> + <xsl:call-template name="top"/> <div id="page-content"> <xsl:call-template name="retired" /> - <div id="preamble"> + <div id="preamble"> <h1> <xsl:value-of select="title"/> </h1>&lf; @@ -52,7 +52,7 @@ <xsl:apply-templates select="summary" /> </div>&lf; <!-- /#preamble --> - + <xsl:if test="(not($is-chm) and count(section) > 1) or seealso"> <div id="quickview"> <xsl:if test="not($is-chm) and count(section) > 1"> @@ -61,7 +61,10 @@ </ul> </xsl:if> - <xsl:if test="seealso"> + <!-- The seealso section shows links to related documents + explicitly set in .xml docs or simply the comments. --> + <xsl:if test="seealso or not($is-chm or $is-zip or + $metafile/basename = 'index')"> <h3> <xsl:value-of select="$message[@id='seealso']" /> @@ -72,15 +75,13 @@ <xsl:apply-templates /> </li> </xsl:for-each> + <xsl:if test="not($is-chm or $is-zip or $metafile/basename = 'index')"> + <li><a href="#comments_section"><xsl:value-of + select="$message[@id='comments']" /></a> + </li> + </xsl:if> </ul> </xsl:if> - <xsl:if test="not($is-chm or $is-zip or $metafile/basename = 'index')"> - <ul class="seealso"> - <li><a href="#comments_section"><xsl:value-of - select="$message[@id='comments']" /></a> - </li> - </ul> - </xsl:if> </div>&lf; <!-- /#quickview --> </xsl:if> diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl index eda684c3b7..7b3e90e984 100644 --- a/docs/manual/style/xsl/synopsis.xsl +++ b/docs/manual/style/xsl/synopsis.xsl @@ -289,8 +289,10 @@ </a> </li> </ul> - - <xsl:if test="seealso"> + <!-- The seealso section shows links to related documents + explicitly set in .xml docs or simply the comments. --> + <xsl:if test="seealso or not($is-chm or $is-zip or + $metafile/basename = 'index')"> <h3> <xsl:value-of select="$message [@id='seealso']" /> @@ -302,15 +304,13 @@ <xsl:apply-templates /> </li>&lf; </xsl:for-each> + <xsl:if test="not($is-chm or $is-zip or $metafile/basename = 'index')"> + <li><a href="#comments_section"><xsl:value-of + select="$message[@id='comments']" /></a> + </li> + </xsl:if> </ul> </xsl:if> - <xsl:if test="not($is-chm or $is-zip or $metafile/basename = 'index')"> - <ul class="seealso"> - <li><a href="#comments_section"><xsl:value-of - select="$message[@id='comments']" /></a> - </li> - </ul> - </xsl:if> </div> <!-- /#quickview --> </xsl:if>&lf; <!-- have sidebar --> |