You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by th...@apache.org on 2006/07/24 13:55:50 UTC
svn commit: r425019 - in
/lenya/zone/htdocs/src/documentation/resources/themes: common/ common/css/
common/css/lenya.css pelt.fv
Author: thorsten
Date: Mon Jul 24 04:55:50 2006
New Revision: 425019
URL: http://svn.apache.org/viewvc?rev=425019&view=rev
Log:
Updating lenya zones documentation to the current dispatcher.
Added:
lenya/zone/htdocs/src/documentation/resources/themes/common/
lenya/zone/htdocs/src/documentation/resources/themes/common/css/
lenya/zone/htdocs/src/documentation/resources/themes/common/css/lenya.css (with props)
Modified:
lenya/zone/htdocs/src/documentation/resources/themes/pelt.fv
Added: lenya/zone/htdocs/src/documentation/resources/themes/common/css/lenya.css
URL: http://svn.apache.org/viewvc/lenya/zone/htdocs/src/documentation/resources/themes/common/css/lenya.css?rev=425019&view=auto
==============================================================================
--- lenya/zone/htdocs/src/documentation/resources/themes/common/css/lenya.css (added)
+++ lenya/zone/htdocs/src/documentation/resources/themes/common/css/lenya.css Mon Jul 24 04:55:50 2006
@@ -0,0 +1,6 @@
+.rigthAlign{
+float:right;
+}
+#container{
+background-color: #fff;
+}
\ No newline at end of file
Propchange: lenya/zone/htdocs/src/documentation/resources/themes/common/css/lenya.css
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lenya/zone/htdocs/src/documentation/resources/themes/pelt.fv
URL: http://svn.apache.org/viewvc/lenya/zone/htdocs/src/documentation/resources/themes/pelt.fv?rev=425019&r1=425018&r2=425019&view=diff
==============================================================================
--- lenya/zone/htdocs/src/documentation/resources/themes/pelt.fv (original)
+++ lenya/zone/htdocs/src/documentation/resources/themes/pelt.fv Mon Jul 24 04:55:50 2006
@@ -1,11 +1,11 @@
<?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
+ 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
@@ -17,50 +17,41 @@
-->
<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="common.css" media="screen" rel="alternate stylesheet"
- theme="common"/>
- <forrest:css url="coat.css" media="screen" rel="alternate stylesheet"
- theme="Coat"/>
- <forrest:css url="leather-dev.css" media="screen"
- rel="alternate stylesheet" theme="common"/>
- <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:css > /* Extra css */
-.leftSpaced {
-margin-left: 1em;
-margin-bottom:-1em;
-}
-.rigthAlign{
-text-align: right;
-}</forrest:css>
- <forrest:contract name="helper-prototype-ajax"/>
- <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">
- <forrest:properties contract="siteinfo-meta-navigation">
- <forrest:property name="nav-main" nugget="get.navigation">
- <jx:import
- uri="cocoon://${cocoon.parameters.getRequest}.navigation.xml"/>
- </forrest:property>
- </forrest:properties>
+ <!-- The following variables are used to contact data models and/or contracts. -->
+ <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
+ <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
+ <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"/>
+ <css url="coat.css" media="screen" theme="Coat"/>
+ <css url="pelt.print.css" media="print"/>
+ <css url="lenya.css" media="screen" theme="Pelt"/>
+ </forrest:property>
</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:contract name="helper-prototype-ajax"/>
+ <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: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:contract name="branding-breadcrumbs">
- <forrest:properties contract="branding-breadcrumbs">
<forrest:property name="branding-breadcrumbs">
<trail>
<link1 name="Apache" href="http://www.apache.org/"/>
@@ -68,11 +59,9 @@
href="http://lenya.zones.apache.org/"/>
</trail>
</forrest:property>
- </forrest:properties>
</forrest:contract>
<forrest:hook class="rigthAlign">
<forrest:contract name="branding-theme-switcher">
- <forrest:properties contract="branding-theme-switcher">
<!-- branding-theme-switcher-profiler and branding-theme-switcher-defaultTheme are required -->
<!-- branding-theme-switcher-profiler {true|false} only works on the defaultTheme -->
<forrest:property name="branding-theme-switcher-profiler"
@@ -86,21 +75,17 @@
seperator=" | " caption="Theme switcher: "/>-->
<forrest:property name="branding-theme-switcher-select"
caption="Theme switcher: "/>
- </forrest:properties>
</forrest:contract>
</forrest:hook>
<forrest:hook name="header">
<forrest:contract name="branding-tagline">
- <forrest:properties contract="branding-tagline">
<forrest:property name="branding-tagline-name">
lenya.zones.apache.org</forrest:property>
<forrest:property name="branding-tagline-tagline">demo and testing
area</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">
lenya.zones</forrest:property>
<forrest:property name="branding-logo-description">lenya.zones -
@@ -109,66 +94,44 @@
http://lenya.zones.apache.org/</forrest:property>
<forrest:property name="branding-logo-logo">
images/apache-lenya-light-zones.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="lenya.zones" domain="lenya.zones.apache.org"
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: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">
<forrest:contract name="genericMarkup">
- <forrest:properties contract="genericMarkup">
<forrest:property name="genericMarkup">
<strong>brought to you by the Apache Lenya community</strong>
</forrest:property>
- </forrest:properties>
</forrest:contract>
</forrest:hook>
<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:property name="nav-section-toc" nugget="get.toc">
- <jx:import
- uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
- </forrest:property>
- <forrest:property name="toc" max-depth="2"/>
- </forrest:properties>
+ <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:properties contract="genericMarkup">
<forrest:property name="genericMarkup">
<hr/>
<div class="leftSpaced">
@@ -183,10 +146,8 @@
</li>
</ul>
</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">
@@ -200,7 +161,6 @@
</credit>
</credits>
</forrest:property>
- </forrest:properties>
</forrest:contract>
<forrest:contract name="nav-section-round-bottom"/>
</forrest:hook>
@@ -209,51 +169,26 @@
<!--<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.title">
- <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 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: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>
@@ -263,20 +198,17 @@
</forrest:hook>
<forrest:hook class="copyright">
<forrest:contract name="siteinfo-copyright">
- <forrest:properties contract="siteinfo-copyright">
<forrest:property name="siteinfo-copyright">
<copyright>
<year>2006</year>
<vendor>The Apache 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">
@@ -290,16 +222,13 @@
</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="dev.at.lenya.apache.org"
href="mailto:dev@lenya.apache.org?subject=Feedback " >
Send feedback about the website to: </feedback>
</forrest:property>
- </forrest:properties>
</forrest:contract>
</forrest:hook>
</forrest:hook>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org