forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r808385 [14/14] - in /forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher: ./ resources/stylesheets/ resources/stylesheets/fo/ resources/stylesheets/helper/ resources/stylesheets/html/ resources/stylesh...
Date Thu, 27 Aug 2009 12:07:47 GMT
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.footer.panel.xml
Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,10 +16,10 @@
   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">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="footer">
     <forrest:hook class="lastmodified">
-      <forrest:contract name="siteinfo-last-published"/>
+      <forrest:contract name="siteinfo-last-published" />
     </forrest:hook>
     <forrest:hook class="copyright">
       <forrest:contract name="siteinfo-copyright">
@@ -32,7 +32,7 @@
         </forrest:property>
       </forrest:contract>
     </forrest:hook>
-    <forrest:contract name="siteinfo-compliance-links"/>
+    <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>
@@ -49,7 +49,8 @@
           <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>
+            <image>
+            http://forrest.apache.org/images/built-with-cocoon.gif</image>
           </credit>
         </credits>
       </forrest:property>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.head.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.head.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.head.panel.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.head.panel.xml
Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,46 +16,42 @@
   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">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <!-- 
     @type defines this structurer to html.
     @hooksXpath defines where all hooks will be injected (as prefix).
   -->
   <forrest:contract name="branding-css-links">
-  <!-- More information around this contract
+    <!-- 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 
+    <!--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="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>
+      <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"/>
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     </forrest:property>
-    <forrest:property name="theme" value="pelt"/>
+    <forrest:property name="theme" value="pelt" />
   </forrest:contract>
-  <forrest:contract name="siteinfo-meta-navigation" 
-      dataURI="cocoon://#{$getRequest}.navigation.xml"/>
+  <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>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.header.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.header.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.header.panel.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.header.panel.xml
Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,43 +16,45 @@
   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">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <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/"/>
+        <link1 name="MyGroup" href="http://www.apache.org/" />
+        <link2 name="MyProject" 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-name">new
+      seed</forrest:property>
       <forrest:property name="branding-tagline-tagline">powered by the
-        dispatcher</forrest:property>
+      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-name">MyGroup</forrest:property>
         <forrest:property name="branding-logo-description">MyGroup
-          Description</forrest:property>
+        Description</forrest:property>
         <forrest:property name="branding-logo-url">
-          http://example.org/</forrest:property>
-        <forrest:property name="branding-logo-logo"> images/group.png
-          </forrest:property>
+        http://example.org/</forrest:property>
+        <forrest:property name="branding-logo-logo">
+        images/group.png</forrest:property>
       </forrest:contract>
     </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-name">
+        MyProject</forrest:property>
         <forrest:property name="branding-logo-description">MyProject
-          Description</forrest:property>
+        Description</forrest:property>
         <forrest:property name="branding-logo-url">
-          http://example.org/myproj/</forrest:property>
-        <forrest:property name="branding-logo-logo"> project-logo.png
-          </forrest:property>
+        http://example.org/myproj/</forrest:property>
+        <forrest:property name="branding-logo-logo">
+        project-logo.png</forrest:property>
       </forrest:contract>
     </forrest:hook>
-    <jx:import uri="cocoon://prepare.panels.pelt-html.nav-main"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-html.nav-main" />
   </forrest:hook>
 </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.leftbar.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.leftbar.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.leftbar.panel.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.leftbar.panel.xml
Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,12 +16,12 @@
   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">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="leftbar">
-    <forrest:contract name="nav-section" 
-                      dataURI="cocoon://#{$getRequest}.navigation.xml">
+    <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"/>
+        <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"/>-->
@@ -68,12 +68,12 @@
     <forrest:contract name="content-motd-page">
       <forrest:property name="content-motd-page">
         <motd>
-        <!--FIXME: 
-	  motd-page location needs removing
+          <!--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">
@@ -82,18 +82,17 @@
           <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
+          <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">
@@ -121,6 +120,6 @@
     </forrest:contract>
   </forrest:hook>
   -->
-  <!-- end of below-nav content -->
+    <!-- end of below-nav content -->
   </forrest:hook>
 </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.nav-main.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.nav-main.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.nav-main.panel.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.nav-main.panel.xml
Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,22 +16,21 @@
   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="helper-form-blank"/>
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <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="example.org" provider="google"/>
+      <search name="MyProject" domain="example.org" provider="google" />
     </forrest:property>
   </forrest:contract>
   <forrest:hook name="nav-main-hook">
     <forrest:contract name="nav-main"
-      dataURI="cocoon://#{$getRequest}.navigation.xml"/>
-<forrest:contract name="nav-main-sub"
-        dataURI="cocoon://#{$getRequest}.navigation.xml"/>
+    dataURI="cocoon://#{$getRequest}.navigation.xml" />
+    <forrest:contract name="nav-main-sub"
+    dataURI="cocoon://#{$getRequest}.navigation.xml" />
     <forrest:hook name="publishedStrip" nbsp="true">
-      <forrest:contract name="siteinfo-last-published"/>
+      <forrest:contract name="siteinfo-last-published" />
     </forrest:hook>
   </forrest:hook>
 </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.panel.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/panels/pelt-html.panel.xml
Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -16,43 +16,39 @@
   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">
-<!-- 
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <!-- 
         @type defines this structurer to html.
         @hooksXpath defines where all hooks will be injected (as prefix).
         -->
   <forrest:contract name="branding-css-links">
-<!-- More information around this contract
+    <!-- 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) -->
+    <!--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, 
+      <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>
+      <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"/>
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     </forrest:property>
-    <forrest:property name="theme" value="pelt"/>
+    <forrest:property name="theme" value="pelt" />
   </forrest:contract>
-  <forrest:contract name="siteinfo-meta-navigation" 
-      dataURI="cocoon://#{$getRequest}.navigation.xml"/>
+  <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>
@@ -62,62 +58,62 @@
     <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/"/>
+          <link1 name="MyGroup" href="http://www.apache.org/" />
+          <link2 name="MyProject" 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: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>
+          MyGroup</forrest:property>
+          <forrest:property name="branding-logo-description">MyGroup
+          Description</forrest:property>
           <forrest:property name="branding-logo-url">
-              http://example.org/</forrest:property>
+          http://example.org/</forrest:property>
           <forrest:property name="branding-logo-logo">
-              images/group.png</forrest:property>
+          images/group.png</forrest:property>
         </forrest:contract>
       </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>
+          MyProject</forrest:property>
+          <forrest:property name="branding-logo-description">MyProject
+          Description</forrest:property>
           <forrest:property name="branding-logo-url">
-              http://example.org/myproj/</forrest:property>
+          http://example.org/myproj/</forrest:property>
           <forrest:property name="branding-logo-logo">
-              images/project.png</forrest:property>
+          images/project.png</forrest:property>
         </forrest:contract>
       </forrest:hook>
-      <forrest:contract name="helper-form-blank"/>
+      <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="example.org" provider="google"/>
+          <search name="MyProject" domain="example.org" provider="google" />
         </forrest:property>
       </forrest:contract>
       <forrest:hook name="nav-main-hook">
-        <forrest:contract name="nav-main" 
-            dataURI="cocoon://#{$getRequest}.navigation.xml"/>
+        <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: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:contract name="branding-breadcrumbs">
           <forrest:property name="branding-breadcrumbs">
             <trail>
               <link1 name="myGroup" href="http://www.apache.org/"/>
@@ -127,21 +123,20 @@
           </forrest:property>
         </forrest:contract>-->
       <forrest:hook name="leftbar">
-        <forrest:contract name="nav-section" 
-            dataURI="cocoon://#{$getRequest}.navigation.xml">
+        <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"/>
+            <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:property name="toc" max-depth="2"/>-->
         </forrest:contract>
-<!-- <forrest:contract name="genericMarkup">
+        <!-- <forrest:contract name="genericMarkup">
             <forrest:property name="genericMarkup">
               <hr/>
             </forrest:property>
     </forrest:contract>-->
-<!-- <forrest:contract name="search-input">
+        <!-- <forrest:contract name="search-input">
             <forrest:property name="input-size">18</forrest:property>
             <forrest:property name="search-input">
               <search name="MyProject" domain="example.org" provider="google"/>
@@ -150,7 +145,7 @@
         <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">
+          <!--<forrest:property name="siteinfo-credits">
               <credits>
                 <credit>
                   <name>Built with Apache Forrest</name>
@@ -162,7 +157,7 @@
               </credits>
       </forrest:property>-->
         </forrest:contract>
-<!-- <forrest:contract name="genericMarkup">
+        <!-- <forrest:contract name="genericMarkup">
             <forrest:property name="genericMarkup">
               <hr/>
             </forrest:property>
@@ -170,27 +165,27 @@
         <forrest:contract name="content-motd-page">
           <forrest:property name="content-motd-page">
             <motd>
-<!--FIXME: motd-page location needs removing
+              <!--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-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>-->
               <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 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
+        <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">
@@ -217,32 +212,32 @@
           </forrest:property>
         </forrest:contract>
 </forrest:hook>-->
-<!-- end of below-nav content -->
+        <!-- end of below-nav content -->
       </forrest:hook>
       <forrest:hook name="content">
         <forrest:hook name="export-link">
-          <forrest:contract name="content-pdf-link"/>
+          <forrest:contract name="content-pdf-link" />
         </forrest:hook>
-<!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between
Pelt and Leather-dev... -->
+        <!-- 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: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 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:contract name="content-main"
+        dataURI="cocoon://#{$getRequest}.body.xml">
           <forrest:property name="content-main-conf">
-            <headings type="underlined"/>
+            <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"/>
@@ -253,7 +248,7 @@
     </forrest:hook>
     <forrest:hook name="footer">
       <forrest:hook class="lastmodified">
-        <forrest:contract name="siteinfo-last-published"/>
+        <forrest:contract name="siteinfo-last-published" />
       </forrest:hook>
       <forrest:hook class="copyright">
         <forrest:contract name="siteinfo-copyright">
@@ -266,7 +261,7 @@
           </forrest:property>
         </forrest:contract>
       </forrest:hook>
-      <forrest:contract name="siteinfo-compliance-links"/>
+      <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>
@@ -283,12 +278,13 @@
             <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>
+              <image>
+              http://forrest.apache.org/images/built-with-cocoon.gif</image>
             </credit>
           </credits>
         </forrest:property>
       </forrest:contract>
-<!-- <forrest:contract name="siteinfo-feedback">
+      <!-- <forrest:contract name="siteinfo-feedback">
           <forrest:properties contract="siteinfo-feedback">
             <forrest:property name="siteinfo-feedback">
               <feedback to="the Webmaster"

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
Thu Aug 27 12:07:38 2009
@@ -17,16 +17,16 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
-    <map:generators default="file"/>
-    <map:transformers default="xslt"/>
+    <map:generators default="file" />
+    <map:transformers default="xslt" />
     <map:serializers default="xml">
-      <map:serializer name="txt" 
-        src="org.apache.cocoon.serialization.TextSerializer" 
-        mime-type="text/plain" logger="sitemap.serializer.text" />
-      <map:serializer mime-type="image/png" name="svg2png" 
-        src="org.apache.cocoon.serialization.SVGSerializer">
-<!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
-<!-- <parameter name="gamma" type="float" value="0.48"/> -->
+      <map:serializer name="txt"
+      src="org.apache.cocoon.serialization.TextSerializer"
+      mime-type="text/plain" logger="sitemap.serializer.text" />
+      <map:serializer mime-type="image/png" name="svg2png"
+      src="org.apache.cocoon.serialization.SVGSerializer">
+        <!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
+        <!-- <parameter name="gamma" type="float" value="0.48"/> -->
         <parameter name="gamma" type="float" value="0" />
       </map:serializer>
     </map:serializers>
@@ -34,11 +34,9 @@
   <map:resources>
     <map:resource name="read-linked-text">
       <map:generate type="text" src="{path}" />
-      <map:transform type="pattern" 
-        src="{forrest:forrest.context}/resources/chaperon/grammars/link.xlex" />
-      <map:transform 
-        src="{forrest:forrest.context}/resources/chaperon/stylesheets/pattern2link.xsl" 
-        />
+      <map:transform type="pattern"
+      src="{forrest:forrest.context}/resources/chaperon/grammars/link.xlex" />
+      <map:transform src="{forrest:forrest.context}/resources/chaperon/stylesheets/pattern2link.xsl"
/>
       <map:serialize type="text" mime-type="text/css" />
     </map:resource>
   </map:resources>
@@ -54,7 +52,7 @@
       </map:match>
     </map:pipeline>
     <map:pipeline>
-<!--
+      <!--
         Last processing step. 
         Here we are overriding the default skin generation.
       -->
@@ -62,14 +60,14 @@
         <map:call resource="read-linked-text">
           <map:parameter name="path" value="{lm:themes/{1}.css}" />
         </map:call>
-<!-- <map:read mime-type="text/css" src="{lm:themes/{1}.css}" /> -->
+        <!-- <map:read mime-type="text/css" src="{lm:themes/{1}.css}" /> -->
       </map:match>
       <map:match pattern="themes/**.js">
-        <map:read mime-type="application/x-javascript" src="{lm:themes/{1}.js}" 
-          />
+        <map:read mime-type="application/x-javascript"
+        src="{lm:themes/{1}.js}" />
       </map:match>
-      <map:match 
-        pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.svg">
+      <map:match pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.svg">
+
         <map:generate src="status.xml" />
         <map:transform src="{lm:theme.images.corner.round}">
           <map:parameter name="orientation-tb" value="{2}" />
@@ -81,18 +79,15 @@
         </map:transform>
         <map:serialize type="xml" />
       </map:match>
-      <map:match 
-        pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.svg-to-png">
-        <map:generate 
-          src="cocoon:/themes/images{1}/roundcorner-{2}-{3}-{4}-bg{5}-stroke{6}-fg{7}.svg"

-          />
+      <map:match pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.svg-to-png">
+
+        <map:generate src="cocoon:/themes/images{1}/roundcorner-{2}-{3}-{4}-bg{5}-stroke{6}-fg{7}.svg"
/>
         <map:serialize type="svg2png" />
       </map:match>
-      <map:match 
-        pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.png">
-        <map:read 
-          src="cocoon:/themes/images{1}/roundcorner-{2}-{3}-{4}-bg{5}-stroke{6}-fg{7}.svg-to-png"

-          mime-type="image/png" />
+      <map:match pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.png">
+
+        <map:read src="cocoon:/themes/images{1}/roundcorner-{2}-{3}-{4}-bg{5}-stroke{6}-fg{7}.svg-to-png"
+        mime-type="image/png" />
       </map:match>
       <map:match pattern="themes/images/**.*">
         <map:match type="regexp" pattern="(.*\.)(jpg|JPG|Jpg|jpeg|Jpeg|JPEG)$">



Mime
View raw message