forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r376863 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv
Date Fri, 10 Feb 2006 21:16:45 GMT
Author: thorsten
Date: Fri Feb 10 13:16:42 2006
New Revision: 376863

URL: http://svn.apache.org/viewcvs?rev=376863&view=rev
Log:
Updating coat theme to rc1 grammar (FOR-797)

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv?rev=376863&r1=376862&r2=376863&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv Fri Feb
10 13:16:42 2006
@@ -19,92 +19,70 @@
 <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="coat.css"/>
-    
-    <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>
+  <!-- The following variables are used to contact data models and/or contracts. -->
+  <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
+  <jx:set var="getRequestExstension" value="#{$cocoon/parameters/getRequestExstension}"
/>
+  
+  <forrest:view type="html" hooksXpath="/html/body">
+    <!-- 
+        @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
+        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="coat.css"/>
+      </forrest:property>
     </forrest:contract>
     
+    <forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info"/>
+    
     <forrest:hook name="container">
-      <forrest:hook name="header">
-        <forrest:hook name="group-logo">
-          <forrest:contract name="branding-logo">
-            <forrest:properties contract="branding-logo">
-              <forrest:property name="branding-logo-name">The Apache Software Foundation</forrest:property>
-              <forrest:property name="branding-logo-description">The Apache Software
Foundation</forrest:property>
-              <forrest:property name="branding-logo-url">http://www.apache.org/</forrest:property>
-              <forrest:property name="branding-logo-logo">images/group-logo.gif</forrest:property>
-            </forrest:properties>
-          </forrest:contract>
-        </forrest:hook>
+      <forrest:hook name="header">
+        <forrest:hook name="group-logo">
+          <forrest:contract name="branding-logo">
+            <forrest:property name="branding-logo-name">The Apache Software 
+              Foundation</forrest:property>
+            <forrest:property name="branding-logo-description">The Apache 
+              Software Foundation</forrest:property>
+            <forrest:property name="branding-logo-url">
+              http://www.apache.org/</forrest:property>
+            <forrest:property name="branding-logo-logo">
+              images/group-logo.gif</forrest:property>
+          </forrest:contract>
+        </forrest:hook>
       </forrest:hook>
-      <forrest:hook name="page">
-        <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="expanding">false</forrest:property>
-            </forrest:properties>
-          </forrest:contract>
-          <forrest:contract name="search-input">
-            <forrest:properties contract="search-input">
-              <forrest:property name="search-input">
-                <search name="MyProject" domain="mydomain" provider="google"/>
-              </forrest:property>
-            </forrest:properties>
-          </forrest:contract>
-        </forrest:hook>
-<!-- 
- You can group elements to a template and call it from any view. e.g.
-<forrest:hook name="export-link">
-  <forrest:contract name="content-xml-link"/>
-  <forrest:contract name="content-pdf-link"/>
-</forrest:hook>
- can be called as  <jx:import uri="cocoon://prepare.tiles.export-link"/>
- when saved as 
- {project:resources}/templates/{project:theme}/export-link.vt.xml 
- or
- {project:resources}/templates/export-link.vt.xml
- 
-HEADSUP:
-<forrest:call-template name="export-link"/> is *not* working anymore!!!
--->
-
-        <forrest:hook name="content">
-          <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-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:properties>
-          </forrest:contract>
-        </forrest:hook>
+      <forrest:hook name="page">
+        <forrest:hook name="leftbar">
+          <forrest:contract name="nav-section" 
+            dataURI="cocoon://#{$getRequest}.navigation.xml">
+            <forrest:property name="expanding">false</forrest:property>
+          </forrest:contract>
+          <forrest:contract name="search-input">
+            <forrest:property name="search-input">
+              <search name="MyProject" domain="mydomain" provider="google"/>
+            </forrest:property>
+          </forrest:contract>
+        </forrest:hook>
+        <forrest:hook name="content">
+          <forrest:contract name="content-abstract" 
+            dataURI="cocoon://#{$getRequest}.abstract.xml"/>
+          <forrest:contract name="content-main" 
+            dataURI="cocoon://#{$getRequest}.body.xml"/>
+        </forrest:hook>
       </forrest:hook>
     </forrest:hook>
     <forrest:hook name="footer">
       <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&#160;" >
               Send feedback about the website to:
             </feedback>
           </forrest:property>
-        </forrest:properties>
       </forrest:contract>
       <forrest:contract name="siteinfo-last-published"/>
     </forrest:hook>



Mime
View raw message