Return-Path: 
 <svn-return-3784-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 15056 invoked from network); 1 Oct 2005 07:32:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 1 Oct 2005 07:32:48 -0000
Received: (qmail 29735 invoked by uid 500); 1 Oct 2005 07:32:47 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 29687 invoked by uid 500); 1 Oct 2005 07:32:47 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 29676 invoked by uid 99); 1 Oct 2005 07:32:47 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Oct 2005 00:32:47 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sat, 01 Oct 2005 00:32:52 -0700
Received: (qmail 14994 invoked by uid 65534); 1 Oct 2005 07:32:26 -0000
Message-ID: <20051001073226.14993.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r292938 -
 /forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl
Date: Sat, 01 Oct 2005 07:32:25 -0000
To: svn@forrest.apache.org
From: ferdinand@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: ferdinand
Date: Sat Oct  1 00:32:18 2005
New Revision: 292938

URL: http://svn.apache.org/viewcvs?rev=292938&view=rev
Log:
Fixed table-template that overwrote class with ForrestTable and always inserted padding attributes etc.
Now this only happens in tables w/o class. tables with class are copied as is.

Modified:
    forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl?rev=292938&r1=292937&r2=292938&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl Sat Oct  1 00:32:18 2005
@@ -246,10 +246,26 @@
 
   <xsl:template match="table">
     <xsl:apply-templates select="@id"/>
-    <table cellpadding="4" cellspacing="1" class="ForrestTable">
-      <xsl:copy-of select="@cellspacing | @cellpadding | @border | @class | @bgcolor |@id"/>
-      <xsl:apply-templates/>
-    </table>
+    <xsl:choose>
+      <!-- Limit Forrest specific processing  to tables without class -->
+      <xsl:when test="@class = ''">
+        <table cellpadding="4" cellspacing="1" class="ForrestTable">
+          <xsl:copy-of select="@cellspacing | @cellpadding | @border | @class | @bgcolor |@id"/>
+          <xsl:apply-templates/>
+        </table>    
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- Tables with class are passed without change -->
+        <xsl:copy>
+          <xsl:copy-of select="@*"/>
+          <xsl:apply-templates/>
+        </xsl:copy>    
+        
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:if test="@class = ''">
+      
+    </xsl:if>
   </xsl:template>
 
   <xsl:template match="acronym/@title">