You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2005/10/24 10:32:34 UTC
svn commit: r327990 - in /forrest/trunk/main/template-sites/v2: ./
src/documentation/content/xdocs/ src/documentation/content/xdocs/samples/
src/documentation/resources/templates/ src/documentation/resources/themes/
Author: thorsten
Date: Mon Oct 24 01:32:14 2005
New Revision: 327990
URL: http://svn.apache.org/viewcvs?rev=327990&view=rev
Log:
Updated the v2 target to meet new themes location. As well move the sample page to a direectory on it own to test subdirs.
Added:
forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/
forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.fv
forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.xml (with props)
forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/
- copied from r327684, forrest/trunk/main/template-sites/v2/src/documentation/resources/templates/
Removed:
forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples.fv
forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples.xml
forrest/trunk/main/template-sites/v2/src/documentation/resources/templates/
Modified:
forrest/trunk/main/template-sites/v2/forrest.properties
forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/site.xml
forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/tabs.xml
Modified: forrest/trunk/main/template-sites/v2/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/forrest.properties?rev=327990&r1=327989&r2=327990&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v2/forrest.properties (original)
+++ forrest/trunk/main/template-sites/v2/forrest.properties Mon Oct 24 01:32:14 2005
@@ -72,6 +72,9 @@
#project.themer=${forrest.home}/build/plugins/org.apache.forrest.plugin.output.themer
#project.stucturer=${forrest.home}/build/plugins/org.apache.forrest.plugin.internal.structurer
+# theme-dir this overtakes the functionality of the former skins-dir
+#project.theme-dir=${project.resources-dir}/themes
+
# Descriptors for plugins
# comma separated list, file:// is supported
#forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.xml
Added: forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.fv?rev=327990&view=auto
==============================================================================
--- forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.fv (added)
+++ forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.fv Mon Oct 24 01:32:14 2005
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2005 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.
+-->
+
+<forrest:views
+ xmlns:forrest="http://apache.org/forrest/templates/1.0"
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+ <forrest:view type="html">
+ <forrest:css url="default.css" media="screen" rel="alternate stylesheet" theme="default"/>
+ <forrest:css url="leather-dev.css" media="screen" rel="alternate stylesheet" theme="default"/>
+ <forrest:css url="pelt.basic.css" media="screen" theme="Pelt"/>
+ <forrest:css url="pelt.screen.css" media="screen" theme="Pelt"/>
+ <forrest:css url="pelt.print.css" media="print"/>
+ <forrest:contract name="siteinfo-meta">
+ <forrest:properties contract="siteinfo-meta">
+ <forrest:property name="siteinfo-meta" nugget="get.build.info">
+ <jx:import uri="cocoon://build-info"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="siteinfo-meta-navigation"/>
+ <!-- FIXME - Cocoon problem with favicon.ico -->
+ <!--<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:contract>-->
+
+ <forrest:hook name="container">
+ <forrest:contract name="helper-prototype-ajax"/>
+ <forrest:contract name="branding-breadcrumbs">
+ <forrest:properties contract="branding-breadcrumbs">
+ <forrest:property name="branding-breadcrumbs">
+ <trail>
+ <link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
+ <link2 name="Plugins" href="http://forrest.apache.org/docs/plugins/"/>
+ <link3 name="org.apache.forrest.plugin.output.themer" href="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.themer/"/>
+ </trail>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:hook name="header">
+ <forrest:contract name="branding-tagline">
+ <forrest:properties contract="branding-tagline">
+ <forrest:property name="branding-tagline-name">new
+ seed v2</forrest:property>
+ <forrest:property name="branding-tagline-tagline">powered by
+ forrest:views v2</forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:hook class="logo">
+ <forrest:contract name="branding-logo">
+ <forrest:properties contract="branding-logo">
+ <forrest:property name="branding-logo-name">
+ MyGroup</forrest:property>
+ <forrest:property name="branding-logo-description">MyGroup
+ Description</forrest:property>
+ <forrest:property name="branding-logo-url">
+ http://mygroup.org/</forrest:property>
+ <forrest:property name="branding-logo-logo">
+ images/group.png</forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ </forrest:hook>
+ <forrest:hook class="logo">
+ <forrest:contract name="branding-logo">
+ <forrest:properties contract="branding-logo">
+ <forrest:property name="branding-logo-name">
+ MyProject</forrest:property>
+ <forrest:property name="branding-logo-description">MyProject
+ Description</forrest:property>
+ <forrest:property name="branding-logo-url">
+ http://myproj.mygroup.org/</forrest:property>
+ <forrest:property name="branding-logo-logo">
+ images/project.png</forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ </forrest:hook>
+ <forrest:contract name="search-input">
+ <forrest:properties contract="search-input">
+ <forrest:property name="input-size">25</forrest:property>
+ <forrest:property name="search-input">
+ <search name="MyProject" domain="mydomain" provider="google"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:hook name="nav-main-hook">
+ <forrest:contract name="nav-main">
+ <forrest:properties contract="nav-main">
+ <forrest:property name="nav-main" nugget="get.navigation">
+ <jx:import uri="cocoon://${cocoon.parameters.getRequest}.navigation.xml"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:hook name="publishedStrip">
+ <forrest:contract name="nav-main-sub">
+ <forrest:properties contract="nav-main-sub">
+ <forrest:property name="nav-main-sub" nugget="get.navigation">
+ <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.navigation.xml"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="siteinfo-current-time"/>
+ </forrest:hook>
+ </forrest:hook>
+ </forrest:hook>
+ <forrest:hook name="page">
+ <forrest:contract name="branding-breadcrumbs">
+ <forrest:properties contract="branding-breadcrumbs">
+ <forrest:property name="branding-breadcrumbs">
+ <trail>
+ <link1 name="myGroup" href="http://www.apache.org/"/>
+ <link2 name="myProject" href="http://forrest.apache.org/"/>
+ <link3 name="" href=""/>
+ </trail>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:hook name="leftbar">
+ <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"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="genericMarkup">
+ <forrest:properties contract="genericMarkup">
+ <forrest:property name="genericMarkup">
+ <hr/>
+ </forrest:property>
+ </forrest:properties>
+ </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:contract>
+ <forrest:contract name="siteinfo-credits">
+ <forrest:properties contract="siteinfo-credits">
+ <forrest:property name="box-location">credit</forrest:property>
+ <forrest:property name="top-separator">true</forrest:property>
+ <forrest:property name="siteinfo-credits">
+ <credits>
+ <credit>
+ <name>Built with Apache Forrest</name>
+ <url>http://forrest.apache.org/</url>
+ <image>images/built-with-forrest-button.png</image>
+ <width>88</width>
+ <height>31</height>
+ </credit>
+ </credits>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="genericMarkup">
+ <forrest:properties contract="genericMarkup">
+ <forrest:property name="genericMarkup">
+ <hr/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="content-motd-page">
+ <forrest:properties contract="content-motd-page">
+ <forrest:property name="content-motd-page">
+ <motd>
+ <motd-option pattern="index.html">
+ <motd-title>sample</motd-title>
+ <motd-page location="both">
+ This is an example of a Message of the day (MOTD).
+ </motd-page>
+ <motd-page-url>index.html</motd-page-url>
+ </motd-option>
+ <motd-option pattern="samples/faq.html">
+ <motd-title></motd-title>
+ <motd-page location="both">
+ How to enable this MOTD is on this page.
+ </motd-page>
+ <motd-page-url>#motd</motd-page-url>
+ </motd-option>
+ </motd>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="nav-section-round-bottom"/>
+ </forrest:hook>
+ <jx:import uri="cocoon://prepare.tiles.export-link"/>
+ <forrest:hook name="content">
+ <!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between Pelt and Leather-dev... -->
+ <!--<forrest:hook class="trail">
+ <forrest:contract name="branding-fontsize"/>
+ </forrest:hook>-->
+ <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}.title.xml"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="content-abstract">
+ <forrest:properties contract="content-abstract">
+ <forrest:property name="content-abstract" nugget="get.abstract">
+ <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.abstract.xml"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="content-minitoc">
+ <forrest:properties contract="content-minitoc">
+ <forrest:property name="content-minitoc-toc" nugget="get.toc">
+ <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
+ </forrest:property>
+ <forrest:property name="content-minitoc-conf" >
+ <toc max-depth="2"
+ min-sections="1" location="page"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="content-main">
+ <forrest:properties contract="content-main">
+ <forrest:property name="content-main" nugget="get.body">
+ <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.body.xml"/>
+ </forrest:property>
+ <forrest:property name="content-main-conf">
+ <headings type="underlined"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="ajax-example"/>
+ <forrest:contract name="content-authors">
+ <forrest:properties contract="content-authors">
+ <forrest:property name="content-authors" nugget="get.authors">
+ <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.authors.xml"/>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ </forrest:hook>
+ </forrest:hook>
+ <forrest:hook name="footer">
+ <forrest:hook class="lastmodified">
+ <forrest:contract name="siteinfo-last-published"/>
+ </forrest:hook>
+ <forrest:hook class="copyright">
+ <forrest:contract name="siteinfo-copyright">
+ <forrest:properties contract="siteinfo-copyright">
+ <forrest:property name="siteinfo-copyright">
+ <copyright>
+ <year>2005</year>
+ <vendor>The Acme Software Foundation.</vendor>
+ </copyright>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ </forrest:hook>
+ <!--FIXME thorsten turned this off while developing (no internet connection)
+ <forrest:contract name="siteinfo-compliance-links"/>-->
+ <forrest:contract name="siteinfo-credits">
+ <forrest:properties contract="siteinfo-credits">
+ <forrest:property name="box-location">credit</forrest:property>
+ <forrest:property name="top-separator">true</forrest:property>
+ <forrest:property name="siteinfo-credits">
+ <credits>
+ <credit>
+ <name>Built with Apache Forrest</name>
+ <url>http://forrest.apache.org/</url>
+ <image>images/built-with-forrest-button.png</image>
+ <width>88</width>
+ <height>31</height>
+ </credit>
+ </credits>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ <forrest:contract name="siteinfo-feedback">
+ <forrest:properties contract="siteinfo-feedback">
+ <forrest:property name="siteinfo-feedback">
+ <feedback to="webmaster@foo.com"
+ href="mailto:webmaster@foo.com?subject=Feedback " >
+ Send feedback about the website to:
+ </feedback>
+ </forrest:property>
+ </forrest:properties>
+ </forrest:contract>
+ </forrest:hook>
+ </forrest:hook>
+ </forrest:view>
+</forrest:views>
+
Added: forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.xml?rev=327990&view=auto
==============================================================================
--- forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.xml (added)
+++ forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.xml Mon Oct 24 01:32:14 2005
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2005 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.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+ <header>
+ <title>sample page</title>
+ </header>
+ <body>
+ <section id="overview">
+ <title>samples</title>
+ <p>This page shows some example contracts.</p>
+ </section>
+ </body>
+</document>
Propchange: forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/site.xml?rev=327990&r1=327989&r2=327990&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/site.xml Mon Oct 24 01:32:14 2005
@@ -40,8 +40,10 @@
<index label="Index" href="index.html" description="Welcome to MyProj"/>
<ls.contracts label="ls.contracts" href="ls.contracts.html"
description="All contracts that you can use in your project"/>
- <sample label="samples" href="samples.html" description="Some samples around v2"/>
</about>
+ <samples label="Samples" tab="samples">
+ <sample label="Overview" href="index.html" description="Some samples around v2"/>
+ </samples>
<external-refs>
<forrest href="http://forrest.apache.org/">
Modified: forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/tabs.xml?rev=327990&r1=327989&r2=327990&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/tabs.xml Mon Oct 24 01:32:14 2005
@@ -34,6 +34,7 @@
-->
<tab id="home" label="Home" dir="" indexfile="index.html"/>
+ <tab label="Samples" dir="samples/" indexfile="index.html"/>
<!-- Add new tabs here, eg:
<tab label="How-Tos" dir="community/howto/"/>
<tab label="XML Site" dir="xml-site/"/>