Slides #862846: Make toc.bg.color and body.bg.color conditional

diff --git a/slides/xsl/html/tables.xsl b/slides/xsl/html/tables.xsl
index fdbe2a0d2afda4e7ae3db07a5d5cd10dbbafdd83..43e71100d254cd50bc226b05f42adbeaf57b9ae1 100644 (file)
--- a/slides/xsl/html/tables.xsl
+++ b/slides/xsl/html/tables.xsl
@@ -18,14 +18,23 @@
   <table border="0" width="100%" summary="Navigation and body table"
          cellpadding="0" cellspacing="0">
     <tr>
-      <td bgcolor="{$toc.bg.color}" width="{$toc.width}"
-          valign="top" align="left">
+      <td width="{$toc.width}" valign="top" align="left">
+       <xsl:if test="$toc.bg.color != ''">
+         <xsl:attribute name="bgcolor">
+           <xsl:value-of select="$toc.bg.color"/>
+         </xsl:attribute>
+       </xsl:if>
         <div class="ttoc">
           <xsl:apply-templates select="." mode="t-toc"/>
         </div>
       </td>
       <td>&#160;</td>
-      <td bgcolor="{$body.bg.color}" valign="top" align="left">
+      <td valign="top" align="left">
+       <xsl:if test="$body.bg.color != ''">
+         <xsl:attribute name="bgcolor">
+           <xsl:value-of select="$body.bg.color"/>
+         </xsl:attribute>
+       </xsl:if>
         <div class="{name(.)}">
           <xsl:apply-templates select="*[name(.) != 'foil'
                                          and name(.) != 'foilgroup']"/>
@@ -39,14 +48,23 @@
   <table border="0" width="100%" summary="Navigation and body table"
          cellpadding="0" cellspacing="0">
     <tr>
-      <td bgcolor="{$toc.bg.color}" width="{$toc.width}"
-          valign="top" align="left">
+      <td width="{$toc.width}" valign="top" align="left">
+       <xsl:if test="$toc.bg.color != ''">
+         <xsl:attribute name="bgcolor">
+           <xsl:value-of select="$toc.bg.color"/>
+         </xsl:attribute>
+       </xsl:if>
         <div class="ttoc">
           <xsl:apply-templates select="." mode="t-toc"/>
         </div>
       </td>
       <td>&#160;</td>
-      <td bgcolor="{$body.bg.color}" valign="top" align="left">
+      <td valign="top" align="left">
+       <xsl:if test="$body.bg.color != ''">
+         <xsl:attribute name="bgcolor">
+           <xsl:value-of select="$body.bg.color"/>
+         </xsl:attribute>
+       </xsl:if>
         <div class="{name(.)}">
           <xsl:apply-templates/>
         </div>

diff --git a/slides/xsl/html/vslides.xsl b/slides/xsl/html/vslides.xsl
index 3c26271c3d18272ff0b5a08c012898cec2f2236c..3130fce58883ae1d9bd4f7cd921b4388c7eddaca 100644 (file)
--- a/slides/xsl/html/vslides.xsl
+++ b/slides/xsl/html/vslides.xsl
@@ -86,8 +86,12 @@
             </tr>
 
             <tr>
-              <td bgcolor="{$toc.bg.color}" width="{$toc.width}"
-                  valign="top" align="left">
+              <td width="{$toc.width}" valign="top" align="left">
+               <xsl:if test="$toc.bg.color != ''">
+                 <xsl:attribute name="bgcolor">
+                   <xsl:value-of select="$toc.bg.color"/>
+                 </xsl:attribute>
+               </xsl:if>
 
                 <xsl:call-template name="vertical-navigation">
                   <xsl:with-param name="next" select="/slides"/>
@@ -95,7 +99,13 @@
                 </xsl:call-template>
 
               </td>
-              <td bgcolor="{$body.bg.color}" valign="top" align="left">
+              <td valign="top" align="left">
+               <xsl:if test="$body.bg.color != ''">
+                 <xsl:attribute name="bgcolor">
+                   <xsl:value-of select="$body.bg.color"/>
+                 </xsl:attribute>
+               </xsl:if>
+
                 <div class="{name(.)}">
 
                   <div class="toc-body">
@@ -183,8 +193,12 @@
             </tr>
 
             <tr>
-              <td bgcolor="{$toc.bg.color}" width="{$toc.width}"
-                  valign="top" align="left">
+              <td width="{$toc.width}" valign="top" align="left">
+               <xsl:if test="$toc.bg.color != ''">
+                 <xsl:attribute name="bgcolor">
+                   <xsl:value-of select="$toc.bg.color"/>
+                 </xsl:attribute>
+               </xsl:if>
 
                 <xsl:call-template name="vertical-navigation">
                   <xsl:with-param name="first"/>
@@ -193,7 +207,12 @@
                 </xsl:call-template>
 
               </td>
-              <td bgcolor="{$body.bg.color}" valign="top" align="left">
+              <td valign="top" align="left">
+               <xsl:if test="$body.bg.color != ''">
+                 <xsl:attribute name="bgcolor">
+                   <xsl:value-of select="$body.bg.color"/>
+                 </xsl:attribute>
+               </xsl:if>
                 <div class="{name(.)}">
                   <xsl:apply-templates mode="titlepage.mode"/>
                 </div>
@@ -287,8 +306,12 @@
           </tr>
 
           <tr>
-            <td bgcolor="{$toc.bg.color}" width="{$toc.width}"
-                valign="top" align="left">
+            <td width="{$toc.width}" valign="top" align="left">
+             <xsl:if test="$toc.bg.color != ''">
+               <xsl:attribute name="bgcolor">
+                 <xsl:value-of select="$toc.bg.color"/>
+               </xsl:attribute>
+             </xsl:if>
 
               <xsl:call-template name="vertical-navigation">
                 <xsl:with-param name="last" select="$lastfoil"/>
@@ -297,7 +320,13 @@
               </xsl:call-template>
 
             </td>
-            <td bgcolor="{$body.bg.color}" valign="top" align="left">
+            <td valign="top" align="left">
+             <xsl:if test="$body.bg.color != ''">
+               <xsl:attribute name="bgcolor">
+                 <xsl:value-of select="$body.bg.color"/>
+               </xsl:attribute>
+             </xsl:if>
+
               <div class="{name(.)}">
                 <xsl:apply-templates/>
               </div>
@@ -400,8 +429,12 @@
           </tr>
 
           <tr>
-            <td bgcolor="{$toc.bg.color}" width="{$toc.width}"
-                valign="top" align="left">
+            <td width="{$toc.width}" valign="top" align="left">
+             <xsl:if test="$toc.bg.color != ''">
+               <xsl:attribute name="bgcolor">
+                 <xsl:value-of select="$toc.bg.color"/>
+               </xsl:attribute>
+             </xsl:if>
 
               <xsl:call-template name="vertical-navigation">
                 <xsl:with-param name="last" select="$lastfoil"/>
@@ -410,7 +443,13 @@
               </xsl:call-template>
 
             </td>
-            <td bgcolor="{$body.bg.color}" valign="top" align="left">
+            <td valign="top" align="left">
+             <xsl:if test="$body.bg.color != ''">
+               <xsl:attribute name="bgcolor">
+                 <xsl:value-of select="$body.bg.color"/>
+               </xsl:attribute>
+             </xsl:if>
+
               <div class="{name(.)}">
                 <xsl:apply-templates/>
               </div>