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 2007/12/26 10:20:17 UTC
svn commit: r606864 - in
/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher:
./ src/documentation/content/xdocs/how/perFolderThemes/subFolder/
src/documentation/resources/structurer/url/how/perFolderThemes/
src/documentatio...
Author: thorsten
Date: Wed Dec 26 01:20:16 2007
New Revision: 606864
URL: http://svn.apache.org/viewvc?rev=606864&view=rev
Log:
Using result of patch FOR-1059 to efficient override some parts of the pelt theme.
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml (with props)
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.xml (with props)
Removed:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/pelt.fv
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt.fv
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/subFolder/index.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/subFolder/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/subFolder/index.xml?rev=606864&r1=606863&r2=606864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/subFolder/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/subFolder/index.xml Wed Dec 26 01:20:16 2007
@@ -23,6 +23,6 @@
</header>
<body>
<p>This file has another customised theme, in this case we have stripped both
- the pdf and the breadcrumb trail.</p>
+ the pdf and the fontsize trail.</p>
</body>
</document>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv?rev=606864&r1=606863&r2=606864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv Wed Dec 26 01:20:16 2007
@@ -30,273 +30,14 @@
</forrest:view>
<!-- HTML View of the request (e.g. index.html)-->
<forrest:view type="html" hooksXpath="/html/body">
- <forrest:contract name="branding-css-links">
-<!-- More information around this contract
- http://marc.theaimsgroup.com/?l=forrest-dev&m=113473237805195&w=2
- -->
-<!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
- <forrest:property name="branding-css-links-input">
- <css url="common.css" media="screen" rel="alternate stylesheet"
- theme="common"/>
- <css url="leather-dev.css" media="screen" rel="alternate stylesheet"
- theme="common"/>
- <css url="pelt.screen.css" media="screen" theme="Pelt"/>
-<!-- You can request url specific css as defined above,
- but beware that you need to use the *.dispatcher.css extension!!!-->
- <css prefix="" url="#{$getRequest}.dispatcher.css" media="screen" theme="Pelt"/>
- <css url="pelt.print.css" media="print"/>
- <css>/* Extra css */
-p.quote {
- margin-left: 2em;
- padding: .5em;
- background-color: #f0f0f0;
- font-family: monospace;
-}</css>
- </forrest:property>
- </forrest:contract>
- <forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
- <forrest:property name="custom">
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
- </forrest:property>
- <forrest:property name="theme" value="pelt"/>
- </forrest:contract>
- <forrest:contract name="siteinfo-meta-navigation"
- dataURI="cocoon://#{$getRequest}.navigation.xml"/>
- <forrest:contract name="siteinfo-meta-icon">
- <forrest:property name="siteinfo-meta-icon">
- <favicon-url>favicon.ico</favicon-url>
- </forrest:property>
- </forrest:contract>
- <forrest:hook name="container">
- <forrest:hook name="header">
- <forrest:contract name="branding-tagline">
- <forrest:property name="branding-tagline-name">new
- seed</forrest:property>
- <forrest:property name="branding-tagline-tagline">powered by the
- dispatcher</forrest:property>
- </forrest:contract>
- <forrest:hook class="logo">
- <forrest:contract name="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:contract>
+ <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-specific"/>
</forrest:hook>
- <forrest:hook class="logo">
- <forrest:contract name="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:contract>
- </forrest:hook>
- <forrest:contract name="helper-form-blank"/>
- <forrest:contract name="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:contract>
- <forrest:hook name="nav-main-hook">
- <forrest:contract name="nav-main"
- dataURI="cocoon://#{$getRequest}.navigation.xml"/>
- <forrest:hook name="publishedStrip" nbsp="true">
- <forrest:contract name="nav-main-sub"
- dataURI="cocoon://#{$getRequest}.navigation.xml"/>
- <forrest:contract name="siteinfo-last-published"/>
- </forrest:hook>
- </forrest:hook>
- </forrest:hook>
- <forrest:hook name="page">
- <forrest:hook class="breadtrail" nbsp="true" />
-<!--<forrest:contract name="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:contract>-->
- <forrest:hook name="leftbar">
- <forrest:contract name="nav-section"
- dataURI="cocoon://#{$getRequest}.navigation.xml">
- <forrest:property name="nav-section-toc" nugget="get.tov">
- <jx:import
- uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
- </forrest:property>
- <forrest:property name="expanding">true</forrest:property>
-<!--<forrest:property name="toc" max-depth="2"/>-->
- </forrest:contract>
-<!-- <forrest:contract name="genericMarkup">
- <forrest:property name="genericMarkup">
- <hr/>
- </forrest:property>
- </forrest:contract>-->
-<!-- <forrest:contract name="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:contract>-->
- <forrest:contract name="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:contract>
-<!-- <forrest:contract name="genericMarkup">
- <forrest:property name="genericMarkup">
- <hr/>
- </forrest:property>
- </forrest:contract>-->
- <forrest:contract name="content-motd-page">
- <forrest:property name="content-motd-page">
- <motd>
-<!--FIXME: motd-page location needs removing
-These options are not effective anymore in dispatcher
- Need to be removed in Structurer and contracts usage/decription-->
-<!--<motd-option pattern="index.html">
- <motd-title>sample</motd-title>
- <motd-page location="page">
- 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:contract>
- <forrest:contract name="nav-section-round-bottom"/>
-<!-- This content displays below the navigation. the below example displays
- ApacheCon logos and links, but can be used for whatever, or commented out
- <forrest:hook name="below-nav">
- <forrest:contract name="siteinfo-credits">
- <forrest:property name="box-location">credit2</forrest:property>
- <forrest:property name="top-separator">false</forrest:property>
- <forrest:property name="use-br">false</forrest:property>
- <forrest:property name="siteinfo-credits">
- <credits>
- <credit>
- <name>ApacheCon Europe 2007</name>
- <url>http://apachecon.com/2007/EU/</url>
- <image>http://apache.org/ads/ApacheCon/2007-europe-125x125.png</image>
- <width>125</width>
- <height>125</height>
- </credit>
- <credit>
- <name>ApacheCon US 2007</name>
- <url>http://people.apache.org/calendar.html#200711</url>
- <image>http://apache.org/ads/ApacheCon/2007-usa-125x125.png</image>
- <width>125</width>
- <height>125</height>
- </credit>
- </credits>
- </forrest:property>
- </forrest:contract>
-</forrest:hook>-->
-<!-- end of below-nav content -->
- </forrest:hook>
- <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"
- dataURI="cocoon://#{$getRequest}.title.xml"/>
- <forrest:contract name="content-abstract"
- dataURI="cocoon://#{$getRequest}.abstract.xml"/>
- <forrest:contract name="content-minitoc"
- dataURI="cocoon://#{$getRequest}.toc.xml">
- <forrest:property name="content-minitoc-conf" max-depth="2"
- min-sections="1" location="page"/>
- </forrest:contract>
- <forrest:contract name="content-main"
- dataURI="cocoon://#{$getRequest}.body.xml">
- <forrest:property name="content-main-conf">
- <headings type="underlined"/>
- </forrest:property>
- </forrest:contract>
-<!--
- <forrest:contract name="content-authors">
- <forrest:property name="content-authors" nugget="get.authors">
- <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.authors.xml"/>
- </forrest:property>
- </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:property name="siteinfo-copyright">
- <copyright>
- <year inception="true">2002</year>
- <vendor>The Example Organisation.</vendor>
- <copyright-link>http://example.org</copyright-link>
- </copyright>
- </forrest:property>
- </forrest:contract>
- </forrest:hook>
- <forrest:contract name="siteinfo-compliance-links"/>
- <forrest:contract name="siteinfo-credits">
- <forrest:property name="box-location">credit</forrest:property>
- <forrest:property name="top-separator">false</forrest:property>
- <forrest:property name="use-br">false</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>
- <credit role="accueil">
- <name>Built with Cocoon</name>
- <url>http://cocoon.apache.org/</url>
- <image>http://forrest.apache.org/images/built-with-cocoon.gif</image>
- </credit>
- </credits>
- </forrest:property>
- </forrest:contract>
-<!-- <forrest:contract name="siteinfo-feedback">
- <forrest:properties contract="siteinfo-feedback">
- <forrest:property name="siteinfo-feedback">
- <feedback to="the Webmaster"
- href="mailto:webmaster@foo.com?subject=Feedback " >
- Send feedback about the website to:
- </feedback>
- </forrest:property>
- </forrest:properties>
- </forrest:contract>-->
+ <jx:import uri="cocoon://prepare.panels.pelt-html.footer"/>
</forrest:hook>
- </forrest:hook>
</forrest:view>
</forrest:views>
Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml?rev=606864&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml Wed Dec 26 01:20:16 2007
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+ <forrest:hook name="content">
+ <forrest:contract name="content-title"
+ dataURI="cocoon://#{$getRequest}.title.xml"/>
+ <forrest:contract name="content-abstract"
+ dataURI="cocoon://#{$getRequest}.abstract.xml"/>
+ <forrest:contract name="content-minitoc"
+ dataURI="cocoon://#{$getRequest}.toc.xml">
+ <forrest:property name="content-minitoc-conf" max-depth="2" min-sections="1"
+ location="page"/>
+ </forrest:contract>
+ <forrest:contract name="content-main"
+ dataURI="cocoon://#{$getRequest}.body.xml">
+ <forrest:property name="content-main-conf">
+ <headings type="underlined"/>
+ </forrest:property>
+ </forrest:contract>
+ <!--
+ <forrest:contract name="content-authors">
+ <forrest:property name="content-authors" nugget="get.authors">
+ <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.authors.xml"/>
+ </forrest:property>
+ </forrest:contract>
+ -->
+ </forrest:hook>
+</forrest:template>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.xml?rev=606864&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.xml Wed Dec 26 01:20:16 2007
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+ <forrest:contract name="branding-breadcrumbs">
+ <forrest:property name="branding-breadcrumbs">
+ <trail>
+ <link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
+ </trail>
+ </forrest:property>
+ </forrest:contract>
+ <forrest:hook name="header">
+ <forrest:contract name="branding-tagline">
+ <forrest:property name="branding-tagline-name">new seed</forrest:property>
+ <forrest:property name="branding-tagline-tagline">powered by the
+ dispatcher</forrest:property>
+ </forrest:contract>
+ <forrest:hook class="logo">
+ <forrest:contract name="branding-logo">
+ <forrest:property name="branding-logo-name">Apache Forrest
+ Logo</forrest:property>
+ <forrest:property name="branding-logo-description">Apache
+ Forrest</forrest:property>
+ <forrest:property name="branding-logo-url">
+ http://forrest.apache.org/</forrest:property>
+ <forrest:property name="branding-logo-logo">
+ images/project-logo.gif</forrest:property>
+ </forrest:contract>
+ </forrest:hook>
+ <forrest:hook class="logo">
+ <forrest:contract name="branding-logo">
+ <forrest:property name="branding-logo-name">plugin logo</forrest:property>
+ <forrest:property name="branding-logo-description">
+ org.apache.forrest.plugin.internal.dispatcher plugin for Apache
+ Forrest</forrest:property>
+ <forrest:property name="branding-logo-url">
+ http://forrest.apache.org/pluginDocs/</forrest:property>
+ <forrest:property name="branding-logo-logo">
+ images/project.png</forrest:property>
+ </forrest:contract>
+ </forrest:hook>
+ <jx:import uri="cocoon://prepare.panels.pelt-html.nav-main"/>
+ </forrest:hook>
+</forrest:template>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml?rev=606864&r1=606863&r2=606864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml Wed Dec 26 01:20:16 2007
@@ -37,6 +37,9 @@
<changes>
<!-- Add new releases here -->
<release version="0.1" date="unreleased">
+ <action context="code" dev="TS" type="update"> Cleaning up
+ usage of structurer using the new chunks of FOR-1059. Reducing code duplications.
+ </action>
<action context="code" dev="TS" importance="high" type="update"> Cleaning up
locationmap from the former xdocs location. See
<link href="site:news">news #cleanup.15.06.07</link> how to update. </action>