forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r331581 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources: skin/images/ stylesheets/ themes/ themes/default/css/ themes/default/html/ themes/default/images/ themes/pelt/css/ themes/pelt/html/ themes/pe...
Date Mon, 07 Nov 2005 19:15:34 GMT
Author: thorsten
Date: Mon Nov  7 11:14:22 2005
New Revision: 331581

URL: http://svn.apache.org/viewcvs?rev=331581&view=rev
Log:
Finally moved all images (besides svg2png pipes) to their new locations. Updated all contracts that used 'old' site2xhtml.xsl variables that are not aviable anymore and as well the image locations. Updated the nav-section-round-bottom.ft to produce the round bottom from css and not from the contract directly. Added stylesheet to produce roundcorner out of hex values (based on xsl submitted by Kevin. Thx Kevin it was again a big help).

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/round-corner-hex.svg.xslt   (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/
      - copied from r330058, forrest/trunk/main/webapp/skins/common/images/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/README.txt
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/README.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/add.jpg
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/add.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/built-with-forrest-button.png
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/built-with-forrest-button.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/corner-imports.svg.xslt
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/corner-imports.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/dc.svg.xslt
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/dc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/external-link.gif
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/external-link.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/fix.jpg
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/fix.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/forrest-credit-logo.png
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/forrest-credit-logo.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/hack.jpg
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/hack.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/pdfdoc.gif
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/pdfdoc.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/poddoc.png
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/poddoc.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/poddoc.svg.xslt
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/poddoc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/printer.gif
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/printer.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/rc.svg.xslt
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/rc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/remove.jpg
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/remove.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/rss.png
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/rss.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/spacer.gif
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/spacer.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/txtdoc.png
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/txtdoc.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/txtdoc.svg.xslt
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/txtdoc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/update.jpg
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/update.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/valid-html401.png
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/valid-html401.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/vcss.png
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/vcss.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/images/xmldoc.gif
      - copied unchanged from r331256, forrest/trunk/main/webapp/skins/common/images/xmldoc.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/
      - copied from r330058, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/Thumbs.db
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/Thumbs.db
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/chapter.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/chapter.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/chapter_open.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/chapter_open.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/current.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/current.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/doc.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/doc.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/header-background-grad.png
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/header-background-grad.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/header-background.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/header-background.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/header-background.png
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/header-background.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/header_white_line.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/header_white_line.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/instruction_arrow.png
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/instruction_arrow.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/label.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/label.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/page.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/page.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/pdfdoc.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/pdfdoc.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/printer.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/printer.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/search-left.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/search-left.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/search-right.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/search-right.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/sidebar_bg.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/sidebar_bg.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/singlepage.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/singlepage.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/spacer.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/spacer.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/tab-left.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/tab-left.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/tab-right.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/tab-right.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/tl-off.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/tl-off.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/tl-on.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/tl-on.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/tr-off.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/tr-off.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/tr-on.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/tr-on.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/images/xmldoc.gif
      - copied unchanged from r331256, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/xmldoc.gif
Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/skin/images/
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/basic.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/default.scale-dev.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-section.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/search-input.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-credits.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-feedback-dyn.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/branding-theme-profiler.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section-round-bottom.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/round-corner-hex.svg.xslt
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/round-corner-hex.svg.xslt?rev=331581&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/round-corner-hex.svg.xslt (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/round-corner-hex.svg.xslt Mon Nov  7 11:14:22 2005
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+    <xsl:param name="orientation-tb"/>
+    <xsl:param name="orientation-lr"/>
+    <xsl:param name="size"/>
+    <xsl:param name="bg-color-name"/>
+    <xsl:param name="stroke-color-name"/>
+    <xsl:param name="fg-color-name"/>    
+
+   <!-- if not all colors are present, don't even try to render the corners -->
+    <xsl:variable name="isize">
+      <xsl:choose>
+    	<xsl:when test="$bg-color-name and $stroke-color-name and $fg-color-name"><xsl:value-of select="$size"/></xsl:when>
+    	<xsl:otherwise>0</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="smallersize" select="number($isize)-1"/>
+    <xsl:variable name="biggersize" select="number($isize)+1"/>     
+    <xsl:variable name="bg">fill:#<xsl:value-of select="$bg-color-name"/>;</xsl:variable>
+    <xsl:variable name="fill">fill:#<xsl:value-of select="$fg-color-name"/>;</xsl:variable>
+    <xsl:variable name="stroke">stroke:#<xsl:value-of select="$stroke-color-name"/>;</xsl:variable>
+
+    <xsl:template match="/">
+
+
+<svg width="{$isize}" height="{$isize}">
+<!-- background -->
+    <rect x="-1" y="-1" width="{$biggersize}" height="{$biggersize}" style="{$bg}stroke-width:0"/>
+<!-- 0,0 0,-4 4,0 4,-4-->
+
+    <xsl:variable name="flip-tb-scale">
+      <xsl:choose>
+    	<xsl:when test="$orientation-tb='t'">1</xsl:when>
+    	<xsl:otherwise>-1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="flip-lr-scale">
+      <xsl:choose>
+    	<xsl:when test="$orientation-lr='l'">1</xsl:when>
+    	<xsl:otherwise>-1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    
+    <xsl:variable name="flip-tb-translate">
+      <xsl:choose>
+    	<xsl:when test="$orientation-tb='t'">0</xsl:when>
+    	<xsl:otherwise>-<xsl:value-of select="$isize" /></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="flip-lr-translate">
+      <xsl:choose>
+    	<xsl:when test="$orientation-lr='l'">0</xsl:when>
+    	<xsl:otherwise>-<xsl:value-of select="$isize" /></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>    
+    
+    <!-- flip transform -->
+    <g transform="scale({$flip-lr-scale},{$flip-tb-scale}) translate({$flip-lr-translate}, {$flip-tb-translate})"> 
+      <xsl:call-template name="figure" />
+    </g>
+</svg>
+</xsl:template>
+
+        
+  <xsl:template name="figure">
+       <!-- Just change shape here -->     
+		<g transform="translate(0.5 0.5)">
+			<ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}" ry="{$smallersize}"
+				 style="{$fill}{$stroke}stroke-width:1"/>
+		</g>
+	   <!-- end -->	
+  </xsl:template>
+    
+  
+  <!--<xsl:template match="*"></xsl:template>
+  <xsl:template match="text()"></xsl:template>-->
+  
+</xsl:stylesheet>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/round-corner-hex.svg.xslt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default.fv?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default.fv Mon Nov  7 11:14:22 2005
@@ -93,11 +93,8 @@
         <forrest:hook name="content">
           <forrest:contract name="content-title">
             <forrest:properties contract="content-title">
-              <forrest:property name="content-title" nugget="get.body">
-                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.body.xml"/>
-                <!-- FIXME: move to new matching -->
-                <!-- we should request this via lm. We should enable #xpointer(/*/*) generating for the title-->
-                <!--<jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.body.xml"/>-->
+              <forrest:property name="content-title" nugget="get.title">
+                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.title.xml"/>
               </forrest:property>
             </forrest:properties>
           </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/basic.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/basic.css?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/basic.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/basic.css Mon Nov  7 11:14:22 2005
@@ -33,7 +33,7 @@
 	padding: 0;
 	height: 75px;
 	max-height: 75px;
-	background: url(/images/header-background.gif) transparent;
+	background: url(/themes/images/header-background.gif) transparent;
 	background-repeat: no-repeat;
 	position: relative;
 }/*

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/default.scale-dev.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/default.scale-dev.css?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/default.scale-dev.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/css/default.scale-dev.css Mon Nov  7 11:14:22 2005
@@ -33,7 +33,7 @@
 	padding: 0;
 	height: 75px;
 	max-height: 75px;
-	background: url(images/header-background.gif) transparent;
+	background: url(themes/images/header-background.gif) transparent;
 	background-repeat: no-repeat;
 	position: relative;
 }
@@ -88,7 +88,7 @@
 }
 #branding li {
 	float: right;
-	background: transparent url("images/tr-on.gif") 100% 0% no-repeat;
+	background: transparent url("themes/images/tr-on.gif") 100% 0% no-repeat;
 	padding: 0 6px 0 0;
 	margin: 0 1px 0 0;
 	border-bottom: 1px solid #515358;
@@ -97,16 +97,16 @@
 	float: left;
 	display: block;
 	padding: 4px 4px 4px 10px;
-	background: transparent url("images/tl-on.gif") no-repeat;
+	background: transparent url("themes/images/tl-on.gif") no-repeat;
 	font-weight: bold;
 	color: #fff;
 	text-decoration: none;
 }
-#branding ul li:hover a {background: url("images/tl-off.gif") no-repeat;}
-#branding ul li:hover {background: url("images/tr-off.gif") 100% 0% no-repeat;}
+#branding ul li:hover a {background: url("themes/images/tl-off.gif") no-repeat;}
+#branding ul li:hover {background: url("themes/images/tr-off.gif") 100% 0% no-repeat;}
 
-#branding ul li.current a {background: url("images/tl-off.gif") no-repeat;}
-#branding ul li.current {background: url("images/tr-off.gif") 100% 0% no-repeat;}
+#branding ul li.current a {background: url("themes/images/tl-off.gif") no-repeat;}
+#branding ul li.current {background: url("themes/images/tr-off.gif") 100% 0% no-repeat;}
 
 #nav {
 	width: 23%;

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main-sub.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main-sub.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main-sub.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main-sub.ft Mon Nov  7 11:14:22 2005
@@ -34,7 +34,7 @@
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="nav-main-sub-body">
         <xsl:param name="nav-main-sub" select="'test'"/>
-		     <xsl:apply-templates select="$nav-main-sub/navigation/tab/div[@id='nav-main-sub']/*"/>
+		     <xsl:copy-of select="$nav-main-sub/navigation/tab/div[@id='nav-main-sub']/*"/>
 		  </xsl:template>
 		</xsl:stylesheet>
 	</forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-main.ft Mon Nov  7 11:14:22 2005
@@ -38,7 +38,7 @@
 <xsl:comment>+
     |start Tabs
     +</xsl:comment>
-                <xsl:apply-templates select="$nav-main/navigation/tab/ul[@id='nav-main']"/>       
+                <xsl:copy-of select="$nav-main/navigation/tab/ul[@id='nav-main']"/>       
 <xsl:comment>+
     |end Tabs
     +</xsl:comment>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-section.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-section.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-section.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/nav-section.ft Mon Nov  7 11:14:22 2005
@@ -18,106 +18,147 @@
 <forrest:contract name="nav-section" type="nugget"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    nav-section will output the navigation to pages within the current site section AKA menu
+    <p>
+      <strong>nav-section</strong> will output the navigation to pages within the current site section AKA menu.
+    </p>
+    <div class="note">
+      <div class="label">Minitoc inclusion</div>
+      <div class="content">
+        <p><code>&lt;toc&gt;</code> argument can be used to specify the minitoc depth.<br/>
+        This argument is facultative and no minitoc will be displayed if it is omitted.
+        </p>
+      </div>
+    </div>
   </description>
   <usage><![CDATA[<forrest:contract name="nav-section">
   <forrest:properties contract="nav-section">
     <forrest:property name="nav-section" nugget="get.navigation">
-      <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml</url>
+      <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>
     </forrest:property>
+    <forrest:property name="nav-section-toc" nugget="get.toc">
+      <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
+    </forrest:property>
+    [<forrest:property name="toc" max-depth="2"/>]
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="html" name="nav-section" inputFormat="xsl" body="true" head="false">
+  format="html" name="nav-section" inputFormat="xsl" body="true" head="true">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-		  
-		  <xsl:template name="nav-section-body">
+      <xsl:template name="nav-section-head">
+          <script type="text/javascript" language="javascript"
+              src="{$root}themes/menu.js">&#160;</script>
+      </xsl:template>
+
+      <xsl:template name="nav-section-body">
         <xsl:param name="nav-section" select="'test'"/>
+        <xsl:param name="nav-section-toc" select="'test'"/>
+        <xsl:param name="toc" select="'noToc'"/>
 <xsl:comment>+
     |start menu
     +</xsl:comment>
-            <xsl:if test="$nav-section/navigation/menu/div[@id='menu']/ul/li">
-              <xsl:call-template name="menu">
-                <xsl:with-param name="root" select="$nav-section/navigation/menu"/>
-              </xsl:call-template>
-            </xsl:if>
+        <xsl:variable name="max-depth">
+          <xsl:choose>
+            <xsl:when test="$toc = 'noToc'">0</xsl:when>
+            <xsl:otherwise><xsl:value-of select="$toc/@max-depth"/></xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:if test="$nav-section/navigation/menu/div[@id='menu']/ul/li">
+          <xsl:call-template name="menu">
+            <xsl:with-param name="root" select="$nav-section/navigation/menu"/>
+            <xsl:with-param name="nav-section-toc" select="$nav-section-toc"/>
+            <xsl:with-param name="max-depth" select="$max-depth"/>
+          </xsl:call-template>
+        </xsl:if>
 <xsl:comment>+
     |end menu
     +</xsl:comment>
-		  </xsl:template>
+      </xsl:template>
       <xsl:template name="menu">
         <xsl:param name="root" value="'test'"/>
+        <xsl:param name="nav-section-toc" value="'test'"/>
+        <xsl:param name="max-depth" value="0"/>
 <xsl:comment>+
     |start Menu
     +</xsl:comment>
-   	<div id="nav-section">
-			<ul>
-<!--menu - inner-->	
-        <xsl:for-each select = "$root/div[@id='menu']/ul/li">
-          <xsl:call-template name = "innermenuli" >
-              <xsl:with-param name="id" select="concat('1.', position())"/>
-          </xsl:call-template>
-        </xsl:for-each>
-			</ul>
-		</div>
-	</xsl:template>  
-  
-  <xsl:template name="innermenuli">   
-    <xsl:param name="id"/>
-    <xsl:variable name="tagid">
-      <xsl:choose>
-        <xsl:when test="descendant-or-self::node()/li/div/@class='current'"><xsl:value-of select="concat('menu_selected_',$id)"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="concat('menu_',concat(font,$id))"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="whichGroup">
-      <xsl:choose>
-        <xsl:when test="descendant-or-self::node()/li/div/@class='current'">currentmenuitemgroup</xsl:when>
-        <xsl:otherwise>menuitemgroup</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    
-    <li class="pagegroup"><strong><xsl:value-of select="h1"/></strong>
-      <ul>
-        <xsl:for-each select= "ul/li">
+        <div id="nav-section">
+          <ul>
+<!--menu - inner-->
+            <xsl:for-each select = "$root/div[@id='menu']/ul/li">
+              <xsl:call-template name = "innermenuli" >
+                <xsl:with-param name="id" select="concat('1.', position())"/>
+                <xsl:with-param name="nav-section-toc" select="$nav-section-toc"/>
+                <xsl:with-param name="max-depth" select="$max-depth"/>
+              </xsl:call-template>
+            </xsl:for-each>
+          </ul>
+        </div>
+      </xsl:template>
 
+      <xsl:template name="innermenuli">
+        <xsl:param name="id"/>
+        <xsl:param name="nav-section-toc"/>
+        <xsl:param name="max-depth"/>
+        <xsl:variable name="tagid">
           <xsl:choose>
-            <xsl:when test="a">
-              <li><a href="{a/@href}"><xsl:value-of select="a" /></a></li>
-            </xsl:when>
-            <xsl:when test="div/@class='current'">
-              <li class="menupage">
-                <div class="menupagetitle"><xsl:value-of select="div" /></div>
-                <xsl:if test="$config/toc/@max-depth&gt;0 and contains($minitoc-location,'menu')">
-                  <li class="menupageitemgroup">
-                      <xsl:for-each select = "//tocitems/tocitem">
-                        <div class="menupageitem">
-                          <xsl:choose>
-                            <xsl:when test="string-length(@title)>15">
-                              <a href="{@href}" title="{normalize-space(@title)}"><xsl:value-of select="substring(normalize-space(@title),0,20)" />...</a>
-                            </xsl:when>
-                            <xsl:otherwise>
-                              <a href="{@href}" title="{normalize-space(@title)}"><xsl:value-of select="normalize-space(@title)" /></a>
-                            </xsl:otherwise>
-                          </xsl:choose>
-                        </div>
-                      </xsl:for-each>
-                  </li>
-                </xsl:if>
-              </li>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name = "innermenuli">
-                 <xsl:with-param name="id" select="concat($id, '.', position())"/>
-              </xsl:call-template>
-            </xsl:otherwise>
+            <xsl:when test="descendant-or-self::node()/li/div/@class='current'"><xsl:value-of select="concat('menu_selected_',$id)"/></xsl:when>
+            <xsl:otherwise><xsl:value-of select="concat('menu_',concat(font,$id))"/></xsl:otherwise>
           </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="selected">
+          <xsl:choose>
+            <xsl:when test="descendant-or-self::node()/li/div/@class='current'">selected</xsl:when>
+            <xsl:otherwise></xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <li class="pagegroup{$selected}" id="{$tagid}Title"><span onclick="SwitchMenu('{$tagid}')"><xsl:value-of select="h1"/></span>
+          <ul class="{$selected}menuitemgroup" id="{$tagid}">
+            <xsl:for-each select= "ul/li">
+
+              <xsl:choose>
+                <xsl:when test="a">
+                  <li class="menuitem"><a href="{a/@href}" title="{a/@title}"><xsl:value-of select="a" /></a></li>
+                </xsl:when>
+                <xsl:when test="div/@class='current'">
+                  <li class="menupage">
+                    <div class="menupagetitle"><xsl:value-of select="div" /></div>
+                    <xsl:if test="$max-depth&gt;0">
+                      <ul>
+                        <li class="menupageitemgroup">
+                          <xsl:for-each select = "$nav-section-toc//tocitems/tocitem">
+                            <div class="menupageitem">
+                              <xsl:choose>
+                                <xsl:when test="string-length(normalize-space(@title))>15">
+                                  <a href="{@href}" title="{normalize-space(@title)}"><xsl:value-of
+                                    select="substring(@title,0,20)" />...</a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                  <a href="{@href}" title="{normalize-space(@title)}">
+                                    <xsl:value-of select="@title" />
+                                  </a>
+                                </xsl:otherwise>
+                              </xsl:choose>
+                            </div>
+                          </xsl:for-each>
+                        </li>
+                      </ul>
+                    </xsl:if>
+                  </li>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:call-template name = "innermenuli">
+                     <xsl:with-param name="id" select="concat($id, '.', position())"/>
+                     <xsl:with-param name="nav-section-toc" select="$nav-section-toc"/>
+                     <xsl:with-param name="max-depth" select="$max-depth"/>
+                  </xsl:call-template>
+                </xsl:otherwise>
+              </xsl:choose>
 
-        </xsl:for-each>
-      </ul></li>
-  		</xsl:template>
-		</xsl:stylesheet>
-	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+            </xsl:for-each>
+          </ul>
+        </li>
+      </xsl:template>
+    </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/search-input.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/search-input.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/search-input.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/search-input.ft Mon Nov  7 11:14:22 2005
@@ -25,6 +25,7 @@
   </description>
   <usage><![CDATA[<forrest:contract name="search-input">
   <forrest:properties contract="search-input">
+    <forrest:property name="search-lucene">lucene-search.html</forrest:property>
     <forrest:property name="search-input">
       <search name="MyProject" domain="mydomain" provider="google"/>
     </forrest:property>
@@ -40,6 +41,7 @@
 		  <!--FIXME: IMO each search provider should provide a form. This form should be refactored into
         a meta-search from-->
 		  <xsl:template name="search-input-body">
+        <xsl:param name="search-lucene" select="'lucene-search.html'"/>
         <xsl:param name="search-input"/>
 <xsl:comment>+
     |start Search
@@ -48,7 +50,7 @@
              <xsl:choose>
               <xsl:when test="$search-input/search/@provider = 'lucene'">
                 <!-- Lucene search -->
-                <form method="get" action="{$root}{$lucene-search}">
+                <form method="get" action="{$root}{$search-lucene}">
                   <div id="search-field"> <input type="text" id="query" 
                     name="queryString" size="25" 
                     value="Search the site with {$search-input/search/@provider}:" 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-credits.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-credits.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-credits.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-credits.ft Mon Nov  7 11:14:22 2005
@@ -29,7 +29,7 @@
         <credit>
           <name>Built with Apache Forrest</name>
           <url>http://forrest.apache.org/</url>
-          <image>images/built-with-forrest-button.png</image>
+          <image>themes/images/built-with-forrest-button.png</image>
           <width>88</width>
           <height>31</height>
         </credit>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-feedback-dyn.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-feedback-dyn.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-feedback-dyn.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/siteinfo-feedback-dyn.ft Mon Nov  7 11:14:22 2005
@@ -49,7 +49,7 @@
 	          </a>
 	        </xsl:when>
 	        <xsl:otherwise>
-	          <xsl:value-of select="$config/feedback/@to"/>
+	          <xsl:value-of select="$siteinfo-feedback-dyn-config/@to"/>
 	        </xsl:otherwise>
 	      </xsl:choose>
 			</xsl:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt.fv?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt.fv Mon Nov  7 11:14:22 2005
@@ -380,7 +380,7 @@
           </forrest:hook>-->
           <forrest:contract name="content-title">
             <forrest:properties contract="content-title">
-              <forrest:property name="content-title" nugget="get.body">
+              <forrest:property name="content-title" nugget="get.title">
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.title.xml"/>
               </forrest:property>
             </forrest:properties>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css Mon Nov  7 11:14:22 2005
@@ -31,8 +31,8 @@
     position: relative;
     border-bottom: solid 1px black;
     border-top: solid 1px black;
-    padding: 0px 180px;
-//    font-size: 75%;
+    padding: 0px 200px;
+/*    font-size: 75%;*/
     z-index:10;
 }
 
@@ -102,7 +102,7 @@
     position: relative;
     float: left;
     width: 100%;
-    background: url("../skin/images/header_white_line.gif") repeat-x bottom;
+    background: url("../themes/images/header_white_line.gif") repeat-x bottom;
 }
 
 /* branding-logo Template */
@@ -130,9 +130,36 @@
     padding: 5px 10px;
 }
 
-#header .round-top-left-small {background: url(../skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png) 0 0 no-repeat} 
-#header .round-top-right-small {background: url(../skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png) 100% 0 no-repeat}
-
+#header .round-top-left-small {
+  background-repeat: no-repeat;
+  background-position: top left;
+  background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  } 
+#header .round-top-right-small {
+  background-repeat: no-repeat;
+  background-position: top right;
+  background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  }
+.round-bottom-left-small {
+  background-repeat: no-repeat;
+  background-position: bottom left;
+  background-image: url(../themes/images/roundcorner-b-l-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  } 
+.round-bottom-right-small {
+  background-repeat: no-repeat;
+  background-position: bottom right;
+  background-image: url(../themes/images/roundcorner-b-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  }
+.round-bottom-left-big {
+  background-repeat: no-repeat;
+  background-position: bottom left;
+  background-image: url(../themes/images/roundcorner-b-l-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  } 
+.round-bottom-right-big {
+  background-repeat: no-repeat;
+  background-position: bottom right;
+  background-image: url(../themes/images/roundcorner-b-r-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  }
 .search-input input {
     font-size: 100%;
 }
@@ -147,11 +174,10 @@
     margin: 0;
     list-style: none;
 }
-/*    background: #CFDCED url("../skin/images/tab-right.gif") no-repeat right top;*/
 
 #nav-main li {
     float: left;
-    background-image: url(../skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png);
+    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeF5F4E9-fgF5F4E9.png);
     background-repeat: no-repeat;
     background-position: top right;
     background-color: #F5F4E9;
@@ -159,7 +185,6 @@
     padding: 0;
 }
 
-/*background: url("../skin/images/tab-left.gif") no-repeat left top;*/
 #nav-main li a {
     float: left;
     display: block;
@@ -167,7 +192,7 @@
     text-decoration: none;
     color: black;
     white-space: nowrap;
-    background-image: url(../skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png);
+    background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-strokeF5F4E9-fgF5F4E9.png);
     background-repeat: no-repeat;
     background-position: top left;
     padding: 5px 15px 4px;
@@ -185,7 +210,7 @@
 
 #nav-main .current {
     background-color: #E5E4D9;
-    background-image: url(../skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png);
+    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
@@ -193,7 +218,7 @@
     font-weight: bold;
     padding-bottom: 5px;
     color: #000000;
-    background-image: url(../skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png);
+    background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
     background-repeat: no-repeat;
     background-position: top left;
 }
@@ -217,13 +242,15 @@
 }
 
 #level2tabs {
+    color: #000000;
     margin: 0;
     float:left;
     position:relative;
-    background-color: #4A6D8C ;
+    /*background-color: #4A6D8C ;*/
 }
-#level2tabs a:link {  color: #0F3660; }
-#level2tabs a:visited { color: #CFDCED; }
+#level2tabs a{padding-right: 5px;}
+#level2tabs a:link {  color: #000000; }
+#level2tabs a:visited {  color: #000000; }
 #level2tabs a:hover { color: #000066; }
 /*
 *    border-top: solid #4C6C8F 15px;
@@ -238,17 +265,23 @@
 * Round corner
 */
 #roundtop {
-    background-image: url(../skin/images/rc-t-r-15-1body-2menu-3menu.png);
+    background-image: url(../themes/images/roundcorner-t-r-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
 
 #roundbottom {
-    background-image: url(../skin/images/rc-b-r-15-1body-2menu-3menu.png);
+    background-image: url(../themes/images/roundcorner-b-r-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
 
+#roundbottomLeft {
+    background-image: url(../themes/images/roundcorner-b-l-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-repeat: no-repeat;
+    background-position: bottom left;
+}
+
 img.corner {
    width: 15px;
    height: 15px;
@@ -257,13 +290,13 @@
 }
 
 .roundtopsmall {
-    background-image: url(../skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png);
+    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
 
 #roundbottomsmall {
-    background-image: url(../skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png);
+    background-image: url(../themes/images/roundcorner-b-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
@@ -322,15 +355,15 @@
         font-weight : bold;
 }
 .pagegroup span {
-        background-image: url('../skin/images/chapter.gif');
+        background-image: url('../themes/images/chapter.gif');
         color: #000000;
 }
 .pagegroupselected span {
-        background-image: url('../skin/images/chapter_open.gif');
+        background-image: url('../themes/images/chapter_open.gif');
         color: #000000;
 }
 .pagegroupopen span {
-        background-image: url('../skin/images/chapter_open.gif');
+        background-image: url('../themes/images/chapter_open.gif');
         color: #000000;
 }
 
@@ -355,7 +388,7 @@
 
 #nav-section .menuitem {
         padding: 0px 0px 2px 12px;
-        background-image: url('../skin/images/page.gif');
+        background-image: url('../themes/images/page.gif');
         background-repeat: no-repeat;
         background-position: center left;
         font-weight : normal;
@@ -365,7 +398,7 @@
 #nav-section .menupage {
         margin: 5px 0px 5px 10px;
         padding: 0px 3px 0px 12px;
-        background-image: url('../skin/images/current.gif');
+        background-image: url('../themes/images/current.gif');
         background-repeat: no-repeat;
         background-position: top left;
         font-style : normal;
@@ -531,7 +564,7 @@
 #content-minitoc-area a:hover   { border: 0px solid #a5b6c6; background: #CFDCED; }
 
 .minitoc {
-    list-style-image: url('../skin/images/current.gif');
+    list-style-image: url('../themes/images/current.gif');
     font-weight: normal;
 }
 
@@ -579,7 +612,7 @@
 
 p.instruction {
   display: list-item;
-  list-style-image: url('../skin/images/instruction_arrow.png');
+  list-style-image: url('../themes/images/instruction_arrow.png');
   list-style-position: outside;
   margin-left: 2em;
 } 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/branding-theme-profiler.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/branding-theme-profiler.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/branding-theme-profiler.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/branding-theme-profiler.ft Mon Nov  7 11:14:22 2005
@@ -112,9 +112,74 @@
           <xsl:param name="branding-theme-profiler"/>
           <xsl:param name="branding-theme-profiler-theme"/>
           <style type="text/css" media="screen" title="{$branding-theme-profiler-theme}" rel="alternate stylesheet" >
-            <xsl:apply-templates select="$branding-theme-profiler/color"/>
-          </style>
-        </xsl:template>
+    <!-- ==================== corner image colors ========================= -->
+    <!--FIXME: Add default values! 
+      If not it can result in 
+      <link message="http://localhost/:-1
+The attribute "rx of the element ><ellipse> can not be negative" uri="themes/images/roundcorner-t-l-5-bg003366-stroke-fg.png">
+    <referrer uri="samples/index.html"/>
+  </link>
+      Maybe like:
+      -->
+    <xsl:variable name="header-input" select="substring-after($branding-theme-profiler/color[@name='header']/@value, '#')"/>
+    <xsl:variable name="header">
+      <xsl:if test="$header-input=''">000000</xsl:if>
+      <xsl:if test="not($header-input='')"><xsl:value-of select="$header-input"/></xsl:if>
+    </xsl:variable>
+    <xsl:variable name="searchbox-input" select="substring-after($branding-theme-profiler/color[@name='searchbox']/@value, '#')"/>
+    <xsl:variable name="searchbox">
+      <xsl:if test="$searchbox-input=''">000000</xsl:if>
+      <xsl:if test="not($searchbox-input='')"><xsl:value-of select="$searchbox-input"/></xsl:if>
+    </xsl:variable>
+     
+    <xsl:variable name="tab-selected" select="substring-after($branding-theme-profiler/color[@name='tab-selected']/@value, '#')"/>
+    <xsl:variable name="tab-unselected" select="substring-after($branding-theme-profiler/color[@name='tab-unselected']/@value, '#')"/>
+    <xsl:variable name="body" select="substring-after($branding-theme-profiler/color[@name='body']/@value, '#')"/>
+    <xsl:variable name="menu" select="substring-after($branding-theme-profiler/color[@name='menu']/@value, '#')"/>
+#header .round-top-left-small {
+    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-l-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($searchbox)"/>-fg<xsl:value-of select="normalize-space($searchbox)"/>.png);
+    background-repeat: no-repeat;
+    background-position: top left;
+}
+#header .round-top-right-small {
+    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-r-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($searchbox)"/>-fg<xsl:value-of select="normalize-space($searchbox)"/>.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+}
+#nav-main li {
+    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-r-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($tab-unselected)"/>-fg<xsl:value-of select="normalize-space($tab-unselected)"/>.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+}
+#nav-main li a {
+    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-l-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($tab-unselected)"/>-fg<xsl:value-of select="normalize-space($tab-unselected)"/>.png);
+    background-repeat: no-repeat;
+    background-position: top left;
+}
+#nav-main .current {
+    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-r-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($tab-selected)"/>-fg<xsl:value-of select="normalize-space($tab-selected)"/>.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+}
+#nav-main .current a {
+    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-l-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($tab-selected)"/>-fg<xsl:value-of select="normalize-space($tab-selected)"/>.png);
+    background-repeat: no-repeat;
+    background-position: top left;
+}
+#roundbottom {
+    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-b-r-15-bg<xsl:value-of select="normalize-space($body)"/>-stroke<xsl:value-of select="normalize-space($menu)"/>-fg<xsl:value-of select="normalize-space($menu)"/>.png);
+    background-repeat: no-repeat;
+    background-position: bottom right;
+}
+#roundbottomLeft {
+    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-b-l-15-bg<xsl:value-of select="normalize-space($body)"/>-stroke<xsl:value-of select="normalize-space($menu)"/>-fg<xsl:value-of select="normalize-space($menu)"/>.png);
+    background-repeat: no-repeat;
+    background-position: bottom left;
+}
+    <xsl:apply-templates select="$branding-theme-profiler/color"/>
+  </style> 
+</xsl:template>
+
         <!-- ==================== main block colors ============================ -->
 <xsl:template match="color[@name='header']">
 #container          { background-color: <xsl:value-of select="@value"/>;}  

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-main-sub.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-main-sub.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-main-sub.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-main-sub.ft Mon Nov  7 11:14:22 2005
@@ -40,7 +40,7 @@
     <!-- FIXME - Suppress the following test when empty div problem is solved -->
   <xsl:if test="$nav-main-sub/navigation/tab/div[@id='nav-main-sub']/*">
     <div id="level2tabs">
-      <xsl:apply-templates 
+      <xsl:copy-of
         select="$nav-main-sub/navigation/tab/div[@id='nav-main-sub']/*"/>
     </div>
   </xsl:if>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section-round-bottom.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section-round-bottom.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section-round-bottom.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section-round-bottom.ft Mon Nov  7 11:14:22 2005
@@ -28,10 +28,7 @@
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="nav-section-round-bottom-body">
   <div id="roundbottom">
-    <img 
-      src="{$skin-img-dir}/rc-b-l-15-1body-2menu-3menu.png" 
-      alt="" width="15" height="15" class="corner" 
-      style="display: none" />
+    <div id="roundbottomLeft"><img  src="{$skin-img-dir}/spacer.gif" alt="spacer" /></div>
   </div>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft?rev=331581&r1=331580&r2=331581&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft Mon Nov  7 11:14:22 2005
@@ -22,6 +22,7 @@
   </description>
   <usage><![CDATA[<forrest:contract name="search-input">
   <forrest:properties contract="search-input">
+   <forrest:property name="search-lucene">lucene-search.html</forrest:property>
    <forrest:property name="input-size">25</forrest:property>
    <forrest:property name="search-input">
       <search name="MyProject" domain="mydomain" provider="google"/>
@@ -42,6 +43,7 @@
       </xsl:template>
 
       <xsl:template name="search-input-body">
+        <xsl:param name="search-lucene" select="'lucene-search.html'"/>
         <xsl:param name="input-size">25</xsl:param>
         <xsl:param name="search-input"/>
 <xsl:comment>+ 
@@ -61,7 +63,7 @@
                   <xsl:choose>
                     <xsl:when test="$search-input/search/@provider = 'lucene'">
                       <xsl:value-of select="$root"/>
-                      <xsl:value-of select="$lucene-search"/>
+                      <xsl:value-of select="$search-lucene"/>
                     </xsl:when>
                     <xsl:otherwise>http://www.google.com/search</xsl:otherwise>
                   </xsl:choose>



Mime
View raw message