Author: cdupoirieux
Date: Mon Jan 16 03:37:12 2006
New Revision: 369437
URL: http://svn.apache.org/viewcvs?rev=369437&view=rev
Log:
genericMarkup.ftmigration for pelt (FOR-787)
Added:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/genericMarkup.ft
- copied, changed from r369411,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/genericMarkup.ft
Modified:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/pelt.fv
Copied:
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/genericMarkup.ft
(from r369411,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/genericMarkup.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/genericMarkup.ft?p2=forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/genericMarkup.ft&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/genericMarkup.ft&r1=369411&r2=369437&rev=369437&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/common/html/genericMarkup.ft
(original)
+++
forrest/trunk/main/template-sites/v3/src/documentation/resources/themes/common/html/genericMarkup.ft
Mon Jan 16 03:37:12 2006
@@ -15,26 +15,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract
+<forrest:contract
xmlns:forrest="http://apache.org/forrest/templates/1.0";
- name="genericMarkup" type="nugget">
+ name="genericMarkup">
<description>
<p>genericMarkup - Template will output generic markup.</p>
</description>
+
<usage><![CDATA[<forrest:contract name="genericMarkup">
- <forrest:properties contract="genericMarkup">
- <forrest:property name="genericMarkup">
- <hr/>
- </forrest:property>
- </forrest:properties>
+ <forrest:property name="genericMarkup">
+ <hr/>
+ </forrest:property>
</forrest:contract>]]></usage>
+
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="genericMarkup" inputFormat="xsl" body="true"
head="false">
+ name="genericMarkup" inputFormat="xsl">
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:template name="genericMarkup-body">
- <xsl:param name="genericMarkup"/>
- <xsl:copy-of select="$genericMarkup/*"/>
- </xsl:template>
- </xsl:stylesheet>
+ <xsl:param name="genericMarkup"/>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part>
+ <xsl:copy-of select="$genericMarkup/*"/>
+ </forrest:part>
+ </forrest:content>
+ </xsl:template>
+ </xsl:stylesheet>
</forrest:template>
</forrest:contract>
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=369437&r1=369436&r2=369437&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 03:37:12 2006
@@ -313,22 +313,18 @@
<forrest:property name="expanding">true</forrest:property>
<forrest:property name="toc" max-depth="2"/>
</forrest:contract>
- <!--
<forrest:contract name="genericMarkup">
- <forrest:properties contract="genericMarkup">
- <forrest:property name="genericMarkup">
- <hr/>
- </forrest:property>
- </forrest:properties>
+ <forrest:property name="genericMarkup">
+ <hr/>
+ </forrest:property>
</forrest:contract>
<forrest:contract name="search-input">
- <forrest:properties contract="search-input">
- <forrest:property name="input-size">18</forrest:property>
- <forrest:property name="search-input">
- <search name="MyProject" domain="mydomain" provider="google"/>
- </forrest:property>
- </forrest:properties>
+ <forrest:property name="input-size">18</forrest:property>
+ <forrest:property name="search-input">
+ <search name="MyProject" domain="mydomain" provider="google"/>
+ </forrest:property>
</forrest:contract>
+ <!--
<forrest:contract name="siteinfo-credits">
<forrest:properties contract="siteinfo-credits">
<forrest:property name="box-location">credit</forrest:property>
