svn commit: r331760 - in /forrest/trunk/main: ./ template-sites/v2/ template-sites/v2/src/documentation/content/xdocs/ template-sites/v2/src/documentation/content/xdocs/samples/ template-sites/v2/src/documentation/resources/themes/common/ template-site...

[th...@apache.org]

Author: thorsten
Date: Tue Nov  8 01:46:25 2005
New Revision: 331760

URL: http://svn.apache.org/viewcvs?rev=331760&view=rev
Log:
Renaming 'default' to 'common'. Fixed the issues with ls.contracts.* so we do not need specific structurer anymore. Added sample boxes while debugging pelt content bug

Added:
    forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/common/
      - copied from r331256, forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/default/
    forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/common/css/
      - copied from r331756, forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/default/css/
    forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/common/html/
      - copied from r331756, forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/default/html/
    forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/common/js/
      - copied from r331756, forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/default/js/
Removed:
    forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/ls.contracts.fv
    forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/ls.contracts.project.fv
    forrest/trunk/main/template-sites/v2/src/documentation/resources/themes/default/
Modified:
    forrest/trunk/main/forrest.build.xml
    forrest/trunk/main/template-sites/v2/forrest.properties
    forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/index.xml
    forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.fv
    forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
    forrest/trunk/main/webapp/default-forrest.properties

Modified: forrest/trunk/main/forrest.build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/forrest.build.xml?rev=331760&r1=331759&r2=331760&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Tue Nov  8 01:46:25 2005
@@ -105,7 +105,7 @@
     <property name="forrest.skins-dir"     location="${forrest.core.webapp}/skins"/>
     <property name="forrest.plugins-dir"   location="${forrest.home}/${build.plugins-dir}"/>
     <!-- views -->
-    <property name="project.view-defaultView" value="default.fv"/>
+    <property name="project.view-defaultView" value="common.fv"/>
     <!-- If the user wants to build i18n in diferent locations this is one way to implemented it--> 
     <if>
         <equals arg1="${project.i18n}" arg2="true"/>

Modified: forrest/trunk/main/template-sites/v2/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/forrest.properties?rev=331760&r1=331759&r2=331760&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v2/forrest.properties (original)
+++ forrest/trunk/main/template-sites/v2/forrest.properties Tue Nov  8 01:46:25 2005
@@ -46,25 +46,25 @@
 #  the structurer will return the default fallback 
 #  ({defaults:view-themes}/{defaults:theme}{defaults:theme-ext}).
 #
-# Example (default.fv):
+# Example (common.fv):
 # 1.request: index 
 #  First choice: index.{project:theme-ext} = index.fv
-#  First/last fallback: {project:theme}{project:theme-ext} = default.fv
+#  First/last fallback: {project:theme}{project:theme-ext} = common.fv
 # 
 # 2.request: sample/index 
 #  First choice: sample/index.fv 
-#  First fallback: sample/default.fv 
-#  Last fallback: default.fv
+#  First fallback: sample/common.fv 
+#  Last fallback: common.fv
 # 
 # 3.request: sample/subdir/index 
 #  First choice: sample/subdir/index.fv 
-#  First fallback: sample/subdir/default.fv 
-#  Second fallback: sample/default.fv
-#  Last fallback: default.fv
+#  First fallback: sample/subdir/common.fv 
+#  Second fallback: sample/common.fv
+#  Last fallback: common.fv
 # ...
 # The parent (view-) template inherits to its children until a child
 # is overriding this template. This fallback templating can be 
-# used for directories (default.fv) and/or files (*.fv). 
+# used for directories (common.fv) and/or files (*.fv). 
 # That means that the root view is the
 # default view as long no other view can be found in the requested child.
 ##########################################

Modified: forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/index.xml?rev=331760&r1=331759&r2=331760&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/index.xml Tue Nov  8 01:46:25 2005
@@ -28,6 +28,16 @@
         This page is from the blank site template. It is found in
         <code>src/documentation/content/xdocs/index.xml</code>
         Please edit it and replace this text with content of your own.</p>
+        <fixme author="SN">The <code>&lt;fixme&gt;</code> element is used for stuff
+        which still needs work. Mind the <code>author</code> attribute!</fixme> 
+      <note>Use the <code>&lt;note&gt;</code> element to draw attention to something, e.g. ...The <code>&lt;code&gt;</code> element is used when the author can't
+        express himself clearly using normal sentences ;-)</note>
+      <warning>Sleep deprivation can be the result of being involved in an open
+        source project. (a.k.a. the <code>&lt;warning&gt;</code> element).
+      </warning>
+      <note label="Important">If you want your own labels for notes and
+        warnings, specify them using the <code>label</code> attribute.
+      </note>
     </section>
   </body>
 </document>

Modified: 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=331760&r1=331759&r2=331760&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.fv (original)
+++ forrest/trunk/main/template-sites/v2/src/documentation/content/xdocs/samples/index.fv Tue Nov  8 01:46:25 2005
@@ -23,8 +23,8 @@
     <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 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="common.css" media="screen" rel="alternate stylesheet" theme="common"/>
+    <forrest:css url="leather-dev.css" media="screen" rel="alternate stylesheet" theme="common"/>
     <forrest:css >
 /* Extra css */
     .example {
@@ -325,7 +325,7 @@
           </forrest:hook>-->
           <forrest:contract name="content-title">
             <forrest:properties contract="content-title">
-              <forrest:property name="content-title" nugget="get.body">
+              <forrest:property name="content-title" nugget="get.title">
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.title.xml"/>
               </forrest:property>
             </forrest:properties>

Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=331760&r1=331759&r2=331760&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Tue Nov  8 01:46:25 2005
@@ -156,7 +156,7 @@
         <view-internal>@forrest.home@/build/plugins/@project.view.internal.plugin@</view-internal>
         <view-themes>@forrest.home@/build/plugins/@project.theme.plugin@/resources/views</view-themes>
         <theme-ext>.fv</theme-ext>
-        <theme>default</theme>
+        <theme>common</theme>
       </values>
     </component-instance>
 

Modified: forrest/trunk/main/webapp/default-forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/default-forrest.properties?rev=331760&r1=331759&r2=331760&view=diff
==============================================================================
--- forrest/trunk/main/webapp/default-forrest.properties (original)
+++ forrest/trunk/main/webapp/default-forrest.properties Tue Nov  8 01:46:25 2005
@@ -25,7 +25,7 @@
 
 #views
 project.theme-extension=.fv
-project.theme=default
+project.theme=common
 
 # Specifies name of Forrest skin to use
 project.skin=pelt