Commit 55ea2d2e authored by Andre Malo's avatar Andre Malo
Browse files

style updates from trunk 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1563504 13f79535-47bb-0310-9956-ffa450edef68
parent 8884b985

docs/manual/style/xsl/common.xsl

+26 −11
Original line number Diff line number Diff line
@@ -169,8 +169,7 @@ 
    <link type="text/css" media="print"

           rel="stylesheet"

           href="{$path}/style/css/manual-print.css"/>



    <!-- chm files do not need a favicon or a canonical link-->

    <!-- chm files do not need a favicon -->

    <xsl:if test="not($is-chm or $is-zip)">&lf;

        <link rel="shortcut icon" href="{$path}/images/favicon.ico" />

        <xsl:if test="$is-retired">
@@ -364,6 +363,7 @@ 
</a>

</xsl:template>





<!-- ==================================================================== -->

<!-- out of date                                                          -->

<!-- ==================================================================== -->
@@ -384,10 +384,9 @@ 
<xsl:call-template name="langavail">

    <xsl:with-param name="position" select="'bottom'" />

</xsl:call-template>



<div id="footer">&lf;

    <p class="apache">

        <xsl:text>Copyright 2013 The Apache Software Foundation.</xsl:text><br />

        <xsl:text>Copyright 2014 The Apache Software Foundation.</xsl:text><br />

        <xsl:if test="normalize-space($message[@id='before-license'])">

            <xsl:value-of select="$message[@id='before-license']"/>

            <xsl:text> </xsl:text>
@@ -406,7 +405,6 @@ 


        <xsl:text>.</xsl:text>

    </p>&lf;



    <xsl:call-template name="super-menu"/>



</div> <!-- /footer -->
@@ -763,11 +761,21 @@ 
<code class="directive">

    <xsl:choose>

    <xsl:when test="@module">

        <xsl:variable name="lowerdirective"

            select="translate(., $uppercase, $lowercase)" />

        <xsl:variable name="lowerdirective">

            <xsl:choose>

            <xsl:when test="@name">

                <xsl:value-of select="normalize-space(translate(@name,

                                        $uppercase, $lowercase))" />

            </xsl:when>

            <xsl:otherwise>

                <xsl:value-of select="normalize-space(translate(.,

                                        $uppercase, $lowercase))" />

            </xsl:otherwise>

            </xsl:choose>

        </xsl:variable>



        <xsl:choose>

        <xsl:when test="$in-modulesynopsis and @module = /modulesynopsis/name">

        <xsl:when test="$in-modulesynopsis and normalize-space(@module) = /modulesynopsis/name">

            <a href="#{$lowerdirective}">

                <xsl:if test="@type='section'">&lt;</xsl:if>

                <xsl:value-of select="."/>
@@ -775,7 +783,7 @@ 
            </a>

        </xsl:when>

        <xsl:otherwise>

            <a href="{$path}/mod/{@module}.html#{$lowerdirective}">

            <a href="{$path}/mod/{normalize-space(@module)}.html#{$lowerdirective}">

                <xsl:if test="@type='section'">&lt;</xsl:if>

                <xsl:value-of select="."/>

                <xsl:if test="@type='section'">&gt;</xsl:if>
@@ -801,9 +809,16 @@ 
<!-- ==================================================================== -->

<xsl:template match="module" name="module">

<code class="module">

    <a href="{$path}/mod/{.}.html">

    <xsl:choose>

    <xsl:when test="@outdated = 'true'">

        <xsl:value-of select="."/>

    </xsl:when>

    <xsl:otherwise>

        <a href="{$path}/mod/{normalize-space(.)}.html">

            <xsl:value-of select="."/>

        </a>

    </xsl:otherwise>

    </xsl:choose>

</code>

</xsl:template>

<!-- /module -->

docs/manual/style/xsl/nroff.xsl

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ FATAL: only tables with two (2) columns are supported. 
<!-- ==================================================================== -->

<!-- pass through content                                                 -->

<!-- ==================================================================== -->

<xsl:template match="a|code|module|table|program">

<xsl:template match="a|code|module|table|program|glossary">

<xsl:apply-templates />

</xsl:template>

docs/manual/style/xsl/synopsis.xsl

+11 −1
Original line number Diff line number Diff line
@@ -93,7 +93,17 @@ 
                    <td>

                        <xsl:variable name="status" select="translate(

                            status, $uppercase, $lowercase)"/>

                        <xsl:choose>

                        <xsl:when test="status = 'External' and status/@href">

                            <a href="{status/@href}">

                                <xsl:value-of select="$message[@id=$status]"/>

                            </a>

                        </xsl:when>

                        <xsl:otherwise>

                            <xsl:value-of

                                select="$message[@id=$status]"/>

                        </xsl:otherwise>

                        </xsl:choose>

                    </td>

                </tr>