cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject svn commit: r109514 - in cocoon/trunk/src/blocks/forms/samples/swan: . forms resources resources/css
Date Thu, 02 Dec 2004 18:31:14 GMT
Author: tim
Date: Thu Dec  2 10:31:13 2004
New Revision: 109514

URL: http://svn.apache.org/viewcvs?view=rev&rev=109514
Log:
Swan:
  Rename "struct"->"group"
  Move css into resources
  Update resource links

Added:
   cocoon/trunk/src/blocks/forms/samples/swan/resources/
   cocoon/trunk/src/blocks/forms/samples/swan/resources/css/
   cocoon/trunk/src/blocks/forms/samples/swan/resources/css/swan.css
   cocoon/trunk/src/blocks/forms/samples/swan/resources/swan.xsl
Modified:
   cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_binding.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_model.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_template.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/model_binding.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/model_model.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/model_template.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_binding.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_model.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_template.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/template_binding.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/template_model.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/template_template.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_binding.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_model.xml
   cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_template.xml
   cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_binding.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_binding.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_binding.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_binding.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_binding.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_binding.xml	Thu Dec  2 10:31:13 2004
@@ -33,13 +33,13 @@
     <fb:case id="aggregate" path=".">
       <fb:insert-node><fb:aggregate/>
 </fb:insert-node>
-      <fb:struct id="aggregate" path="fd:aggregate">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="aggregate" path="fd:aggregate">
+        <fb:group id="stuff" path=".">
           <fb:new id="id-class"/>
           <fb:new id="path-class"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -47,12 +47,26 @@
     <fb:case id="class" path=".">
       <fb:insert-node><fb:class/>
 </fb:insert-node>
-      <fb:struct id="class" path="fb:class">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="class" path="fb:class">
+        <fb:group id="stuff" path=".">
           <fb:new id="id-class"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
+    </fb:case>
+  </fb:class>
+
+  <fb:class id="group-class">
+    <fb:case id="group" path=".">
+      <fb:insert-node><fd:group/>
+</fb:insert-node>
+      <fb:group id="group" path="fd:group">
+        <fb:group id="stuff" path=".">
+          <fb:new id="id-class"/>
+          <fb:new id="label-class"/>
+        </fb:group>
+        <fb:new id="items-class"/>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -60,11 +74,11 @@
     <fb:case id="javascript" path=".">
       <fb:insert-node><fb:javascript/>
 </fb:insert-node>
-      <fb:struct id="javascript" path="fb:javascript">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="javascript" path="fb:javascript">
+        <fb:group id="stuff" path=".">
           <fb:new id="text-class"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -72,11 +86,11 @@
     <fb:case id="new" path=".">
       <fb:insert-node><fb:new/>
 </fb:insert-node>
-      <fb:struct id="new" path="fb:new">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="new" path="fb:new">
+        <fb:group id="stuff" path=".">
           <fb:new id="id-class"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -84,16 +98,16 @@
     <fb:case id="repeater" path=".">
       <fb:insert-node><fb:repeater/>
 </fb:insert-node>
-      <fb:struct id="repeater" path="fb:repeater">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="repeater" path="fb:repeater">
+        <fb:group id="stuff" path=".">
           <fb:insert-node>
   <fb:on-bind/>
   </fb:insert-node>
           <fb:new id="id-class"/>
           <fb:new id="parent-path-class"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -101,16 +115,16 @@
     <fb:case id="temp-repeater" path=".">
       <fb:insert-node><fb:temp-repeater/>
 </fb:insert-node>
-      <fb:struct id="temp-repeater" path="fb:temp-repeater">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="temp-repeater" path="fb:temp-repeater">
+        <fb:group id="stuff" path=".">
           <fb:new id="id-class"/>
           <fb:new id="parent-path-class"/>
           <fb:insert-node>
   <fb:on-bind/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -118,16 +132,16 @@
     <fb:case id="union" path=".">
       <fb:insert-node><fb:union/>
 </fb:insert-node>
-      <fb:struct id="union" path="fb:union">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="union" path="fb:union">
+        <fb:group id="stuff" path=".">
           <fb:new id="id-class"/>
           <fb:new id="path-class"/>
           <fb:insert-node>
   <fd:widgets/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -135,12 +149,12 @@
     <fb:case id="value" path=".">
       <fb:insert-node><fb:value/>
 </fb:insert-node>
-      <fb:struct id="value" path="fb:value">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="value" path="fb:value">
+        <fb:group id="stuff" path=".">
           <fb:new id="id-class"/>
           <fb:value id="path" path="@path"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -148,13 +162,13 @@
     <fb:case id="struct" path=".">
       <fb:insert-node><fd:struct/>
 </fb:insert-node>
-      <fb:struct id="struct" path="fd:struct">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="struct" path="fd:struct">
+        <fb:group id="stuff" path=".">
           <fb:new id="id-class"/>
           <fb:new id="label-class"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -204,6 +218,7 @@
     <fb:union id="union" path=".">
       <fb:new id="aggregate-class"/>
       <fb:new id="class-class"/>
+      <fb:new id="group-class"/>
       <fb:new id="javascript-class"/>
       <fb:new id="new-class"/>
       <fb:new id="temp-repeater-class"/>

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_model.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_model.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_model.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_model.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_model.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_model.xml	Thu Dec  2 10:31:13 2004
@@ -131,6 +131,7 @@
             <fd:item value="booleanfield"><fd:label>BooleanField</fd:label></fd:item>
             <fd:item value="class"><fd:label>Class</fd:label></fd:item>
             <fd:item value="field"><fd:label>Field</fd:label></fd:item>
+            <fd:item value="group"><fd:label>Group</fd:label></fd:item>
             <fd:item value="new"><fd:label>New</fd:label></fd:item>
             <fd:item value="output"><fd:label>Output</fd:label></fd:item>
             <fd:item value="repeater"><fd:label>Repeater</fd:label></fd:item>
@@ -187,193 +188,206 @@
           <fd:label>Type</fd:label>
           <fd:widgets>
 
-            <fd:struct id="class">
+            <fd:group id="class">
               <fd:label>Class</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="javascript">
+            <fd:group id="javascript">
               <fd:label>Javascript</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="text-class"/>
                     <fd:new id="path-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="new">
+            <fd:group id="new">
               <fd:label>New</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="union">
+            <fd:group id="union">
               <fd:label>Union</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="path-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="value">
+            <fd:group id="value">
               <fd:label>Value</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="path-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
 
-            <fd:struct id="action">
+            <fd:group id="action">
               <fd:label>Action</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="aggregatefield">
+            <fd:group id="aggregatefield">
               <fd:label>AggregateField</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                     <fd:new id="required-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="booleanfield">
+            <fd:group id="booleanfield">
               <fd:label>BooleanField</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="field">
+            <fd:group id="field">
               <fd:label>Field</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                     <fd:new id="required-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="output">
+            <fd:group id="group">
+              <fd:label>Group</fd:label>
+              <fd:widgets>
+                <fd:group id="stuff">
+                  <fd:widgets>
+                    <fd:new id="id-class"/>
+                    <fd:new id="label-class"/>
+                  </fd:widgets>
+                </fd:group>
+                <fd:new id="items-class"/>
+              </fd:widgets>
+            </fd:group>
+
+            <fd:group id="output">
               <fd:label>Output</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="repeater">
+            <fd:group id="repeater">
               <fd:label>Repeater</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                     <fd:new id="initial-size-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="temp-repeater">
+            <fd:group id="temp-repeater">
               <fd:label>Repeater</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="parent-path-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="row-action">
+            <fd:group id="row-action">
                 <fd:label>RowAction</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="struct">
+            <fd:group id="struct">
               <fd:label>Struct</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="submit">
+            <fd:group id="submit">
               <fd:label>Submit</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
           </fd:widgets>
 

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_template.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_template.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_template.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_template.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_template.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/binding_template.xml	Thu Dec  2 10:31:13 2004
@@ -18,44 +18,6 @@
   xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
   xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
 
-  <!--
-    CVS $Id$
-  -->
-
-  <style type="text/css">
-    li {
-      list-style-type: none
-    }
-
-    /* The actions buttons, placed on the right */
-    .actions {
-      float: right;
-      padding-top: 0.2em;
-    }
-
-    /* A "section" contains stuff, related actions and substuff */
-    div.section {
-      padding-top: 0.4em;
-      padding-bottom: 0.4em;
-      padding-left: 0.4em;
-      border: 1px dotted black;
-      mmargin-top: 0.4em;
-      margin-bottom: -1px;
-    }
-
-    /* Indent sub-sections (recursively) */
-    div.section div.section {
-      margin-left: 3em;
-      border-right: none;
-    }
-
-    /* Change bg color depending on nesting depth */
-    div.section div.section { background-color: #F0F0F0; }
-    div.section div.section div.section { background-color: #E0E0E0; }
-    div.section div.section div.section div.section { background-color: #D0D0D0; }
-    div.section div.section div.section div.section div.section { background-color: #C0C0C0; }
-  </style>
-
   <title>Swan Form Binding Editor</title>
 
   <content>
@@ -97,19 +59,19 @@
       <ft:class id="std-id-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -117,20 +79,20 @@
       <ft:class id="std-id-items-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
         </ft:choose>
@@ -139,21 +101,21 @@
       <ft:class id="std-id-label-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -161,22 +123,22 @@
       <ft:class id="std-id-label-items-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-label-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="label-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
         </ft:choose>
@@ -185,22 +147,22 @@
       <ft:class id="std-id-path-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-path-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-path-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="path-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -208,23 +170,23 @@
       <ft:class id="std-id-path-items-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-path-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-path-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="path-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
         </ft:choose>
@@ -233,19 +195,19 @@
       <ft:class id="std-javascript-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-text-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-text-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="text-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -253,21 +215,21 @@
       <ft:class id="std-path-items-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-path-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-path-class"/>
               <ft:new id="items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="path-class"/>
               <ft:new id="items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -275,24 +237,24 @@
       <ft:class id="std-repeater-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-path-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-parent-path-class"/>
               <ft:new id="items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="parent-path-class"/>
               <ft:new id="items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -300,23 +262,23 @@
       <ft:class id="std-temp-repeater-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-parent-path-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-parent-path-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="parent-path-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
         </ft:choose>
@@ -329,63 +291,69 @@
           </ft:case>
 
           <ft:case id="aggregate">
-            <ft:struct id="aggregate">
+            <ft:group id="aggregate">
               <ft:new id="std-id-path-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="class">
-            <ft:struct id="class">
+            <ft:group id="class">
               <ft:new id="std-id-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="context">
-            <ft:struct id="context">
+            <ft:group id="context">
               <ft:new id="std-path-items-class"/>
-            </ft:struct>
+            </ft:group>
+          </ft:case>
+
+          <ft:case id="group">
+            <ft:group id="group">
+              <ft:new id="std-id-path-items-class"/>
+            </ft:group>
           </ft:case>
 
           <ft:case id="javascript">
-            <ft:struct id="javascript">
+            <ft:group id="javascript">
               <ft:new id="std-javascript-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="new">
-            <ft:struct id="new">
+            <ft:group id="new">
               <ft:new id="std-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="repeater">
-            <ft:struct id="repeater">
+            <ft:group id="repeater">
               <ft:new id="std-repeater-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="temp-repeater">
-            <ft:struct id="temp-repeater">
+            <ft:group id="temp-repeater">
               <ft:new id="std-temp-repeater-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="struct">
-            <ft:struct id="struct">
+            <ft:group id="struct">
               <ft:new id="std-id-path-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="union">
-            <ft:struct id="union">
+            <ft:group id="union">
               <ft:new id="std-id-path-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="value">
-            <ft:struct id="value">
+            <ft:group id="value">
               <ft:new id="std-id-path-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
         </ft:union>
@@ -410,26 +378,26 @@
       <ft:class id="view-selector-class">
         <ft:choose path="view-selector">
           <ft:when value="fold">
-            <ft:widget id="view-view"><fi:styling type="image" src="resources/view.gif"/></ft:widget>
-            <ft:widget id="edit-view"><fi:styling type="image" src="resources/edit.gif"/></ft:widget>
+            <ft:widget id="view-view"><fi:styling type="image" src="resources/img/view.gif"/></ft:widget>
+            <ft:widget id="edit-view"><fi:styling type="image" src="resources/img/edit.gif"/></ft:widget>
           </ft:when>
           <ft:when value="view">
-            <ft:widget id="fold-view"><fi:styling type="image" src="resources/fold.gif"/></ft:widget>
-            <ft:widget id="edit-view"><fi:styling type="image" src="resources/edit.gif"/></ft:widget>
+            <ft:widget id="fold-view"><fi:styling type="image" src="resources/img/fold.gif"/></ft:widget>
+            <ft:widget id="edit-view"><fi:styling type="image" src="resources/img/edit.gif"/></ft:widget>
           </ft:when>
           <ft:when value="edit">
-            <ft:widget id="fold-view"><fi:styling type="image" src="resources/fold.gif"/></ft:widget>
-            <ft:widget id="view-view"><fi:styling type="image" src="resources/view.gif"/></ft:widget>
+            <ft:widget id="fold-view"><fi:styling type="image" src="resources/img/fold.gif"/></ft:widget>
+            <ft:widget id="view-view"><fi:styling type="image" src="resources/img/view.gif"/></ft:widget>
           </ft:when>
         </ft:choose>
       </ft:class>
 
       <ft:class id="item-row-class">
         <span class="actions">
-          <ft:widget id="up"><fi:styling type="image" src="resources/move_up.gif"/></ft:widget>
-          <ft:widget id="down"><fi:styling type="image" src="resources/move_down.gif"/></ft:widget>
-          <ft:widget id="add"><fi:styling type="image" src="resources/new.gif"/></ft:widget>
-          &#160;<ft:widget id="delete"><fi:styling type="image" src="resources/delete.gif"/></ft:widget>
+          <ft:widget id="up"><fi:styling type="image" src="resources/img/move_up.gif"/></ft:widget>
+          <ft:widget id="down"><fi:styling type="image" src="resources/img/move_down.gif"/></ft:widget>
+          <ft:widget id="add"><fi:styling type="image" src="resources/img/new.gif"/></ft:widget>
+          &#160;<ft:widget id="delete"><fi:styling type="image" src="resources/img/delete.gif"/></ft:widget>
         </span>
         <ft:new id="view-selector-class"/>
         <ft:new id="type-selector-class"/>
@@ -437,7 +405,7 @@
       </ft:class>
 
       <ft:class id="items-class">
-        <ft:widget id="addItem"><fi:styling type="image" src="resources/new_child.gif"/></ft:widget>
+        <ft:widget id="addItem"><fi:styling type="image" src="resources/img/new_child.gif"/></ft:widget>
         <ft:repeater-size id="items"/>
         <ft:repeater-widget id="items">
           <div class="section"><ft:new id="item-row-class"/></div>

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/model_binding.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/model_binding.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/model_binding.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/model_binding.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/model_binding.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/model_binding.xml	Thu Dec  2 10:31:13 2004
@@ -33,12 +33,12 @@
     <fb:case id="action" path=".">
       <fb:insert-node><fd:action/>
 </fb:insert-node>
-      <fb:struct id="action" path="fd:action">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="action" path="fd:action">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -46,17 +46,17 @@
     <fb:case id="aggregatefield" path=".">
       <fb:insert-node><fd:aggregatefield/>
 </fb:insert-node>
-      <fb:struct id="aggregatefield" path="fd:aggregatefield">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="aggregatefield" path="fd:aggregatefield">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
           <!-- TODO: required -->
           <fb:insert-node>
   <fd:widgets/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -64,12 +64,12 @@
     <fb:case id="booleanfield" path=".">
       <fb:insert-node><fd:booleanfield/>
 </fb:insert-node>
-      <fb:struct id="booleanfield" path="fd:booleanfield">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="booleanfield" path="fd:booleanfield">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -77,15 +77,15 @@
     <fb:case id="class" path=".">
       <fb:insert-node><fd:class/>
 </fb:insert-node>
-      <fb:struct id="class" path="fd:class" direction="load">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="class" path="fd:class" direction="load">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:insert-node>
   <fd:widgets/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -93,15 +93,32 @@
     <fb:case id="field" path=".">
       <fb:insert-node><fd:field/>
 </fb:insert-node>
-      <fb:struct id="field" path="fd:field">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="field" path="fd:field">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
           <fb:value id="required" path="@required">
             <fd:convertor datatype="boolean"/>
           </fb:value>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
+    </fb:case>
+  </fb:class>
+
+  <fb:class id="group-class">
+    <fb:case id="group" path=".">
+      <fb:insert-node><fd:group/>
+</fb:insert-node>
+      <fb:group id="group" path="fd:group">
+        <fb:group id="stuff" path=".">
+          <fb:value id="id" path="@id"/>
+          <fb:new id="label-class"/>
+          <fb:insert-node>
+  <fd:widgets/>
+  </fb:insert-node>
+        </fb:group>
+        <fb:new id="items-class"/>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -109,11 +126,11 @@
     <fb:case id="new" path=".">
       <fb:insert-node><fd:new/>
 </fb:insert-node>
-      <fb:struct id="new" path="fd:new">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="new" path="fd:new">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -121,12 +138,12 @@
     <fb:case id="output" path=".">
       <fb:insert-node><fd:output/>
 </fb:insert-node>
-      <fb:struct id="output" path="fd:output">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="output" path="fd:output">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -134,8 +151,8 @@
     <fb:case id="repeater" path=".">
       <fb:insert-node><fd:repeater/>
 </fb:insert-node>
-      <fb:struct id="repeater" path="fd:repeater">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="repeater" path="fd:repeater">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
           <fb:value id="initial-size" path="@initial-size">
@@ -144,9 +161,9 @@
           <fb:insert-node>
   <fd:widgets/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -154,12 +171,12 @@
     <fb:case id="row-action" path=".">
       <fb:insert-node><fd:row-action/>
 </fb:insert-node>
-      <fb:struct id="row-action" path="fd:row-action">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="row-action" path="fd:row-action">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -167,16 +184,16 @@
     <fb:case id="struct" path=".">
       <fb:insert-node><fd:struct/>
 </fb:insert-node>
-      <fb:struct id="struct" path="fd:struct">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="struct" path="fd:struct">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
           <fb:insert-node>
   <fd:widgets/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -184,12 +201,12 @@
     <fb:case id="submit" path=".">
       <fb:insert-node><fd:submit/>
 </fb:insert-node>
-      <fb:struct id="submit" path="fd:submit">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="submit" path="fd:submit">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -197,16 +214,16 @@
     <fb:case id="union" path=".">
       <fb:insert-node><fd:union/>
 </fb:insert-node>
-      <fb:struct id="union" path="fd:union">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="union" path="fd:union">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
           <fb:insert-node>
   <fd:widgets/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -242,6 +259,7 @@
       <fb:new id="booleanfield-class"/>
       <fb:new id="class-class"/>
       <fb:new id="field-class"/>
+      <fb:new id="group-class"/>
       <fb:new id="new-class"/>
       <fb:new id="output-class"/>
       <fb:new id="repeater-class"/>

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/model_model.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/model_model.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/model_model.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/model_model.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/model_model.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/model_model.xml	Thu Dec  2 10:31:13 2004
@@ -131,6 +131,7 @@
             <fd:item value="booleanfield"><fd:label>BooleanField</fd:label></fd:item>
             <fd:item value="class"><fd:label>Class</fd:label></fd:item>
             <fd:item value="field"><fd:label>Field</fd:label></fd:item>
+            <fd:item value="group"><fd:label>Group</fd:label></fd:item>
             <fd:item value="new"><fd:label>New</fd:label></fd:item>
             <fd:item value="output"><fd:label>Output</fd:label></fd:item>
             <fd:item value="repeater"><fd:label>Repeater</fd:label></fd:item>
@@ -185,155 +186,168 @@
           <fd:label>Type</fd:label>
           <fd:widgets>
 
-            <fd:struct id="action">
+            <fd:group id="action">
               <fd:label>Action</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="aggregatefield">
+            <fd:group id="aggregatefield">
               <fd:label>AggregateField</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                     <fd:new id="required-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="booleanfield">
+            <fd:group id="booleanfield">
               <fd:label>BooleanField</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="class">
+            <fd:group id="class">
               <fd:label>Class</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="field">
+            <fd:group id="field">
               <fd:label>Field</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                     <fd:new id="required-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="new">
+            <fd:group id="group">
+              <fd:label>Group</fd:label>
+              <fd:widgets>
+                <fd:group id="stuff">
+                  <fd:widgets>
+                    <fd:new id="id-class"/>
+                    <fd:new id="label-class"/>
+                  </fd:widgets>
+                </fd:group>
+                <fd:new id="items-class"/>
+              </fd:widgets>
+            </fd:group>
+
+            <fd:group id="new">
               <fd:label>New</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="output">
+            <fd:group id="output">
               <fd:label>Output</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="repeater">
+            <fd:group id="repeater">
               <fd:label>Repeater</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                     <fd:new id="initial-size-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="row-action">
+            <fd:group id="row-action">
               <fd:label>RowAction</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="struct">
+            <fd:group id="struct">
               <fd:label>Struct</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="submit">
+            <fd:group id="submit">
               <fd:label>Submit</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="union">
+            <fd:group id="union">
               <fd:label>Union</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
           </fd:widgets>
 

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/model_template.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/model_template.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/model_template.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/model_template.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/model_template.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/model_template.xml	Thu Dec  2 10:31:13 2004
@@ -18,44 +18,6 @@
   xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
   xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
 
-  <!--
-    CVS $Id$
-  -->
-
-  <style type="text/css">
-    li {
-      list-style-type: none
-    }
-
-    /* The actions buttons, placed on the right */
-    .actions {
-      float: right;
-      padding-top: 0.2em;
-    }
-
-    /* A "section" contains stuff, related actions and substuff */
-    div.section {
-      padding-top: 0.4em;
-      padding-bottom: 0.4em;
-      padding-left: 0.4em;
-      border: 1px dotted black;
-      mmargin-top: 0.4em;
-      margin-bottom: -1px;
-    }
-
-    /* Indent sub-sections (recursively) */
-    div.section div.section {
-      margin-left: 3em;
-      border-right: none;
-    }
-
-    /* Change bg color depending on nesting depth */
-    div.section div.section { background-color: #F0F0F0; }
-    div.section div.section div.section { background-color: #E0E0E0; }
-    div.section div.section div.section div.section { background-color: #D0D0D0; }
-    div.section div.section div.section div.section div.section { background-color: #C0C0C0; }
-  </style>
-
   <title>Swam Form Model Editor</title>
 
   <content>
@@ -99,19 +61,19 @@
       <ft:class id="std-id-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -119,20 +81,20 @@
       <ft:class id="std-id-items-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
         </ft:choose>
@@ -141,21 +103,21 @@
       <ft:class id="std-id-label-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -163,22 +125,22 @@
       <ft:class id="std-id-label-items-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-label-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="label-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
         </ft:choose>
@@ -187,23 +149,23 @@
       <ft:class id="std-id-label-req-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-label-class"/>
               <ft:new id="output-required-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="label-class"/>
               <ft:new id="required-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -211,24 +173,24 @@
       <ft:class id="std-repeater-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="out-id-class"/>
               <ft:new id="output-label-class"/>
               <ft:new id="output-initial-size-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
               <ft:new id="label-class"/>
               <ft:new id="initial-size-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
         </ft:choose>
@@ -241,81 +203,87 @@
           </ft:case>
 
           <ft:case id="action">
-            <ft:struct id="action">
+            <ft:group id="action">
               <ft:new id="std-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="aggregatefield">
-            <ft:struct id="aggregatefield">
+            <ft:group id="aggregatefield">
               <ft:new id="std-id-label-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="booleanfield">
-            <ft:struct id="booleanfield">
+            <ft:group id="booleanfield">
               <ft:new id="std-id-label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="class">
-            <ft:struct id="class">
+            <ft:group id="class">
               <ft:new id="std-id-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="field">
-            <ft:struct id="field">
+            <ft:group id="field">
               <ft:new id="std-id-label-req-class"/>
-            </ft:struct>
+            </ft:group>
+          </ft:case>
+
+          <ft:case id="group">
+            <ft:group id="group">
+              <ft:new id="std-id-label-items-class"/>
+            </ft:group>
           </ft:case>
 
           <ft:case id="new">
-            <ft:struct id="new">
+            <ft:group id="new">
               <ft:new id="std-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="output">
-            <ft:struct id="output">
+            <ft:group id="output">
               <ft:new id="std-id-label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="struct">
-            <ft:struct id="struct">
+            <ft:group id="struct">
               <ft:new id="std-id-label-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="repeater">
-            <ft:struct id="repeater">
+            <ft:group id="repeater">
               <ft:new id="std-repeater-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="temp-repeater">
-            <ft:struct id="temp-repeater">
+            <ft:group id="temp-repeater">
               <ft:new id="std-temp-repeater-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="row-action">
-            <ft:struct id="row-action">
+            <ft:group id="row-action">
               <ft:new id="std-id-label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="submit">
-            <ft:struct id="submit">
+            <ft:group id="submit">
               <ft:new id="std-id-label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="union">
-            <ft:struct id="union">
+            <ft:group id="union">
               <ft:new id="std-id-label-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
         </ft:union>
@@ -340,26 +308,26 @@
       <ft:class id="view-selector-class">
         <ft:choose path="view-selector">
           <ft:when value="fold">
-            <ft:widget id="view-view"><fi:styling type="image" src="resources/view.gif"/></ft:widget>
-            <ft:widget id="edit-view"><fi:styling type="image" src="resources/edit.gif"/></ft:widget>
+            <ft:widget id="view-view"><fi:styling type="image" src="resources/img/view.gif"/></ft:widget>
+            <ft:widget id="edit-view"><fi:styling type="image" src="resources/img/edit.gif"/></ft:widget>
           </ft:when>
           <ft:when value="view">
-            <ft:widget id="fold-view"><fi:styling type="image" src="resources/fold.gif"/></ft:widget>
-            <ft:widget id="edit-view"><fi:styling type="image" src="resources/edit.gif"/></ft:widget>
+            <ft:widget id="fold-view"><fi:styling type="image" src="resources/img/fold.gif"/></ft:widget>
+            <ft:widget id="edit-view"><fi:styling type="image" src="resources/img/edit.gif"/></ft:widget>
           </ft:when>
           <ft:when value="edit">
-            <ft:widget id="fold-view"><fi:styling type="image" src="resources/fold.gif"/></ft:widget>
-            <ft:widget id="view-view"><fi:styling type="image" src="resources/view.gif"/></ft:widget>
+            <ft:widget id="fold-view"><fi:styling type="image" src="resources/img/fold.gif"/></ft:widget>
+            <ft:widget id="view-view"><fi:styling type="image" src="resources/img/view.gif"/></ft:widget>
           </ft:when>
         </ft:choose>
       </ft:class>
 
       <ft:class id="item-row-class">
         <span class="actions">
-          <ft:widget id="up"><fi:styling type="image" src="resources/move_up.gif"/></ft:widget>
-          <ft:widget id="down"><fi:styling type="image" src="resources/move_down.gif"/></ft:widget>
-          <ft:widget id="add"><fi:styling type="image" src="resources/new.gif"/></ft:widget>
-          &#160;<ft:widget id="delete"><fi:styling type="image" src="resources/delete.gif"/></ft:widget>
+          <ft:widget id="up"><fi:styling type="image" src="resources/img/move_up.gif"/></ft:widget>
+          <ft:widget id="down"><fi:styling type="image" src="resources/img/move_down.gif"/></ft:widget>
+          <ft:widget id="add"><fi:styling type="image" src="resources/img/new.gif"/></ft:widget>
+          &#160;<ft:widget id="delete"><fi:styling type="image" src="resources/img/delete.gif"/></ft:widget>
         </span>
         <ft:new id="view-selector-class"/>
         <ft:new id="type-selector-class"/>
@@ -367,7 +335,7 @@
       </ft:class>
 
       <ft:class id="items-class">
-        <ft:widget id="addItem"><fi:styling type="image" src="resources/new_child.gif"/></ft:widget>
+        <ft:widget id="addItem"><fi:styling type="image" src="resources/img/new_child.gif"/></ft:widget>
         <ft:repeater-size id="items"/>
         <ft:repeater-widget id="items">
           <div class="section"><ft:new id="item-row-class"/></div>

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_binding.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_binding.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_binding.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_binding.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_binding.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_binding.xml	Thu Dec  2 10:31:13 2004
@@ -34,13 +34,13 @@
     <fb:case id="call" path=".">
       <fb:insert-node><map:call/>
 </fb:insert-node>
-      <fb:struct id="call" path="map:call">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="call" path="map:call">
+        <fb:group id="stuff" path=".">
           <fb:value id="continuation" path="@continuation"/>
           <fb:value id="resource" path="@resource"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -48,8 +48,8 @@
     <fb:case id="components" path=".">
       <fb:insert-node><map:components/>
 </fb:insert-node>
-      <fb:struct id="components" path="map:components">
-      </fb:struct>
+      <fb:group id="components" path="map:components">
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -57,8 +57,8 @@
     <fb:case id="views" path=".">
       <fb:insert-node><map:views/>
 </fb:insert-node>
-      <fb:struct id="views" path="map:views">
-      </fb:struct>
+      <fb:group id="views" path="map:views">
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -66,8 +66,8 @@
     <fb:case id="resources" path=".">
       <fb:insert-node><map:resources/>
 </fb:insert-node>
-      <fb:struct id="resources" path="map:resources">
-      </fb:struct>
+      <fb:group id="resources" path="map:resources">
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -75,8 +75,8 @@
     <fb:case id="flow" path=".">
       <fb:insert-node><map:flow/>
 </fb:insert-node>
-      <fb:struct id="flow" path="map:flow">
-      </fb:struct>
+      <fb:group id="flow" path="map:flow">
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -84,13 +84,13 @@
     <fb:case id="generate" path=".">
       <fb:insert-node><map:generate/>
 </fb:insert-node>
-      <fb:struct id="generate" path="map:generate">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="generate" path="map:generate">
+        <fb:group id="stuff" path=".">
           <fb:value id="type" path="@type"/>
           <fb:value id="src" path="@src"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -98,12 +98,12 @@
     <fb:case id="match" path=".">
       <fb:insert-node><map:match/>
 </fb:insert-node>
-      <fb:struct id="match" path="map:match">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="match" path="map:match">
+        <fb:group id="stuff" path=".">
           <fb:value id="pattern" path="@pattern"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -111,12 +111,12 @@
     <fb:case id="parameter" path=".">
       <fb:insert-node><map:parameter/>
 </fb:insert-node>
-      <fb:struct id="parameter" path="map:parameter">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="parameter" path="map:parameter">
+        <fb:group id="stuff" path=".">
           <fb:value id="name" path="@name"/>
           <fb:value id="value" path="@value"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -124,12 +124,12 @@
     <fb:case id="pipeline" path=".">
       <fb:insert-node><map:pipeline/>
 </fb:insert-node>
-      <fb:struct id="pipeline" path="map:pipeline">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="pipeline" path="map:pipeline">
+        <fb:group id="stuff" path=".">
           <fb:value id="type" path="@type"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -137,9 +137,9 @@
     <fb:case id="pipelines" path=".">
       <fb:insert-node><map:pipelines/>
 </fb:insert-node>
-      <fb:struct id="pipelines" path="map:pipelines">
+      <fb:group id="pipelines" path="map:pipelines">
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -147,16 +147,16 @@
     <fb:case id="read" path=".">
       <fb:insert-node><map:read/>
 </fb:insert-node>
-      <fb:struct id="read" path="map:read">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="read" path="map:read">
+        <fb:group id="stuff" path=".">
           <fb:new id="type-class"/>
           <fb:new id="src-class"/>
           <fb:insert-node>
   <fd:widgets/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -164,15 +164,15 @@
     <fb:case id="redirect-to" path=".">
       <fb:insert-node><map:redirect-to/>
 </fb:insert-node>
-      <fb:struct id="redirect-to" path="map:redirect-to">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="redirect-to" path="map:redirect-to">
+        <fb:group id="stuff" path=".">
           <fb:new id="uri-class"/>
           <fb:insert-node>
   <fd:widgets/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -180,12 +180,12 @@
     <fb:case id="serialize" path=".">
       <fb:insert-node><map:serialize/>
 </fb:insert-node>
-      <fb:struct id="serialize" path="map:serialize">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="serialize" path="map:serialize">
+        <fb:group id="stuff" path=".">
           <fb:value id="type" path="@type"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -193,13 +193,13 @@
     <fb:case id="transform" path=".">
       <fb:insert-node><map:transform/>
 </fb:insert-node>
-      <fb:struct id="transform" path="map:transform">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="transform" path="map:transform">
+        <fb:group id="stuff" path=".">
           <fb:value id="type" path="@type"/>
           <fb:value id="src" path="@src"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_model.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_model.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_model.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_model.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_model.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_model.xml	Thu Dec  2 10:31:13 2004
@@ -187,168 +187,168 @@
           <fd:label>Type</fd:label>
           <fd:widgets>
 
-            <fd:struct id="components">
+            <fd:group id="components">
               <fd:label>Components</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="views">
+            <fd:group id="views">
               <fd:label>Views</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="resources">
+            <fd:group id="resources">
               <fd:label>Resources</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="flow">
+            <fd:group id="flow">
               <fd:label>Flow</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="pipelines">
+            <fd:group id="pipelines">
               <fd:label>Pipelines</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="pipeline">
+            <fd:group id="pipeline">
               <fd:label>Pipeline</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="type-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="match">
+            <fd:group id="match">
               <fd:label>Match</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="pattern-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="generate">
+            <fd:group id="generate">
               <fd:label>Generate</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="type-class"/>
                     <fd:new id="src-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="transform">
+            <fd:group id="transform">
               <fd:label>Transform</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="type-class"/>
                     <fd:new id="src-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="serialize">
+            <fd:group id="serialize">
               <fd:label>Serialize</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="type-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="call">
+            <fd:group id="call">
               <fd:label>Call</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="continuation-class"/>
                     <fd:new id="resource-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="read">
+            <fd:group id="read">
               <fd:label>Read</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="type-class"/>
                     <fd:new id="src-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="redirect-to">
+            <fd:group id="redirect-to">
               <fd:label>Redirect To</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="uri-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="parameter">
+            <fd:group id="parameter">
               <fd:label>Parameter</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="name-class"/>
                     <fd:new id="value-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
           </fd:widgets>
 

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_template.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_template.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_template.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_template.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_template.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/sitemap_template.xml	Thu Dec  2 10:31:13 2004
@@ -18,45 +18,7 @@
   xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
   xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
 
-  <!--
-    CVS $Id$
-  -->
-
-  <style type="text/css">
-    li {
-      list-style-type: none
-    }
-
-    /* The actions buttons, placed on the right */
-    .actions {
-      float: right;
-      padding-top: 0.2em;
-    }
-
-    /* A "section" contains stuff, related actions and substuff */
-    div.section {
-      padding-top: 0.4em;
-      padding-bottom: 0.4em;
-      padding-left: 0.4em;
-      border: 1px dotted black;
-      mmargin-top: 0.4em;
-      margin-bottom: -1px;
-    }
-
-    /* Indent sub-sections (recursively) */
-    div.section div.section {
-      margin-left: 3em;
-      border-right: none;
-    }
-
-    /* Change bg color depending on nesting depth */
-    div.section div.section { background-color: #F0F0F0; }
-    div.section div.section div.section { background-color: #E0E0E0; }
-    div.section div.section div.section div.section { background-color: #D0D0D0; }
-    div.section div.section div.section div.section div.section { background-color: #C0C0C0; }
-  </style>
-
-  <title>Sitemap Editor</title>
+  <title>Swan Cocoon Sitemap Editor</title>
 
   <content>
     <ft:form-template action="#{$continuation/id}.continue" method="POST">
@@ -149,34 +111,34 @@
           </ft:case>
 
           <ft:case id="call">
-            <ft:struct id="call">
+            <ft:group id="call">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="ocontinuation-class"/>
                     <ft:new id="oresource-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="view">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="ocontinuation-class"/>
                     <ft:new id="oresource-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
                 <ft:when value="edit">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="continuation-class"/>
                     <ft:new id="resource-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="components">
-            <ft:struct id="components">
+            <ft:group id="components">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
                 </ft:when>
@@ -185,11 +147,11 @@
                 <ft:when value="edit">
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="views">
-            <ft:struct id="views">
+            <ft:group id="views">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
                 </ft:when>
@@ -198,11 +160,11 @@
                 <ft:when value="edit">
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="resources">
-            <ft:struct id="resources">
+            <ft:group id="resources">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
                 </ft:when>
@@ -211,11 +173,11 @@
                 <ft:when value="edit">
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="flow">
-            <ft:struct id="flow">
+            <ft:group id="flow">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
                 </ft:when>
@@ -224,111 +186,111 @@
                 <ft:when value="edit">
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="generate">
-            <ft:struct id="generate">
+            <ft:group id="generate">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="osrc-class"/>
                     <ft:new id="otype-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="view">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="osrc-class"/>
                     <ft:new id="otype-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
                 <ft:when value="edit">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="src-class"/>
                     <ft:new id="type-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="match">
-            <ft:struct id="match">
+            <ft:group id="match">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="opattern-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="view">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="opattern-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
                 <ft:when value="edit">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="pattern-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="parameter">
-            <ft:struct id="parameter">
+            <ft:group id="parameter">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="oname-class"/>
                     <ft:new id="ovalue-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="view">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="oname-class"/>
                     <ft:new id="ovalue-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="edit">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="name-class"/>
                     <ft:new id="value-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="pipeline">
-            <ft:struct id="pipeline">
+            <ft:group id="pipeline">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="otype-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="view">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="otype-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
                 <ft:when value="edit">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="type-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="pipelines">
-            <ft:struct id="pipelines">
+            <ft:group id="pipelines">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
                   <!-- Nothing -->
@@ -340,109 +302,109 @@
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="read">
-            <ft:struct id="read">
+            <ft:group id="read">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="otype-class"/>
                     <ft:new id="osrc-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="view">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="otype-class"/>
                     <ft:new id="osrc-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
                 <ft:when value="edit">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="type-class"/>
                     <ft:new id="src-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="redirect-to">
-            <ft:struct id="redirect-to">
+            <ft:group id="redirect-to">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="ouri-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="view">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="ouri-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
                 <ft:when value="edit">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="uri-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="serialize">
-            <ft:struct id="serialize">
+            <ft:group id="serialize">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="otype-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="view">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="otype-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
                 <ft:when value="edit">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="type-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="transform">
-            <ft:struct id="transform">
+            <ft:group id="transform">
               <ft:choose path="../../view-selector">
                 <ft:when value="fold">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="otype-class"/>
                     <ft:new id="osrc-class"/>
-                  </ft:struct>
+                  </ft:group>
                 </ft:when>
                 <ft:when value="view">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="otype-class"/>
                     <ft:new id="osrc-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
                 <ft:when value="edit">
-                  <ft:struct id="stuff">
+                  <ft:group id="stuff">
                     <ft:new id="type-class"/>
                     <ft:new id="src-class"/>
-                  </ft:struct>
+                  </ft:group>
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
         </ft:union>
@@ -467,26 +429,26 @@
       <ft:class id="view-selector-class">
         <ft:choose path="view-selector">
           <ft:when value="fold">
-            <ft:widget id="view-view"><fi:styling type="image" src="resources/view.gif"/></ft:widget>
-            <ft:widget id="edit-view"><fi:styling type="image" src="resources/edit.gif"/></ft:widget>
+            <ft:widget id="view-view"><fi:styling type="image" src="resources/img/view.gif"/></ft:widget>
+            <ft:widget id="edit-view"><fi:styling type="image" src="resources/img/edit.gif"/></ft:widget>
           </ft:when>
           <ft:when value="view">
-            <ft:widget id="fold-view"><fi:styling type="image" src="resources/fold.gif"/></ft:widget>
-            <ft:widget id="edit-view"><fi:styling type="image" src="resources/edit.gif"/></ft:widget>
+            <ft:widget id="fold-view"><fi:styling type="image" src="resources/img/fold.gif"/></ft:widget>
+            <ft:widget id="edit-view"><fi:styling type="image" src="resources/img/edit.gif"/></ft:widget>
           </ft:when>
           <ft:when value="edit">
-            <ft:widget id="fold-view"><fi:styling type="image" src="resources/fold.gif"/></ft:widget>
-            <ft:widget id="view-view"><fi:styling type="image" src="resources/view.gif"/></ft:widget>
+            <ft:widget id="fold-view"><fi:styling type="image" src="resources/img/fold.gif"/></ft:widget>
+            <ft:widget id="view-view"><fi:styling type="image" src="resources/img/view.gif"/></ft:widget>
           </ft:when>
         </ft:choose>
       </ft:class>
 
       <ft:class id="item-row-class">
         <span class="actions">
-          <ft:widget id="up"><fi:styling type="image" src="resources/move_up.gif"/></ft:widget>
-          <ft:widget id="down"><fi:styling type="image" src="resources/move_down.gif"/></ft:widget>
-          <ft:widget id="add"><fi:styling type="image" src="resources/new.gif"/></ft:widget>
-          &#160;<ft:widget id="delete"><fi:styling type="image" src="resources/delete.gif"/></ft:widget>
+          <ft:widget id="up"><fi:styling type="image" src="resources/img/move_up.gif"/></ft:widget>
+          <ft:widget id="down"><fi:styling type="image" src="resources/img/move_down.gif"/></ft:widget>
+          <ft:widget id="add"><fi:styling type="image" src="resources/img/new.gif"/></ft:widget>
+          &#160;<ft:widget id="delete"><fi:styling type="image" src="resources/img/delete.gif"/></ft:widget>
         </span>
         <ft:new id="view-selector-class"/>
         <ft:new id="type-selector-class"/>
@@ -494,7 +456,7 @@
       </ft:class>
 
       <ft:class id="items-class">
-        <ft:widget id="addItem"><fi:styling type="image" src="resources/new_child.gif"/></ft:widget>
+        <ft:widget id="addItem"><fi:styling type="image" src="resources/img/new_child.gif"/></ft:widget>
         <ft:repeater-size id="items"/>
         <ft:repeater-widget id="items">
           <div class="section"><ft:new id="item-row-class"/></div>

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/template_binding.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/template_binding.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/template_binding.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/template_binding.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/template_binding.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/template_binding.xml	Thu Dec  2 10:31:13 2004
@@ -33,12 +33,12 @@
     <fb:case id="case" path=".">
       <fb:insert-node><ft:case/>
 </fb:insert-node>
-      <fb:struct id="case" path="ft:case">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="case" path="ft:case">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -46,12 +46,12 @@
     <fb:case id="class" path=".">
       <fb:insert-node><ft:class/>
 </fb:insert-node>
-      <fb:struct id="class" path="ft:class">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="class" path="ft:class">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -59,11 +59,28 @@
     <fb:case id="form-template" path=".">
       <fb:insert-node><ft:form-template/>
 </fb:insert-node>
-      <fb:struct id="form-template" path="ft:form-template">
-        <fb:struct id="stuff" path=".">
-        </fb:struct>
+      <fb:group id="form-template" path="ft:form-template">
+        <fb:group id="stuff" path=".">
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
+    </fb:case>
+  </fb:class>
+
+  <fb:class id="group-class">
+    <fb:case id="group" path=".">
+      <fb:insert-node><ft:group/>
+</fb:insert-node>
+      <fb:group id="group" path="ft:group">
+        <fb:group id="stuff" path=".">
+          <fb:value id="id" path="@id"/>
+          <fb:new id="label-class"/>
+          <fb:insert-node>
+  <ft:widgets/>
+  </fb:insert-node>
+        </fb:group>
+        <fb:new id="items-class"/>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -71,11 +88,11 @@
     <fb:case id="new" path=".">
       <fb:insert-node><ft:new/>
 </fb:insert-node>
-      <fb:struct id="new" path="ft:new">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="new" path="ft:new">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -83,11 +100,11 @@
     <fb:case id="repeater-size" path=".">
       <fb:insert-node><ft:repeater-size/>
 </fb:insert-node>
-      <fb:struct id="repeater-size" path="ft:repeater-size">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="repeater-size" path="ft:repeater-size">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -95,13 +112,13 @@
     <fb:case id="repeater-widget" path=".">
       <fb:insert-node><ft:repeater-widget/>
 </fb:insert-node>
-      <fb:struct id="repeater-widget" path="ft:repeater-widget">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="repeater-widget" path="ft:repeater-widget">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:insert-node></fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -109,16 +126,16 @@
     <fb:case id="struct" path=".">
       <fb:insert-node><ft:struct/>
 </fb:insert-node>
-      <fb:struct id="struct" path="ft:struct">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="struct" path="ft:struct">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
           <fb:new id="label-class"/>
           <fb:insert-node>
   <ft:widgets/>
   </fb:insert-node>
-        </fb:struct>
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -126,13 +143,13 @@
     <fb:case id="union" path=".">
       <fb:insert-node><ft:union/>
 </fb:insert-node>
-      <fb:struct id="union" path="ft:union">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="union" path="ft:union">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
-        </fb:struct>
+        </fb:group>
         <!--<ft:new id="label-class"/>-->
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -140,11 +157,11 @@
     <fb:case id="widget" path=".">
       <fb:insert-node><ft:widget/>
 </fb:insert-node>
-      <fb:struct id="widget" path="ft:widget">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="widget" path="ft:widget">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -152,11 +169,11 @@
     <fb:case id="widget-label" path=".">
       <fb:insert-node><ft:widget-label/>
 </fb:insert-node>
-      <fb:struct id="widget-label" path="ft:widget-label">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="widget-label" path="ft:widget-label">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
   </fb:class>
 
@@ -164,74 +181,74 @@
 
     <fb:case id="table" path=".">
       <fb:insert-node><table/></fb:insert-node>
-      <fb:struct id="table" path="table">
-        <fb:struct id="stuff" path=".">
-        </fb:struct>
+      <fb:group id="table" path="table">
+        <fb:group id="stuff" path=".">
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
 
     <fb:case id="tr" path=".">
       <fb:insert-node><tr/></fb:insert-node>
-      <fb:struct id="tr" path="tr">
-        <fb:struct id="stuff" path=".">
-        </fb:struct>
+      <fb:group id="tr" path="tr">
+        <fb:group id="stuff" path=".">
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
 
     <fb:case id="td" path=".">
       <fb:insert-node><td/></fb:insert-node>
-      <fb:struct id="td" path="td">
-        <fb:struct id="stuff" path=".">
-        </fb:struct>
+      <fb:group id="td" path="td">
+        <fb:group id="stuff" path=".">
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
 
     <fb:case id="p" path=".">
       <fb:insert-node><p/></fb:insert-node>
-      <fb:struct id="p" path="p">
-        <fb:struct id="stuff" path=".">
-        </fb:struct>
+      <fb:group id="p" path="p">
+        <fb:group id="stuff" path=".">
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
 
     <fb:case id="input" path=".">
       <fb:insert-node><input/></fb:insert-node>
-      <fb:struct id="input" path="input">
-        <fb:struct id="stuff" path=".">
+      <fb:group id="input" path="input">
+        <fb:group id="stuff" path=".">
           <fb:value id="id" path="@id"/>
-        </fb:struct>
-      </fb:struct>
+        </fb:group>
+      </fb:group>
     </fb:case>
 
     <fb:case id="content" path=".">
       <fb:insert-node><content/></fb:insert-node>
-      <fb:struct id="content" path="content">
-        <fb:struct id="stuff" path=".">
-        </fb:struct>
+      <fb:group id="content" path="content">
+        <fb:group id="stuff" path=".">
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
 
     <fb:case id="title" path=".">
       <fb:insert-node><title/></fb:insert-node>
-      <fb:struct id="title" path="title">
-        <fb:struct id="stuff" path=".">
-        </fb:struct>
+      <fb:group id="title" path="title">
+        <fb:group id="stuff" path=".">
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
 
     <fb:case id="page" path=".">
       <fb:insert-node><page/></fb:insert-node>
-      <fb:struct id="page" path="page">
-        <fb:struct id="stuff" path=".">
-        </fb:struct>
+      <fb:group id="page" path="page">
+        <fb:group id="stuff" path=".">
+        </fb:group>
         <fb:new id="items-class"/>
-      </fb:struct>
+      </fb:group>
     </fb:case>
 
   </fb:class>
@@ -266,6 +283,7 @@
       <fb:new id="case-class"/>
       <fb:new id="class-class"/>
       <fb:new id="form-template-class"/>
+      <fb:new id="group-class"/>
       <fb:new id="new-class"/>
       <fb:new id="repeater-size-class"/>
       <fb:new id="repeater-widget-class"/>

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/template_model.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/template_model.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/template_model.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/template_model.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/template_model.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/template_model.xml	Thu Dec  2 10:31:13 2004
@@ -129,6 +129,7 @@
             <fd:item value="case"><fd:label>Case</fd:label></fd:item>
             <fd:item value="class"><fd:label>Class</fd:label></fd:item>
             <fd:item value="form-template"><fd:label>Form Template</fd:label></fd:item>
+            <fd:item value="group"><fd:label>Group</fd:label></fd:item>
             <fd:item value="new"><fd:label>New</fd:label></fd:item>
             <fd:item value="repeater-size"><fd:label>Repeater Size</fd:label></fd:item>
             <fd:item value="repeater-widget"><fd:label>Repeater Widget</fd:label></fd:item>
@@ -193,221 +194,234 @@
           <fd:label>Type</fd:label>
           <fd:widgets>
 
-            <fd:struct id="case">
+            <fd:group id="case">
               <fd:label>Case</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-not-req-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="class">
+            <fd:group id="class">
               <fd:label>Class</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="form-template">
+            <fd:group id="form-template">
               <fd:label>Form Template</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="new">
+            <fd:group id="group">
+              <fd:label>Group</fd:label>
+              <fd:widgets>
+                <fd:group id="stuff">
+                  <fd:widgets>
+                    <fd:new id="id-class"/>
+                    <fd:new id="label-class"/>
+                  </fd:widgets>
+                </fd:group>
+                <fd:new id="items-class"/>
+              </fd:widgets>
+            </fd:group>
+
+            <fd:group id="new">
               <fd:label>New</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="repeater-size">
+            <fd:group id="repeater-size">
               <fd:label>Repeater Size</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="repeater-widget">
+            <fd:group id="repeater-widget">
               <fd:label>Repeater Widget</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="struct">
+            <fd:group id="struct">
               <fd:label>Struct</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="union">
+            <fd:group id="union">
               <fd:label>Union</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                     <fd:new id="label-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="widget">
+            <fd:group id="widget">
               <fd:label>Widget</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="widget-label">
+            <fd:group id="widget-label">
               <fd:label>Widget Label</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="default">
+            <fd:group id="default">
               <fd:label>Default</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="table">
+            <fd:group id="table">
               <fd:label>Table</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="tr">
+            <fd:group id="tr">
               <fd:label>Table Row</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="td">
+            <fd:group id="td">
               <fd:label>Table Data</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="p">
+            <fd:group id="p">
               <fd:label>Paragraph</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="input">
+            <fd:group id="input">
               <fd:label>Input</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                     <fd:new id="id-class"/>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="content">
+            <fd:group id="content">
               <fd:label>Content</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="title">
+            <fd:group id="title">
               <fd:label>Title</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="page">
+            <fd:group id="page">
               <fd:label>Page</fd:label>
               <fd:widgets>
-                <fd:struct id="stuff">
+                <fd:group id="stuff">
                   <fd:widgets>
                   </fd:widgets>
-                </fd:struct>
+                </fd:group>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
           </fd:widgets>
 

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/template_template.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/template_template.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/template_template.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/template_template.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/template_template.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/template_template.xml	Thu Dec  2 10:31:13 2004
@@ -18,44 +18,6 @@
   xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
   xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
 
-  <!--
-    CVS $Id$
-  -->
-
-  <style type="text/css">
-    li {
-      list-style-type: none
-    }
-
-    /* The actions buttons, placed on the right */
-    .actions {
-      float: right;
-      padding-top: 0.2em;
-    }
-
-    /* A "section" contains stuff, related actions and substuff */
-    div.section {
-      padding-top: 0.4em;
-      padding-bottom: 0.4em;
-      padding-left: 0.4em;
-      border: 1px dotted black;
-      mmargin-top: 0.4em;
-      margin-bottom: -1px;
-    }
-
-    /* Indent sub-sections (recursively) */
-    div.section div.section {
-      margin-left: 3em;
-      border-right: none;
-    }
-
-    /* Change bg color depending on nesting depth */
-    div.section div.section { background-color: #F0F0F0; }
-    div.section div.section div.section { background-color: #E0E0E0; }
-    div.section div.section div.section div.section { background-color: #D0D0D0; }
-    div.section div.section div.section div.section div.section { background-color: #C0C0C0; }
-  </style>
-
   <title>Swan Form Template Editor</title>
 
   <content>
@@ -86,19 +48,19 @@
       <ft:class id="std-id-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -106,19 +68,19 @@
       <ft:class id="std-label-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="label-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
         </ft:choose>
       </ft:class>
@@ -126,17 +88,17 @@
       <ft:class id="std-items-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
-            </ft:struct>
+            <ft:group id="stuff">
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
-            </ft:struct>
+            <ft:group id="stuff">
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
-            </ft:struct>
+            <ft:group id="stuff">
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
         </ft:choose>
@@ -145,20 +107,20 @@
       <ft:class id="std-id-items-class">
         <ft:choose path="../../view-selector">
           <ft:when value="fold">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:when>
           <ft:when value="view">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="output-id-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
           <ft:when value="edit">
-            <ft:struct id="stuff">
+            <ft:group id="stuff">
               <ft:new id="id-class"/>
-            </ft:struct>
+            </ft:group>
             <ft:new id="items-class"/>
           </ft:when>
         </ft:choose>
@@ -171,119 +133,127 @@
           </ft:case>
 
           <ft:case id="case">
-            <ft:struct id="case">
+            <ft:group id="case">
               <ft:new id="std-id-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="class">
-            <ft:struct id="class">
+            <ft:group id="class">
               <ft:new id="std-id-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="content">
-            <ft:struct id="content">
+            <ft:group id="content">
               <ft:new id="std-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="default">
-            <ft:struct id="default">
+            <ft:group id="default">
               <ft:new id="std-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="form-template">
-            <ft:struct id="form-template">
+            <ft:group id="form-template">
               <ft:new id="std-items-class"/>
-            </ft:struct>
+            </ft:group>
+          </ft:case>
+
+          <ft:case id="group">
+            <ft:group id="group">
+              <ft:new id="std-id-class"/>
+              <ft:new id="std-label-class"/>
+              <ft:new id="std-id-items-class"/>
+            </ft:group>
           </ft:case>
 
           <ft:case id="input">
-            <ft:struct id="input">
+            <ft:group id="input">
               <ft:new id="std-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="new">
-            <ft:struct id="new">
+            <ft:group id="new">
               <ft:new id="std-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="p">
-            <ft:struct id="p">
+            <ft:group id="p">
               <ft:new id="items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="page">
-            <ft:struct id="page">
+            <ft:group id="page">
               <ft:new id="items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="repeater-size">
-            <ft:struct id="repeater-size">
+            <ft:group id="repeater-size">
               <ft:new id="std-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="repeater-widget">
-            <ft:struct id="repeater-widget">
+            <ft:group id="repeater-widget">
               <ft:new id="std-id-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="struct">
-            <ft:struct id="struct">
+            <ft:group id="struct">
               <ft:new id="std-id-class"/>
               <ft:new id="std-label-class"/>
               <ft:new id="std-id-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="table">
-            <ft:struct id="table">
+            <ft:group id="table">
               <ft:new id="std-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="td">
-            <ft:struct id="td">
+            <ft:group id="td">
               <ft:new id="std-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="title">
-            <ft:struct id="title">
+            <ft:group id="title">
               <ft:new id="std-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="tr">
-            <ft:struct id="tr">
+            <ft:group id="tr">
               <ft:new id="std-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="union">
-            <ft:struct id="union">
+            <ft:group id="union">
               <ft:new id="std-id-items-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="widget">
-            <ft:struct id="widget">
+            <ft:group id="widget">
               <ft:new id="std-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="widget-label">
-            <ft:struct id="widget-label">
+            <ft:group id="widget-label">
               <ft:new id="std-id-class"/>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
         </ft:union>
@@ -308,26 +278,26 @@
       <ft:class id="view-selector-class">
         <ft:choose path="view-selector">
           <ft:when value="fold">
-            <ft:widget id="view-view"><fi:styling type="image" src="resources/view.gif"/></ft:widget>
-            <ft:widget id="edit-view"><fi:styling type="image" src="resources/edit.gif"/></ft:widget>
+            <ft:widget id="view-view"><fi:styling type="image" src="resources/img/view.gif"/></ft:widget>
+            <ft:widget id="edit-view"><fi:styling type="image" src="resources/img/edit.gif"/></ft:widget>
           </ft:when>
           <ft:when value="view">
-            <ft:widget id="fold-view"><fi:styling type="image" src="resources/fold.gif"/></ft:widget>
-            <ft:widget id="edit-view"><fi:styling type="image" src="resources/edit.gif"/></ft:widget>
+            <ft:widget id="fold-view"><fi:styling type="image" src="resources/img/fold.gif"/></ft:widget>
+            <ft:widget id="edit-view"><fi:styling type="image" src="resources/img/edit.gif"/></ft:widget>
           </ft:when>
           <ft:when value="edit">
-            <ft:widget id="fold-view"><fi:styling type="image" src="resources/fold.gif"/></ft:widget>
-            <ft:widget id="view-view"><fi:styling type="image" src="resources/view.gif"/></ft:widget>
+            <ft:widget id="fold-view"><fi:styling type="image" src="resources/img/fold.gif"/></ft:widget>
+            <ft:widget id="view-view"><fi:styling type="image" src="resources/img/view.gif"/></ft:widget>
           </ft:when>
         </ft:choose>
       </ft:class>
 
       <ft:class id="item-row-class">
         <span class="actions">
-          <ft:widget id="up"><fi:styling type="image" src="resources/move_up.gif"/></ft:widget>
-          <ft:widget id="down"><fi:styling type="image" src="resources/move_down.gif"/></ft:widget>
-          <ft:widget id="add"><fi:styling type="image" src="resources/new.gif"/></ft:widget>
-          &#160;<ft:widget id="delete"><fi:styling type="image" src="resources/delete.gif"/></ft:widget>
+          <ft:widget id="up"><fi:styling type="image" src="resources/img/move_up.gif"/></ft:widget>
+          <ft:widget id="down"><fi:styling type="image" src="resources/img/move_down.gif"/></ft:widget>
+          <ft:widget id="add"><fi:styling type="image" src="resources/img/new.gif"/></ft:widget>
+          &#160;<ft:widget id="delete"><fi:styling type="image" src="resources/img/delete.gif"/></ft:widget>
         </span>
         <ft:new id="view-selector-class"/>
         <ft:new id="type-selector-class"/>
@@ -335,7 +305,7 @@
       </ft:class>
 
       <ft:class id="items-class">
-        <ft:widget id="addItem"><fi:styling type="image" src="resources/new_child.gif"/></ft:widget>
+        <ft:widget id="addItem"><fi:styling type="image" src="resources/img/new_child.gif"/></ft:widget>
         <ft:repeater-size id="items"/>
         <ft:repeater-widget id="items">
           <div class="section"><ft:new id="item-row-class"/></div>

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_binding.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_binding.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_binding.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_binding.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_binding.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_binding.xml	Thu Dec  2 10:31:13 2004
@@ -49,9 +49,9 @@
   </fb:class>
 
   <fb:class id="database-class">
-    <fb:struct id="database" path="database">
+    <fb:group id="database" path="database">
       <fb:new id="sql-class"/>
-    </fb:struct>
+    </fb:group>
   </fb:class>
 
   <fb:class id="datatype-id-class">
@@ -120,9 +120,9 @@
   </fb:class>
 
   <fb:class id="output-class">
-    <fb:struct id="output" path="output">
+    <fb:group id="output" path="output">
       <fb:new id="database-class"/>
-    </fb:struct>
+    </fb:group>
   </fb:class>
 
   <fb:class id="required-class">
@@ -132,9 +132,9 @@
   </fb:class>
 
   <fb:class id="sql-class">
-    <fb:struct id="sql" path="sql">
+    <fb:group id="sql" path="sql">
       <fb:new id="dialect-class"/>
-    </fb:struct>
+    </fb:group>
   </fb:class>
 
   <fb:class id="sql-parameter-class">
@@ -144,20 +144,20 @@
   <fb:class id="step-class">
     <fb:insert-node><step/>
 </fb:insert-node>
-    <fb:struct id="step" path="step">
+    <fb:group id="step" path="step">
       <fb:new id="id-class"/>
       <fb:new id="interaction-class"/>
-    </fb:struct>
+    </fb:group>
   </fb:class>
 
   <fb:class id="step-parameter-class">
     <fb:insert-node><parameter/>
 </fb:insert-node>
-    <fb:struct id="step-parameter" path="parameter">
+    <fb:group id="step-parameter" path="parameter">
       <fb:new id="id-class"/>
       <fb:new id="required-class"/>
       <fb:new id="datatype-id-class"/>
-    </fb:struct>
+    </fb:group>
   </fb:class>
 
   <fb:class id="view-selector-class">

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_model.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_model.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_model.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_model.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_model.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_model.xml	Thu Dec  2 10:31:13 2004
@@ -122,78 +122,78 @@
           <fd:label>Type</fd:label>
           <fd:widgets>
 
-            <fd:struct id="column">
+            <fd:group id="column">
               <fd:label>Column</fd:label>
               <fd:widgets>
                 <fd:new id="id-class"/>
                 <fd:new id="field-class"/>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="columns">
+            <fd:group id="columns">
               <fd:label>Columns</fd:label>
               <fd:widgets>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
             <fd:new id="database-class"/>
 
-            <fd:struct id="dialect">
+            <fd:group id="dialect">
               <fd:label>Dialect</fd:label>
               <fd:widgets>
                 <fd:new id="types-class"/>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
             <fd:new id="flow-class"/>
 
-            <fd:struct id="interaction">
+            <fd:group id="interaction">
               <fd:label>Interaction</fd:label>
               <fd:widgets>
                 <fd:new id="label-class"/>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="link">
+            <fd:group id="link">
               <fd:label>link</fd:label>
               <fd:widgets>
                 <fd:new id="title-class"/>
                 <fd:new id="report-id-elem-class"/>
                 <fd:new id="link-parameter-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="links">
+            <fd:group id="links">
               <fd:label>Links</fd:label>
               <fd:widgets>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
             <fd:new id="output-class"/>
 
             <fd:new id="step-parameter-class"/>
 
-            <fd:struct id="sql">
+            <fd:group id="sql">
               <fd:label>Sql</fd:label>
               <fd:widgets>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="step">
+            <fd:group id="step">
               <fd:label>Step</fd:label>
               <fd:widgets>
                 <fd:new id="id-class"/>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="subreport">
+            <fd:group id="subreport">
               <fd:label>Subreport</fd:label>
               <fd:widgets>
                 <fd:new id="id-class"/>
@@ -204,28 +204,28 @@
                 <fd:new id="subreport-parameter-class"/>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="subreports">
+            <fd:group id="subreports">
               <fd:label>Subreports</fd:label>
               <fd:widgets>
                 <fd:new id="items-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="title">
+            <fd:group id="title">
               <fd:label>Title</fd:label>
               <fd:widgets>
                 <fd:new id="title-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
-            <fd:struct id="type">
+            <fd:group id="type">
               <fd:label>Type</fd:label>
               <fd:widgets>
                 <fd:new id="base-class"/>
               </fd:widgets>
-            </fd:struct>
+            </fd:group>
 
           </fd:widgets>
 
@@ -270,12 +270,12 @@
 
     <fd:class id="database-class">
       <fd:widgets>
-        <fd:struct id="database">
+        <fd:group id="database">
           <fd:label>Database</fd:label>
           <fd:widgets>
             <fd:new id="sql-class"/>
           </fd:widgets>
-        </fd:struct>
+        </fd:group>
       </fd:widgets>
     </fd:class>
 
@@ -422,12 +422,12 @@
 
     <fd:class id="output-class">
       <fd:widgets>
-        <fd:struct id="output">
+        <fd:group id="output">
           <fd:label>Output</fd:label>
           <fd:widgets>
             <fd:new id="database-class"/>
           </fd:widgets>
-        </fd:struct>
+        </fd:group>
       </fd:widgets>
     </fd:class>
 
@@ -468,12 +468,12 @@
 
     <fd:class id="sql-class">
       <fd:widgets>
-        <fd:struct id="sql">
+        <fd:group id="sql">
           <fd:label>Sql</fd:label>
           <fd:widgets>
             <fd:new id="dialect-class"/>
           </fd:widgets>
-        </fd:struct>
+        </fd:group>
       </fd:widgets>
     </fd:class>
 
@@ -488,26 +488,26 @@
 
     <fd:class id="step-class">
       <fd:widgets>
-        <fd:struct id="step">
+        <fd:group id="step">
           <fd:label>Step</fd:label>
           <fd:widgets>
             <fd:new id="id-class"/>
             <fd:new id="interaction-class"/>
           </fd:widgets>
-        </fd:struct>
+        </fd:group>
       </fd:widgets>
     </fd:class>
 
     <fd:class id="step-parameter-class">
       <fd:widgets>
-        <fd:struct id="step-parameter">
+        <fd:group id="step-parameter">
           <fd:label>Parameter</fd:label>
           <fd:widgets>
             <fd:new id="id-class"/>
             <fd:new id="required-class"/>
             <fd:new id="datatype-id-class"/>
           </fd:widgets>
-        </fd:struct>
+        </fd:group>
       </fd:widgets>
     </fd:class>
 

Modified: cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_template.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_template.xml?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_template.xml&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_template.xml&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_template.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/forms/xreport_template.xml	Thu Dec  2 10:31:13 2004
@@ -19,10 +19,6 @@
   xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
 
     <!--
-      CVS $Id: form_model_gui_template.xml,v 1.2 2004/04/12 14:05:09 tim Exp $
-    -->
-
-    <!--
     TODO: Add features to "items-class" (e.g. move-up, move-down, add-before, add-after).
     -->
 
@@ -106,18 +102,18 @@
           <!--
               <ft:union id="view">
                 <ft:case id="view">
-                  <ft:struct id="view">
-                  </ft:struct>
+                  <ft:group id="view">
+                  </ft:group>
                 </ft:case>
                 <ft:case id="edit">
-                  <ft:struct id="edit">
-                  </ft:struct>
+                  <ft:group id="edit">
+                  </ft:group>
                 </ft:case>
               </ft:union>
           -->
 
           <ft:case id="action">
-            <ft:struct id="action">
+            <ft:group id="action">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -128,11 +124,11 @@
                   <ft:new id="label-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="aggregatefield">
-            <ft:struct id="aggregatefield">
+            <ft:group id="aggregatefield">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -145,11 +141,11 @@
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="booleanfield">
-            <ft:struct id="booleanfield">
+            <ft:group id="booleanfield">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -160,11 +156,11 @@
                   <ft:new id="label-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="class">
-            <ft:struct id="class">
+            <ft:group id="class">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -175,11 +171,11 @@
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="field">
-            <ft:struct id="field">
+            <ft:group id="field">
               Hello
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
@@ -195,11 +191,28 @@
                   <ft:new id="required-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
+          </ft:case>
+
+          <ft:case id="group">
+            <ft:group id="group">
+              <ft:choose path="../../view-selector">
+                <ft:when value="view">
+                  <ft:new id="output-id-class"/>
+                  <ft:new id="output-label-class"/>
+                  <ft:new id="items-class"/>
+                </ft:when>
+                <ft:when value="edit">
+                  <ft:new id="id-class"/>
+                  <ft:new id="label-class"/>
+                  <ft:new id="items-class"/>
+                </ft:when>
+              </ft:choose>
+            </ft:group>
           </ft:case>
 
           <ft:case id="new">
-            <ft:struct id="new">
+            <ft:group id="new">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -208,11 +221,11 @@
                   <ft:new id="id-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="output">
-            <ft:struct id="output">
+            <ft:group id="output">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -223,11 +236,11 @@
                   <ft:new id="label-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="struct">
-            <ft:struct id="struct">
+            <ft:group id="struct">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -240,11 +253,11 @@
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="repeater">
-            <ft:struct id="repeater">
+            <ft:group id="repeater">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -259,11 +272,11 @@
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="row-action">
-            <ft:struct id="row-action">
+            <ft:group id="row-action">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -274,11 +287,11 @@
                   <ft:new id="label-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="submit">
-            <ft:struct id="submit">
+            <ft:group id="submit">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -289,11 +302,11 @@
                   <ft:new id="label-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
           <ft:case id="union">
-            <ft:struct id="union">
+            <ft:group id="union">
               <ft:choose path="../../view-selector">
                 <ft:when value="view">
                   <ft:new id="output-id-class"/>
@@ -306,7 +319,7 @@
                   <ft:new id="items-class"/>
                 </ft:when>
               </ft:choose>
-            </ft:struct>
+            </ft:group>
           </ft:case>
 
         </ft:union>
@@ -376,9 +389,9 @@
 
       <ft:class id="database-class">
         <b><ft:widget-label id="database"/>:</b>
-        <ft:struct id="database">
+        <ft:group id="database">
           <ft:new id="sql-class"/>
-        </ft:struct>
+        </ft:group>
       </ft:class>
 
       <ft:class id="datatype-id-class">
@@ -448,9 +461,9 @@
 
       <ft:class id="output-class">
         <b><ft:widget-label id="output"/>:</b>
-        <ft:struct id="output">
+        <ft:group id="output">
           <ft:new id="database-class"/>
-        </ft:struct>
+        </ft:group>
       </ft:class>
 
       <ft:class id="req-ds-type-class">
@@ -460,9 +473,9 @@
 
       <ft:class id="sql-class">
         <b><ft:widget-label id="sql"/>:</b>
-        <ft:struct id="sql">
+        <ft:group id="sql">
           <ft:new id="dialect-class"/>
-        </ft:struct>
+        </ft:group>
       </ft:class>
 
       <ft:class id="sql-parameter-class">
@@ -472,19 +485,19 @@
 
       <ft:class id="step-class">
         <b><ft:widget-label id="step"/>:</b>
-        <ft:struct id="step">
+        <ft:group id="step">
           <ft:new id="id-class"/>
           <ft:new id="interaction-class"/>
-        </ft:struct>
+        </ft:group>
       </ft:class>
 
       <ft:class id="step-parameter-class">
         <b><ft:widget-label id="step-parameter"/>:</b>
-        <ft:struct id="step-parameter">
+        <ft:group id="step-parameter">
           <ft:new id="id-class"/>
           <ft:new id="required-class"/>
           <ft:new id="datatype-id-class"/>
-        </ft:struct>
+        </ft:group>
       </ft:class>
 
       <table border="3">

Added: cocoon/trunk/src/blocks/forms/samples/swan/resources/css/swan.css
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/resources/css/swan.css?view=auto&rev=109514
==============================================================================
--- (empty file)
+++ cocoon/trunk/src/blocks/forms/samples/swan/resources/css/swan.css	Thu Dec  2 10:31:13 2004
@@ -0,0 +1,46 @@
+/*
+* Copyright 1999-2004 The Apache Software Foundation
+*
+* 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
+*
+*     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.
+*/
+li {
+  list-style-type: none
+}
+
+/* The actions buttons, placed on the right */
+.actions {
+  float: right;
+  padding-top: 0.2em;
+}
+
+/* A "section" contains stuff, related actions and substuff */
+div.section {
+  padding-top: 0.4em;
+  padding-bottom: 0.4em;
+  padding-left: 0.4em;
+  border: 1px dotted black;
+  mmargin-top: 0.4em;
+  margin-bottom: -1px;
+}
+
+/* Indent sub-sections (recursively) */
+div.section div.section {
+  margin-left: 3em;
+  border-right: none;
+}
+
+/* Change bg color depending on nesting depth */
+div.section div.section { background-color: #F0F0F0; }
+div.section div.section div.section { background-color: #E0E0E0; }
+div.section div.section div.section div.section { background-color: #D0D0D0; }
+div.section div.section div.section div.section div.section { background-color: #C0C0C0; }

Added: cocoon/trunk/src/blocks/forms/samples/swan/resources/swan.xsl
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/resources/swan.xsl?view=auto&rev=109514
==============================================================================
--- (empty file)
+++ cocoon/trunk/src/blocks/forms/samples/swan/resources/swan.xsl	Thu Dec  2 10:31:13 2004
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  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
+
+      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.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!--+ Include styling stylesheets for the page and the widgets.
+      +-->
+  <xsl:include href="../../resources/forms-page-styling.xsl"/>
+  <xsl:include href="../../resources/forms-advanced-field-styling.xsl"/>
+
+  <xsl:template match="head">
+    <head>
+      <xsl:apply-templates/>
+      <xsl:apply-templates select="." mode="forms-page"/>
+      <xsl:apply-templates select="." mode="forms-field"/>
+      <link href="swan/resources/css/swan.css" type="text/css" rel="stylesheet"/>
+    </head>
+  </xsl:template>
+
+  <xsl:template match="body">
+    <body>
+      <!--+ !!! If template with mode 'forms-page' adds text or elements
+          |        template with mode 'forms-field' can no longer add attributes!!!
+          +-->
+      <xsl:apply-templates select="." mode="forms-page"/>
+      <xsl:apply-templates select="." mode="forms-field"/>
+      <xsl:apply-templates/>
+    </body>
+  </xsl:template>
+
+</xsl:stylesheet>

Modified: cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap?view=diff&rev=109514&p1=cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap&r1=109513&p2=cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap&r2=109514
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap	(original)
+++ cocoon/trunk/src/blocks/forms/samples/swan/sitemap.xmap	Thu Dec  2 10:31:13 2004
@@ -116,7 +116,7 @@
         <map:call resource="simple-page2html">
           <map:parameter name="file" value="forms/{1}_template.xml"/>
         </map:call>
-        <map:transform src="../resources/forms-samples-styling.xsl"/>
+        <map:transform src="resources/swan.xsl"/>
         <map:serialize/>
       </map:match>
  
@@ -143,6 +143,10 @@
 
       <map:match pattern="resources/**">
         <map:read src="../{0}"/>
+      </map:match>
+ 
+      <map:match pattern="swan/resources/**">
+        <map:read src="resources/{1}"/>
       </map:match>
  
       <!--

Mime
View raw message