Return-Path: 
 <svn-return-5083-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 23967 invoked from network); 23 Feb 2006 00:43:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 23 Feb 2006 00:43:55 -0000
Received: (qmail 93378 invoked by uid 500); 23 Feb 2006 00:43:54 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 93324 invoked by uid 500); 23 Feb 2006 00:43:54 -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 93313 invoked by uid 99); 23 Feb 2006 00:43:53 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2006 16:43:53 -0800
X-ASF-Spam-Status: No, hits=-9.4 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; Wed, 22 Feb 2006 16:43:53 -0800
Received: (qmail 23795 invoked by uid 65534); 23 Feb 2006 00:43:33 -0000
Message-ID: <20060223004333.23792.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r380004 -
 /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher-html.xsl
Date: Thu, 23 Feb 2006 00:43:32 -0000
To: svn@forrest.apache.org
From: thorsten@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: thorsten
Date: Wed Feb 22 16:43:27 2006
New Revision: 380004

URL: http://svn.apache.org/viewcvs?rev=380004&view=rev
Log:
Implementing renaming of @type values now inline and block.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher-html.xsl

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher-html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher-html.xsl?rev=380004&r1=380003&r2=380004&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher-html.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/hooksMatcher-html.xsl Wed Feb 22 16:43:27 2006
@@ -23,30 +23,36 @@
     <xsl:apply-templates/>
   </xsl:template>
   <!--This template will match the different combinations for hooks-->
-  <xsl:template match="hook[@name and (@type='div' or not(@type) and not(@class))]">
-    <div id="{@name}">
-      <xsl:apply-templates/>
-      <xsl:if test="@nbsp='true'">&#160;</xsl:if>
-    </div>
+  <xsl:template match="hook">
+    <xsl:if test="@type='block' or not(@type)">
+      <div>
+        <xsl:call-template name="attributes"/>
+        <xsl:if test="@nbsp='true'"><xsl:text> </xsl:text></xsl:if>
+         <xsl:apply-templates/>
+      </div>
+    </xsl:if>
+    <xsl:if test="@type='inline'">
+      <span id="{@name}">
+        <xsl:call-template name="attributes"/>
+        <xsl:if test="@nbsp='true'"><xsl:text> </xsl:text></xsl:if>
+         <xsl:apply-templates/>
+      </span>
+    </xsl:if>
   </xsl:template>
-  <xsl:template match="hook[@class and (@type='div' or not(@type))]">
-    <div class="{@class}">
-      <xsl:apply-templates/>
-      <xsl:if test="@nbsp='true'">&#160;</xsl:if>
-    </div>
-  </xsl:template>
-  <xsl:template match="hook[@class and @type='span']">
-    <span class="{@class}"> 
-      <xsl:apply-templates/>
-      <xsl:if test="@nbsp='true'">&#160;</xsl:if>
-    </span>
-  </xsl:template>
-  <xsl:template match="hook[@name and @type='span']">
-    <span id="{@name}"> 
-      <xsl:apply-templates/>
-      <xsl:if test="@nbsp='true'">&#160;</xsl:if>
-    </span>
+  
+  <xsl:template name="attributes">
+    <xsl:if test="@name">
+      <xsl:attribute name="id">
+        <xsl:value-of select="@name" />
+      </xsl:attribute>
+    </xsl:if>
+    <xsl:if test="@class">
+      <xsl:attribute name="class">
+        <xsl:value-of select="@class" />
+      </xsl:attribute>
+    </xsl:if>
   </xsl:template>
+  
   <xsl:template match="@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
       <xsl:apply-templates