Boostbook: Only put table/hr in header if it has content.

Also fixed option name for 'boost.defaults' in comment.

[SVN r75837]
This commit is contained in:
Daniel James 2011-12-07 09:18:01 +00:00
parent 2b0661a175
commit 28e539d879

View File

@ -14,7 +14,7 @@
<!-- <!--
boost.defaults: boost.defaults:
*custom - only use explicitly set parameters *none - only use explicitly set parameters
Boost - use standard boost settings, can be overridden Boost - use standard boost settings, can be overridden
--> -->
<xsl:param name = "boost.defaults" select = "'none'"/> <xsl:param name = "boost.defaults" select = "'none'"/>
@ -87,33 +87,35 @@
<xsl:variable name = "home" select = "/*[1]"/> <xsl:variable name = "home" select = "/*[1]"/>
<xsl:variable name = "up" select = "parent::*"/> <xsl:variable name = "up" select = "parent::*"/>
<table cellpadding = "2" width = "100%"><tr> <xsl:if test = "boolean(normalize-space($boost.image.src)) or $nav.layout != 'none'">
<xsl:if test = "$nav.border = 'Boost'"> <table cellpadding = "2" width = "100%"><tr>
<xsl:attribute name = "class">boost-head</xsl:attribute>
</xsl:if>
<td valign = "top">
<xsl:if test = "$nav.border = 'Boost'"> <xsl:if test = "$nav.border = 'Boost'">
<xsl:attribute name = "style">background-color: white; width: 50%;</xsl:attribute> <xsl:attribute name = "class">boost-head</xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test = "boolean(normalize-space($boost.image.src))">
<img alt="{$boost.image.alt}" width="{$boost.image.w}" height="{$boost.image.h}"> <td valign = "top">
<xsl:attribute name="src"> <xsl:if test = "$nav.border = 'Boost'">
<xsl:call-template name="href.target.relative"> <xsl:attribute name = "style">background-color: white; width: 50%;</xsl:attribute>
<xsl:with-param name="target" select="$boost.image.src"/> </xsl:if>
</xsl:call-template> <xsl:if test = "boolean(normalize-space($boost.image.src))">
</xsl:attribute> <img alt="{$boost.image.alt}" width="{$boost.image.w}" height="{$boost.image.h}">
</img> <xsl:attribute name="src">
</xsl:if> <xsl:call-template name="href.target.relative">
</td><xsl:choose> <xsl:with-param name="target" select="$boost.image.src"/>
<xsl:when test = "$nav.layout = 'horizontal'"> </xsl:call-template>
<xsl:call-template name = "header.navdata-horiz"/> </xsl:attribute>
</xsl:when><xsl:when test = "$nav.layout = 'vertical'"> </img>
<xsl:call-template name = "header.navdata-vert"/> </xsl:if>
</xsl:when> </td><xsl:choose>
</xsl:choose> <xsl:when test = "$nav.layout = 'horizontal'">
</tr></table> <xsl:call-template name = "header.navdata-horiz"/>
<hr/> </xsl:when><xsl:when test = "$nav.layout = 'vertical'">
<xsl:call-template name = "header.navdata-vert"/>
</xsl:when>
</xsl:choose>
</tr></table>
<hr/>
</xsl:if>
<xsl:choose> <xsl:choose>
<xsl:when test = "$nav.flow = 'DocBook'"> <xsl:when test = "$nav.flow = 'DocBook'">
<table width = "100%" class = "navheader"> <table width = "100%" class = "navheader">