svn commit: r1746421 - in /ofbiz/site/dtds: widget-form.xsd widget-screen.xsd

Author: jleroux
Date: Wed Jun  1 10:51:25 2016
New Revision: 1746421

URL: http://svn.apache.org/viewvc?rev=1746421&view=rev
Log:
Updates widget-form.xsd and widget-screen.xsd, especially because of the xls stuff in screen

Modified:
    ofbiz/site/dtds/widget-form.xsd
    ofbiz/site/dtds/widget-screen.xsd

Modified: ofbiz/site/dtds/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=1746421&r1=1746420&r2=1746421&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Wed Jun  1 10:51:25 2016
@@ -56,7 +56,7 @@ under the License.
                         </xs:enumeration>
                         <xs:enumeration value="list">
                             <xs:annotation>
-                                <xs:documentation>a list form is a list of individual forms in a table (could be called a tabular form), it has a list of sets of values and creates one form for each list element</xs:documentation>
+                                <xs:documentation>DEPRECATED use grid instead - a list form is a list of individual forms in a table (could be called a tabular form), it has a list of sets of values and creates one form for each list element</xs:documentation>
                             </xs:annotation>
                         </xs:enumeration>
                         <xs:enumeration value="multi">
@@ -293,6 +293,11 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:element name="grid">
+        <xs:annotation>
+            <xs:documentation>
+                a list of individual forms in a table (could be called a tabular form), it has a list of sets of values and creates one form for each list element
+            </xs:documentation>
+        </xs:annotation>
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="0" ref="actions" />
@@ -306,33 +311,6 @@ under the License.
                 <xs:element minOccurs="0" ref="sort-order" />
             </xs:sequence>
             <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>
-                    <xs:restriction base="xs:token">
-                        <xs:enumeration value="single">
-                            <xs:annotation>
-                                <xs:documentation>a single form is a simple single form with values from a single set of values</xs:documentation>
-                            </xs:annotation>
-                        </xs:enumeration>
-                        <xs:enumeration value="list">
-                            <xs:annotation>
-                                <xs:documentation>a list form is a list of individual forms in a table (could be called a tabular form), it has a list of sets of values and creates one form for each list element</xs:documentation>
-                            </xs:annotation>
-                        </xs:enumeration>
-                        <xs:enumeration value="multi">
-                            <xs:annotation>
-                                <xs:documentation>a multi form is like a list/tabular form, but it creates a single form to submit all list item forms at once; the field names in the resulting form have an appendage attached to make them unique according to the pattern used for the multi-service
-                                    event handler that will call one service for each list element</xs:documentation>
-                            </xs:annotation>
-                        </xs:enumeration>
-                        <xs:enumeration value="upload">
-                        </xs:enumeration>
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:attribute>
             <xs:attribute name="target" type="xs:string" />
             <xs:attribute name="target-window" type="xs:string" />
             <xs:attribute name="target-type" default="intra-app">
@@ -1621,6 +1599,11 @@ under the License.
                     </xs:restriction>
                 </xs:simpleType>
             </xs:attribute>
+            <xs:attribute name="placeholder" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Specifies a short hint that describes the expected value of an input field.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
         </xs:complexType>
     </xs:element>
     <xs:element name="textarea" substitutionGroup="AllFields">

Modified: ofbiz/site/dtds/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=1746421&r1=1746420&r2=1746421&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-screen.xsd (original)
+++ ofbiz/site/dtds/widget-screen.xsd Wed Jun  1 10:51:25 2016
@@ -573,6 +573,7 @@ under the License.
                 <xs:element minOccurs="0" ref="xml" />
                 <xs:element minOccurs="0" ref="text" />
                 <xs:element minOccurs="0" ref="csv" />
+                <xs:element minOccurs="0" ref="xls" />
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -596,6 +597,13 @@ under the License.
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="xls">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets" />
             </xs:sequence>
         </xs:complexType>
     </xs:element>