Author: cdupoirieux
Date: Mon Jan 16 08:32:07 2006
New Revision: 369512
URL: http://svn.apache.org/viewcvs?rev=369512&view=rev
Log:
siteinfo-meta-icon.ft migration,
Add of a favicon.ico,
Add of an abstract for test purpose in index.xml (FOR-787)
Added:
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/favicon.ico
(with props)
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-meta-icon.ft
- copied, changed from r369411,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/siteinfo-meta-icon.ft
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
Added:
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/favicon.ico
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/favicon.ico?rev=369512&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = image/x-icon
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml?rev=369512&r1=369511&r2=369512&view=diff
==============================================================================
---
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/content/xdocs/index.xml
Mon Jan 16 08:32:07 2006
@@ -19,6 +19,7 @@
<document>
<header>
<title>Welcome to dispatcher testing area</title>
+ <abstract>This area is reserved for forrest devs to make some test on
dispatcher v3...</abstract>
</header>
<body>
<section id="overview">
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-meta-icon.ft
(from r369411,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/siteinfo-meta-icon.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-meta-icon.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-meta-icon.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/siteinfo-meta-icon.ft&r1=369411&r2=369512&rev=369512&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/siteinfo-meta-icon.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/siteinfo-meta-icon.ft
Mon Jan 16 08:32:07 2006
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ Copyright 2002-2006 The Apache Software Foundation or its licensors,
as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,41 +17,42 @@
-->
<forrest:contract
xmlns:forrest="http://apache.org/forrest/templates/1.0";
- name="siteinfo-meta-icon"
- type="nugget">
+ name="siteinfo-meta-icon">
+
<description>
- <p><strong>siteinfo-meta-icon</strong> <br/>will output the html
- additional shortcut icon in head element. This icon is generally
+ <p><strong>siteinfo-meta-icon</strong> <br/>will output the html
+ additional shortcut icon in head element. This icon is generally
displayed by browser at the beginning of the URL. </p>
<p>This icon is directly searched in the <code>xdoc</code> directory.</p>
</description>
+
<usage><![CDATA[<forrest:contract name="siteinfo-meta-icon">
- <forrest:properties contract="siteinfo-meta-icon">
- <forrest:property name="siteinfo-meta-icon">
- <favicon-url>favico.ico</favicon-url>
- </forrest:property>
- </forrest:properties>
+ <forrest:property name="siteinfo-meta-icon">
+ <favicon-url>favico.ico</favicon-url>
+ </forrest:property>
</forrest:contract>]]></usage>
- <forrest:template
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
- xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="siteinfo-meta-icon" inputFormat="xsl" body="false"
head="true">
- <xsl:stylesheet version="1.1"
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:template name="siteinfo-meta-icon-head">
+
+ <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
+ name="siteinfo-meta-icon" inputFormat="xsl">
+ <xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+ <xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:param name="siteinfo-meta-icon"/>
-<!--+
- |favicon
- +-->
- <xsl:if test="$siteinfo-meta-icon/favicon-url">
- <link rel="shortcut icon">
- <xsl:attribute name="href">
- <xsl:value-of
- select="concat($root,$siteinfo-meta-icon/favicon-url)"/>
- </xsl:attribute>
- </link>
- </xsl:if>
+ <xsl:variable name="root" select="$defaultVariables/*/[EMAIL
PROTECTED]'root']/@value"/>
+
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part xpath="/html/head">
+ <xsl:comment>+|start favicon +</xsl:comment>
+ <xsl:if test="$siteinfo-meta-icon/favicon-url">
+ <link rel="shortcut icon">
+ <xsl:attribute name="href">
+ <xsl:value-of
select="concat($root,$siteinfo-meta-icon/favicon-url)"/>
+ </xsl:attribute>
+ </link>
+ </xsl:if>
+ <xsl:comment>+|start favicon +</xsl:comment>
+ </forrest:part>
+ </forrest:content>
</xsl:template>
</xsl:stylesheet>
</forrest:template >
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv?rev=369512&r1=369511&r2=369512&view=diff
==============================================================================
---
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
Mon Jan 16 08:32:07 2006
@@ -220,14 +220,12 @@
</forrest:property>
</forrest:properties>
</forrest:contract>
+ -->
<forrest:contract name="siteinfo-meta-icon">
- <forrest:properties contract="siteinfo-meta-icon">
- <forrest:property name="siteinfo-meta-icon">
- <favicon-url></favicon-url>
- </forrest:property>
- </forrest:properties>
+ <forrest:property name="siteinfo-meta-icon">
+ <favicon-url>favicon.ico</favicon-url>
+ </forrest:property>
</forrest:contract>
- -->
<forrest:hook name="container">
<forrest:contract name="branding-breadcrumbs">
