forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r331576 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer: ./ resources/stylesheets/ resources/stylesheets/common/xslt/html/
Date Mon, 07 Nov 2005 19:00:36 GMT
Author: thorsten
Date: Mon Nov  7 11:00:25 2005
New Revision: 331576

URL: http://svn.apache.org/viewcvs?rev=331576&view=rev
Log:
Moving images to their new location by changing the trigger to themes/images/*. Removed the
include to site2xhtml.xsl and added all needed variables that can be used in contracts to
the themer.html.xsl. 

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/document2html.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/tab2menu.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap?rev=331576&r1=331575&r2=331576&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
Mon Nov  7 11:00:25 2005
@@ -144,14 +144,14 @@
       that the content can be used later on.
       {1} - requested url (striped from extension) -->
     <map:pipeline>
-      <map:match pattern="prepare.structurer.*.**">
+      <map:match pattern="prepare.structurer.*.**"> 
         <map:generate src="{lm:resolve.structurer.{2}}" />
         <map:transform src="{lm:get.structurer.by.requested.format.xsl}">
           <map:parameter name="format" value="{1}" />
         </map:transform>
         <!-- FIXME: jxpath -->
         <!-- When jxpath problem is solved rewrite tiles and uncomment -->
-        <!-- <map:transform type="linkrewriter" /> -->
+        <map:transform type="linkrewriter" />
         <map:transform type="jx">
           <map:parameter name="lenient-xpath" value="true" />
           <map:parameter name="getRequest" value="{2}" />
@@ -189,7 +189,7 @@
         <map:generate src="{lm:structurer.{1}.{2}}" />
         <map:transform src="{lm:structurer-properties-includes.xsl}">
           <map:parameter name="format" value="{1}" />
-        </map:transform>
+        </map:transform> 
         <map:transform type="cinclude" />
         <map:serialize />
       </map:match>
@@ -225,6 +225,12 @@
         <map:transform src="{lm:structurer-xsl.html.{1}.xsl}">
           <map:parameter name="path" value="{0}" />
         </map:transform>
+        <!-- WORKAROUND The following transfomer are responsible for generating links
for inline css It produces non valid css!!!-->
+        <!-- FIXME make contracts self containing and open them for css-->
+        <map:transform type="pattern"
+        src="{forrest:context}/resources/chaperon/grammars/link.xlex" />
+      <map:transform
+        src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl" />
          <map:transform src="{lm:transform.xml.xml-namespace-stripped}" /> 
         <map:serialize type="xhtml" />
       </map:match>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/document2html.xsl?rev=331576&r1=331575&r2=331576&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/document2html.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/document2html.xsl
Mon Nov  7 11:00:25 2005
@@ -47,7 +47,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:variable name="skin-img-dir" select="concat(string($root), 'skin/images')"/>
+  <xsl:variable name="skin-img-dir" select="concat(string($root), 'themes/images')"/>
 
   <xsl:template match="/">
     <xsl:apply-templates mode="toc"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/tab2menu.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/tab2menu.xsl?rev=331576&r1=331575&r2=331576&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/tab2menu.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/common/xslt/html/tab2menu.xsl
Mon Nov  7 11:00:25 2005
@@ -122,7 +122,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:variable name="skin-img-dir" select="concat(string($root), 'skin/images')"/>
+  <xsl:variable name="skin-img-dir" select="concat(string($root), 'themes/images')"/>
 
   <!--
     The longest path of any level 1 tab, whose path is a subset of the current URL.  Ie,

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl?rev=331576&r1=331575&r2=331576&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl
Mon Nov  7 11:00:25 2005
@@ -28,7 +28,6 @@
     <xsl:template match="/">
       <!--Create the final stylesheet (alias:) resources/stylesheets/structurer-tiles-root-strip.xsl
-->
         <alias:stylesheet version="1.0">
-            <alias:import href="file:{$forrestContext}/skins/common/xslt/html/site2xhtml.xsl"/>

             <alias:import href="file:{$forrestContext}/skins/common/xslt/html/dotdots.xsl"/>
             <alias:import href="file:{$forrestContext}/skins/common/xslt/html/pathutils.xsl"/>
             <alias:import href="file:{$forrestContext}/skins/common/xslt/html/renderlogo.xsl"/>
@@ -46,6 +45,27 @@
               </alias:include>  
             </xsl:for-each>
             <alias:param name="path"/>
+<!-- FIXME: extract the following part to a stylesheet on its own START -->
+              <!-- Path (..'s) to the root directory -->
+            <alias:variable name="root">
+              <alias:call-template name="dotdots">
+                <alias:with-param name="path" select="$path"/>
+              </alias:call-template>
+            </alias:variable>
+            <alias:variable name="filename-noext">
+              <alias:call-template name="filename-noext">
+                <alias:with-param name="path" select="$path"/>
+              </alias:call-template>
+            </alias:variable>
+            <!-- Source filename (eg 'foo.xml') of current page -->
+            <alias:variable name="filename">
+              <alias:call-template name="filename">
+                <alias:with-param name="path" select="$path"/>
+              </alias:call-template>
+            </alias:variable>
+            <alias:variable name="skin-img-dir" select="concat(string($root), 'themes/images')"/>
+            <alias:variable name="spacer" select="concat($root, 'themer/images/spacer.gif')"/>
+<!-- FIXME: extract the following part to a stylesheet on its own END -->
             <xsl:comment>All xhtml head elements requested by the forrest:template</xsl:comment>
             <alias:template name="getHead">
                 <xsl:for-each 



Mime
View raw message