You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by fe...@apache.org on 2008/02/16 03:19:31 UTC
svn commit: r628226 [5/5] - in /forrest/branches/UpdateFOPto094: ./ bin/
main/fresh-site/ main/fresh-site/src/documentation/
main/fresh-site/src/documentation/content/xdocs/
main/fresh-site/src/documentation/content/xdocs/samples-a/
main/fresh-site/src...
Modified: forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.ft
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.ft?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.ft (original)
+++ forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.ft Fri Feb 15 18:19:17 2008
@@ -72,6 +72,7 @@
<![CDATA[<forrest:contract name="branding-css-links">
<forrest:property name="branding-css-links-input">
<css url="common.css"/>
+ <css if="IE 7" .../>
<css .../>
</forrest:property>
</forrest:contract>]]>
@@ -94,7 +95,21 @@
</xsl:template>
<xsl:template
match="css[@url]">
- <xsl:copy-of select="@rel"/><link type="text/css">
+ <xsl:variable name="if" select="@if"/>
+ <xsl:choose>
+ <xsl:when test="$if">
+ <xsl:comment>[if <xsl:value-of select="$if"/>]><xsl:call-template name="printLinkText"/>
+
+ <![endif]</xsl:comment>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="printLink"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+ <xsl:template name="printLink">
+
+ <link type="text/css">
<xsl:choose>
<xsl:when test="@rel">
<xsl:attribute name="rel">
@@ -103,6 +118,7 @@
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="rel">stylesheet</xsl:attribute>
+
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
@@ -112,6 +128,7 @@
</xsl:attribute>
</xsl:when>
<xsl:otherwise>
+
<xsl:attribute name="title">
<xsl:value-of select="concat( translate( substring($theme, 1, 1), 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'), substring($theme,2))"/>
</xsl:attribute>
@@ -121,6 +138,7 @@
<xsl:choose>
<xsl:when test="@prefix">
<xsl:value-of select="@prefix"/>
+
</xsl:when>
<xsl:otherwise>
themes/
@@ -132,6 +150,7 @@
select="$root"/>
<xsl:value-of
select="normalize-space($prefix)"/>
+
<xsl:value-of
select="@url"/>
</xsl:attribute>
@@ -141,9 +160,38 @@
</xsl:attribute>
</xsl:if></link>
</xsl:template>
+ <xsl:template name="printLinkText">
+
+ <xsl:variable name="out">
+ <xsl:choose>
+ <xsl:when test="@rel"> rel="<xsl:value-of select="@rel"/>" </xsl:when>
+ <xsl:otherwise> rel="stylesheet" </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+
+ <xsl:when test="@theme"> title="<xsl:value-of select="@theme"/>" </xsl:when>
+ <xsl:otherwise> title="<xsl:value-of
+ select="concat( translate( substring($theme, 1, 1), 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'), substring($theme,2))"/>
+ " </xsl:otherwise>
+ </xsl:choose>
+ <xsl:variable name="prefix">
+ <xsl:choose>
+
+ <xsl:when test="@prefix">
+ <xsl:value-of select="@prefix"/>
+ </xsl:when>
+ <xsl:otherwise> themes/ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable> href="<xsl:value-of select="$root"/>
+ <xsl:value-of select="normalize-space($prefix)"/>
+
+ <xsl:value-of select="@url"/>
+ <xsl:if test="@media">" media="<xsl:value-of select="@media"/>" </xsl:if> </xsl:variable>
+ <link type="text/css" <xsl:value-of select="normalize-space($out)"/>> </xsl:template>
<xsl:template match="css[not(@url)]">
<style type="text/css">
<xsl:value-of select="."/>
+
</style>
</xsl:template>
</xsl:stylesheet>
Modified: forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv (original)
+++ forrest/branches/UpdateFOPto094/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv Fri Feb 15 18:19:17 2008
@@ -16,7 +16,9 @@
limitations under the License.
-->
<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+ jx:cache-key="#{$cocoon/parameters/getRequest}"
+ jx:cache-validity="${Packages.org.apache.excalibur.source.impl.validity.NOPValidity()}">
<!-- The following variables are used to contact data models and/or contracts. -->
<jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
<jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
@@ -30,6 +32,14 @@
</forrest:view>
<!-- HTML View of the request (e.g. index.html)-->
<forrest:view type="html" hooksXpath="/html/body">
- <jx:import uri="cocoon://prepare.panels.pelt-html"/>
+ <jx:import uri="cocoon://prepare.panels.pelt-html.head"/>
+ <forrest:hook name="container">
+ <jx:import uri="cocoon://prepare.panels.pelt-html.header"/>
+ <forrest:hook name="page">
+ <jx:import uri="cocoon://prepare.panels.pelt-html.leftbar"/>
+ <jx:import uri="cocoon://prepare.panels.pelt-html.content"/>
+ </forrest:hook>
+ <jx:import uri="cocoon://prepare.panels.pelt-html.footer"/>
+ </forrest:hook>
</forrest:view>
</forrest:views>
Modified: forrest/branches/UpdateFOPto094/whiteboard/plugins/whiteboard-plugins.xml
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/whiteboard/plugins/whiteboard-plugins.xml?rev=628226&r1=628225&r2=628226&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/whiteboard/plugins/whiteboard-plugins.xml (original)
+++ forrest/branches/UpdateFOPto094/whiteboard/plugins/whiteboard-plugins.xml Fri Feb 15 18:19:17 2008
@@ -206,6 +206,17 @@
<forrestVersion>0.8</forrestVersion>
</plugin>
+ <plugin name="org.apache.forrest.plugin.input.XDoc"
+ type="input"
+ author="Apache Forrest Project"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.input.XDoc/"
+ url="http://forrest.apache.org/plugins"
+ version="0.1">
+ <description>
+ Input plugin for XDoc
+ </description>
+ <forrestVersion>0.8</forrestVersion>
+ </plugin>
<!-- ================================================================== -->
<!-- Output Plugins -->
@@ -353,6 +364,15 @@
Enable Forrest to use page-specific views and contracts. Next generation
skinning.
</description>
+ <forrestVersion>0.8</forrestVersion>
+ </plugin>
+ <plugin name="org.apache.forrest.plugin.internal.xhtml2" type="internal"
+ author="Apache Forrest Project"
+ website="http://forrest.apache.org/pluginDocs/plugins_0_90/org.apache.forrest.plugin.internal.xhtml2/"
+ url="http://forrest.apache.org/plugins" version="0.1">
+ <description> Forrest versions prior to 0.9 used XDoc as their internal format, versions
+ from 0.9 onwards are going to use a subset of XHTML2 instead. This plugin converts the
+ main forrest sitemaps to work with XHTML2. </description>
<forrestVersion>0.8</forrestVersion>
</plugin>
</plugins>