svn commit: r763615 [3/3] - /ofbiz/site/dtds/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r763615 [3/3] - /ofbiz/site/dtds/

jacopoc
Modified: ofbiz/site/dtds/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/site-conf.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/site-conf.xsd (original)
+++ ofbiz/site/dtds/site-conf.xsd Thu Apr  9 12:09:58 2009
@@ -42,9 +42,9 @@
         <xs:annotation>
             <xs:documentation>
                 This includes all elements of the controller.xml file references.
-                
-                Note that if you define any of the event blocks in this file (the including file) they
-                will override (replace) the one in the included file, effectively emptying it. The event
+
+                Note that if you define any of the event blocks in this file (the including file) they
+                will override (replace) the one in the included file, effectively emptying it. The event
                 blocks are: firstvisit, preprocessor, postprocessor, after-login, and before-logout.
             </xs:documentation>
         </xs:annotation>
@@ -124,7 +124,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.default-request">
-        <xs:attribute type="xs:string" name="request-uri" use="required"/>        
+        <xs:attribute type="xs:string" name="request-uri" use="required"/>
     </xs:attributeGroup>
     <xs:element name="request-map">
         <xs:complexType>
@@ -193,7 +193,7 @@
                     <xs:enumeration value="false"/>
                 </xs:restriction>
             </xs:simpleType>
-        </xs:attribute>        
+        </xs:attribute>
         <xs:attribute name="external-view" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -217,9 +217,10 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.event">
-        <xs:attribute type="xs:string" name="type" use="required"/>
-        <xs:attribute type="xs:string" name="path"/>
-        <xs:attribute type="xs:string" name="invoke"/>
+        <xs:attribute name="type" type="xs:string" use="required"/>
+        <xs:attribute name="name" type="xs:string"/>
+        <xs:attribute name="path" type="xs:string"/>
+        <xs:attribute name="invoke" type="xs:string"/>
         <xs:attribute name="global-transaction" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -231,16 +232,21 @@
     </xs:attributeGroup>
     <xs:element name="response">
         <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="redirect-parameter"/>
+            </xs:sequence>
             <xs:attributeGroup ref="attlist.response"/>
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.response">
-        <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
         <xs:attribute name="type" use="required">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="none"/>
                     <xs:enumeration value="view"/>
+                    <xs:enumeration value="view-last"><xs:annotation><xs:documentation>Will use the view from the last request unless there is a saved from some previous request (using the save-last-view attribute).</xs:documentation></xs:annotation></xs:enumeration>
+                    <xs:enumeration value="view-home"><xs:annotation><xs:documentation>Will use the view from the last saved 'home' position (using the save-home-view attribute).</xs:documentation></xs:annotation></xs:enumeration>
                     <xs:enumeration value="request"/>
                     <xs:enumeration value="request-redirect"/>
                     <xs:enumeration value="request-redirect-noparam"/>
@@ -248,7 +254,46 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="value"/>
+        <xs:attribute name="value" type="xs:string"/>
+        <xs:attribute name="save-last-view" default="false">
+            <xs:annotation><xs:documentation>Saves the last (previous) request's view for future use, generally with the view-last type of response.</xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="save-current-view" default="false">
+            <xs:annotation><xs:documentation>Saves the current request's view for future use, generally with the view-last type of response.</xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="save-home-view" default="false">
+            <xs:annotation><xs:documentation>Saves the current request's view for future use, generally with the view-home type of response.</xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    <xs:element name="redirect-parameter">
+        <xs:annotation><xs:documentation>Adds a parameter with the given name to the redirect. Finds value in a request attribute if exists, or a request parameter if no attribute is found.</xs:documentation></xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.redirect-parameter"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.redirect-parameter">
+        <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute type="xs:string" name="from" use="optional">
+            <xs:annotation><xs:documentation>If specified used instead of the value of name for the key to find a request attribute or parameter.</xs:documentation></xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="view-map">
         <xs:complexType>

Modified: ofbiz/site/dtds/test-suite.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/test-suite.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/test-suite.xsd (original)
+++ ofbiz/site/dtds/test-suite.xsd Thu Apr  9 12:09:58 2009
@@ -36,9 +36,10 @@
     <!-- ELEMENTS start here -->
     <xs:element name="test-suite">
         <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="unbounded" ref="test-case"/>
-            </xs:sequence>
+            <xs:choice minOccurs="1" maxOccurs="unbounded">
+                <xs:element ref="test-case"/>
+                <xs:element ref="test-group"/>
+    </xs:choice>
             <xs:attributeGroup ref="attlist.test-suite"/>
         </xs:complexType>
     </xs:element>
@@ -57,6 +58,16 @@
     <xs:attributeGroup name="attlist.test-case">
         <xs:attribute type="xs:string" name="case-name" use="required"/>
     </xs:attributeGroup>
+    <xs:element name="test-group">
+        <xs:annotation><xs:documentation></xs:documentation></xs:annotation>
+        <xs:complexType>
+            <xs:group minOccurs="1" maxOccurs="unbounded" ref="AllTestCaseTypes"/>
+            <xs:attributeGroup ref="attlist.test-group"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.test-group">
+        <xs:attribute type="xs:string" name="case-name" use="required"/>
+    </xs:attributeGroup>
 
     <xs:element name="junit-test-suite" substitutionGroup="TestCaseTypes">
         <xs:annotation><xs:documentation>Used for JUnit test suites written as a Java class.</xs:documentation></xs:annotation>
@@ -78,7 +89,7 @@
     <xs:attributeGroup name="attlist.service-test">
         <xs:attribute type="xs:string" name="service-name" use="required"/>
     </xs:attributeGroup>
-    
+
     <xs:element name="simple-method-test" substitutionGroup="TestCaseTypes">
         <xs:complexType>
             <xs:attributeGroup ref="attlist.simple-method-test"/>
@@ -88,7 +99,7 @@
         <xs:attribute type="xs:string" name="location" use="required"/>
         <xs:attribute type="xs:string" name="name" use="required"/>
     </xs:attributeGroup>
-    
+
     <xs:element name="entity-xml" substitutionGroup="TestCaseTypes">
         <xs:complexType>
             <xs:attributeGroup ref="attlist.entity-xml"/>
@@ -105,7 +116,7 @@
             </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
-    
+
     <xs:element name="jython-test" substitutionGroup="TestCaseTypes">
         <xs:complexType>
             <xs:attributeGroup ref="attlist.jython-test"/>

Modified: ofbiz/site/dtds/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Thu Apr  9 12:09:58 2009
@@ -44,7 +44,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.form">
-        <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
         <xs:attribute name="type">
             <xs:annotation><xs:documentation>The form type is always required unless you are extending another form.</xs:documentation></xs:annotation>
             <xs:simpleType>
@@ -63,8 +63,8 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="target"/>
-        <xs:attribute type="xs:string" name="target-window"/>
+        <xs:attribute name="target" type="xs:string"/>
+        <xs:attribute name="target-window" type="xs:string"/>
         <xs:attribute name="target-type" default="intra-app">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -75,15 +75,15 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="id"/>
-        <xs:attribute type="xs:string" name="style"/>
-        <xs:attribute type="xs:string" name="focus-field-name"/>
-        <xs:attribute type="xs:string" name="title"/>
-        <xs:attribute type="xs:string" name="tooltip"/>
-        <xs:attribute type="xs:string" name="list-name">
+        <xs:attribute name="id" type="xs:string"/>
+        <xs:attribute name="style" type="xs:string"/>
+        <xs:attribute name="focus-field-name" type="xs:string"/>
+        <xs:attribute name="title" type="xs:string"/>
+        <xs:attribute name="tooltip" type="xs:string"/>
+        <xs:attribute name="list-name" type="xs:string">
             <xs:annotation><xs:documentation>for list type and other multiple data/form types this is the name of the list in the context to iterate over</xs:documentation></xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="list-entry-name">
+        <xs:attribute name="list-entry-name" type="xs:string">
             <xs:annotation><xs:documentation>if specified each list entry will be put in the context with this name; otherwise the list entry must be a Map and the entries in the Map will be put into the context by name</xs:documentation></xs:annotation>
         </xs:attribute>
         <!-- this is now deprecated, never made sense to separate anyway; use list-name instead <xs:attribute type="xs:string" name="list-iterator-name"/> -->
@@ -107,10 +107,10 @@
         </xs:attribute>
         <xs:attribute type="xs:string" name="default-sort-field-asc-style">
             <xs:annotation><xs:documentation>CSS style to used for form sort fields. Defaults to "sort-order-asc".</xs:documentation></xs:annotation>
-        </xs:attribute>
+        </xs:attribute>
         <xs:attribute type="xs:string" name="default-sort-field-desc-style">
             <xs:annotation><xs:documentation>CSS style to used for form sort fields. Defaults to "sort-order-desc".</xs:documentation></xs:annotation>
-        </xs:attribute>                  
+        </xs:attribute>
         <xs:attribute name="paginate" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -231,21 +231,21 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.alt-target">
-        <xs:attribute type="xs:string" name="use-when" use="required"/>
-        <xs:attribute type="xs:string" name="target"/>
-        <xs:attribute type="xs:string" name="target-type"/>
+        <xs:attribute name="use-when" type="xs:string" use="required"/>
+        <xs:attribute name="target" type="xs:string"/>
+        <xs:attribute name="target-type" type="xs:string"/>
     </xs:attributeGroup>
     <xs:element name="alt-row-style">
-        <xs:annotation><xs:documentation>Active a style on a line if the use-when condition is validate</xs:documentation></xs:annotation>            
+        <xs:annotation><xs:documentation>Active a style on a line if the use-when condition is validate</xs:documentation></xs:annotation>
         <xs:complexType>
             <xs:attributeGroup ref="attlist.alt-row-style"/>
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.alt-row-style">
-        <xs:attribute type="xs:string" name="use-when" use="required">
+        <xs:attribute name="use-when" type="xs:string" use="required">
             <xs:annotation><xs:documentation>Boolean expression tested for active the style on a line.</xs:documentation></xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="style" use="required">
+        <xs:attribute name="style" type="xs:string" use="required">
             <xs:annotation><xs:documentation>If use-when return true, concat this style to existing style of the line.</xs:documentation></xs:annotation>
         </xs:attribute>
     </xs:attributeGroup>
@@ -255,8 +255,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.auto-fields-service">
-        <xs:attribute type="xs:string" name="service-name" use="required"/>
-        <xs:attribute type="xs:string" name="map-name"/>
+        <xs:attribute name="service-name" type="xs:string" use="required"/>
+        <xs:attribute name="map-name" type="xs:string"/>
         <xs:attribute name="default-field-type" default="edit">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -267,7 +267,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:positiveInteger" name="default-position" default="1"/>
+        <xs:attribute name="default-position" type="xs:positiveInteger" default="1"/>
     </xs:attributeGroup>
     <xs:element name="auto-fields-entity">
         <xs:complexType>
@@ -275,8 +275,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.auto-fields-entity">
-        <xs:attribute type="xs:string" name="entity-name" use="required"/>
-        <xs:attribute type="xs:string" name="map-name"/>
+        <xs:attribute name="entity-name" type="xs:string" use="required"/>
+        <xs:attribute name="map-name" type="xs:string"/>
         <xs:attribute name="default-field-type" default="edit">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -323,7 +323,7 @@
         <xs:attribute type="xs:string" name="collapsible">
             <xs:annotation><xs:documentation>Indicate in this fields group is collapsible or not, false by default.</xs:documentation></xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="initially-collapsed">        
+        <xs:attribute type="xs:string" name="initially-collapsed">
             <xs:annotation><xs:documentation>Indicate in this fields group is initially collapsed or not, false by default. If set to true implies collapsible even if not set</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute type="xs:string" name="id">
@@ -353,7 +353,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.sort-field">
-        <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
     </xs:attributeGroup>
     <!-- ================== Form Events ==================== -->
     <xs:attributeGroup name="attlist.on-form-event-update-area">
@@ -365,8 +365,8 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="area-id" use="required"/>
-        <xs:attribute type="xs:string" name="area-target" use="required"/>
+        <xs:attribute name="area-id" type="xs:string" use="required"/>
+        <xs:attribute name="area-target" type="xs:string" use="required"/>
     </xs:attributeGroup>
     <xs:element name="on-event-update-area">
         <xs:annotation>
@@ -494,9 +494,9 @@
         </xs:attribute>
         <xs:attribute type="xs:string" name="required-field-style">
             <xs:annotation>
-                <xs:documentation>The name of a style (like a CSS class) to apply to the title of this field if required.
-                    Will default to form's default-required-field-style.
-                    If field is required, but required-field-style is empty, an '*' will be placed to the right of text,
+                <xs:documentation>The name of a style (like a CSS class) to apply to the title of this field if required.
+                    Will default to form's default-required-field-style.
+                    If field is required, but required-field-style is empty, an '*' will be placed to the right of text,
                     textarea and password fields.
                 </xs:documentation>
             </xs:annotation>
@@ -511,25 +511,25 @@
         </xs:attribute>
         <xs:attribute type="xs:string" name="sort-field-style">
             <xs:annotation>
-                <xs:documentation>The name of a style (like a CSS class) to apply to the sort field link.
+                <xs:documentation>The name of a style (like a CSS class) to apply to the sort field link.
                     Will default to form's default-sort-field-style.
                 </xs:documentation>
             </xs:annotation>
-        </xs:attribute>          
+        </xs:attribute>
         <xs:attribute type="xs:string" name="sort-field-asc-style">
             <xs:annotation>
-                <xs:documentation>The name of a style (like a CSS class) to apply to the sort field link ordered ascending.
+                <xs:documentation>The name of a style (like a CSS class) to apply to the sort field link ordered ascending.
                     Will default to form's default-sort-field-asc-style.
                 </xs:documentation>
             </xs:annotation>
-        </xs:attribute>  
+        </xs:attribute>
         <xs:attribute type="xs:string" name="sort-field-desc-style">
             <xs:annotation>
-                <xs:documentation>The name of a style (like a CSS class) to apply to the sort field link ordered descending.
+                <xs:documentation>The name of a style (like a CSS class) to apply to the sort field link ordered descending.
                     Will default to form's default-sort-field-desc-style.
                 </xs:documentation>
             </xs:annotation>
-        </xs:attribute>  
+        </xs:attribute>
     </xs:attributeGroup>
 
   <!-- ================== FIELD TYPES ==================== -->
@@ -782,6 +782,9 @@
     </xs:attributeGroup>
     <xs:element name="hyperlink" substitutionGroup="AllFields">
         <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>
+            </xs:sequence>
             <xs:attributeGroup ref="attlist.hyperlink"/>
         </xs:complexType>
     </xs:element>
@@ -795,6 +798,15 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="link-type" default="auto">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="auto"><xs:annotation><xs:documentation>If selected the hidden-form type will be used if the url-mode is intra-app and the request specified has an event, otherwise the anchor type will be used.</xs:documentation></xs:annotation></xs:enumeration>
+                    <xs:enumeration value="anchor"/>
+                    <xs:enumeration value="hidden-form"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
         <xs:attribute name="target-type" default="intra-app">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -812,6 +824,17 @@
             <xs:annotation><xs:documentation>Specifies the string to display, can use the ${} syntax to insert context values; if empty the value of the field will be printed for a default.</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute type="xs:string" name="target-window"/>
+        <xs:attribute type="xs:string" name="image-location"/>
+    </xs:attributeGroup>
+    <xs:element name="parameter">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.parameter"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.parameter">
+        <xs:attribute type="xs:string" name="param-name" use="required"/>
+        <xs:attribute type="xs:string" name="from-field"/>
+        <xs:attribute type="xs:string" name="value"/>
     </xs:attributeGroup>
     <xs:element name="ignored" substitutionGroup="AllFields">
         <xs:complexType/>
@@ -1360,12 +1383,24 @@
     </xs:attributeGroup>
     <xs:element name="sub-hyperlink">
         <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>
+            </xs:sequence>
             <xs:attributeGroup ref="attlist.sub-hyperlink"/>
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.sub-hyperlink">
         <xs:attribute type="xs:string" name="use-when"/>
         <xs:attribute type="xs:string" name="link-style"/>
+        <xs:attribute name="link-type" default="auto">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="auto"><xs:annotation><xs:documentation>If selected the hidden-form type will be used if the url-mode is intra-app and the request specified has an event, otherwise the anchor type will be used.</xs:documentation></xs:annotation></xs:enumeration>
+                    <xs:enumeration value="anchor"/>
+                    <xs:enumeration value="hidden-form"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
         <xs:attribute name="target-type" default="intra-app">
             <xs:simpleType>
                 <xs:restriction base="xs:token">

Modified: ofbiz/site/dtds/widget-menu.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-menu.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-menu.xsd (original)
+++ ofbiz/site/dtds/widget-menu.xsd Thu Apr  9 12:09:58 2009
@@ -153,6 +153,7 @@
     <xs:element name="link">
         <xs:complexType>
             <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>
                 <xs:element minOccurs="0" ref="image"/>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.link"/>
@@ -166,6 +167,15 @@
         <xs:attribute type="xs:string" name="target"/>
         <xs:attribute type="xs:string" name="target-window"/>
         <xs:attribute type="xs:string" name="prefix"/>
+        <xs:attribute name="link-type" default="auto">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="auto"><xs:annotation><xs:documentation>If selected the hidden-form type will be used if the url-mode is intra-app and the request specified has an event, otherwise the anchor type will be used.</xs:documentation></xs:annotation></xs:enumeration>
+                    <xs:enumeration value="anchor"/>
+                    <xs:enumeration value="hidden-form"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
         <xs:attribute name="url-mode" default="intra-app">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -201,6 +211,16 @@
             </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
+    <xs:element name="parameter">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.parameter"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.parameter">
+        <xs:attribute type="xs:string" name="param-name" use="required"/>
+        <xs:attribute type="xs:string" name="from-field"/>
+        <xs:attribute type="xs:string" name="value"/>
+    </xs:attributeGroup>
 
     <!-- ================ ACTIONS ================ -->
     <xs:element name="AllActions" abstract="true"/>
@@ -337,7 +357,7 @@
             <xs:annotation>
                 <xs:documentation>
                     If a disabled-style provided and the condition fails, the disabled-style of
-                    the parent menu-item is set with the disabled-style and processing is allowed to continue.
+                    the parent menu-item is set with the disabled-style and processing is allowed to continue.
                     If no disabled-style is given, the widget-style is not changed and the menu-item is not rendered.
                 </xs:documentation>
             </xs:annotation>

Modified: ofbiz/site/dtds/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-screen.xsd (original)
+++ ofbiz/site/dtds/widget-screen.xsd Thu Apr  9 12:09:58 2009
@@ -59,7 +59,7 @@
     <xs:attributeGroup name="attlist.section">
         <xs:attribute type="xs:string" name="name"/>
     </xs:attributeGroup>
-    
+
     <!-- ================ CONDITIONS ================ -->
     <xs:element name="AllConditionals" abstract="true"/>
     <xs:element name="condition">
@@ -796,7 +796,7 @@
         <xs:attribute type="xs:string" name="width"/>
         <xs:attribute type="xs:string" name="height"/>
         <xs:attribute type="xs:string" name="border"/>
-        <xs:attribute type="xs:string" name="alt"/>        
+        <xs:attribute type="xs:string" name="alt"/>
         <xs:attribute name="url-mode" default="content">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -820,6 +820,7 @@
     <xs:element name="link" substitutionGroup="AllWidgets">
         <xs:complexType>
             <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>
                 <xs:element minOccurs="0" ref="image"/>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.link"/>
@@ -833,6 +834,15 @@
         <xs:attribute type="xs:string" name="name"/>
         <xs:attribute type="xs:string" name="target-window"/>
         <xs:attribute type="xs:string" name="prefix"/>
+        <xs:attribute name="link-type" default="auto">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="auto"><xs:annotation><xs:documentation>If selected the hidden-form type will be used if the url-mode is intra-app and the request specified has an event, otherwise the anchor type will be used.</xs:documentation></xs:annotation></xs:enumeration>
+                    <xs:enumeration value="anchor"/>
+                    <xs:enumeration value="hidden-form"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
         <xs:attribute name="url-mode" default="intra-app">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -868,6 +878,17 @@
             </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
+    <xs:element name="parameter">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.parameter"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.parameter">
+        <xs:attribute type="xs:string" name="param-name" use="required"/>
+        <xs:attribute type="xs:string" name="from-field"/>
+        <xs:attribute type="xs:string" name="value"/>
+    </xs:attributeGroup>
+
     <xs:element name="screenlet" substitutionGroup="AllWidgets">
         <xs:complexType>
             <xs:sequence>