From 28e539d879da98366fdf5076e60f0626e4fffb42 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 7 Dec 2011 09:18:01 +0000
Subject: [PATCH] Boostbook: Only put table/hr in header if it has content.

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

[SVN r75837]
---
 xsl/navbar.xsl | 54 ++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

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