svn commit: r1701151 - in /ofbiz/site/dtds: site-conf.xsd widget-common.xsd widget-form.xsd

Author: jleroux
Date: Fri Sep  4 03:54:31 2015
New Revision: 1701151

URL: http://svn.apache.org/r1701151
Log:
Updates DTDs

Modified:
    ofbiz/site/dtds/site-conf.xsd
    ofbiz/site/dtds/widget-common.xsd
    ofbiz/site/dtds/widget-form.xsd

Modified: ofbiz/site/dtds/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/site-conf.xsd?rev=1701151&r1=1701150&r2=1701151&view=diff
==============================================================================
--- ofbiz/site/dtds/site-conf.xsd (original)
+++ ofbiz/site/dtds/site-conf.xsd Fri Sep  4 03:54:31 2015
@@ -423,7 +423,7 @@ under the License.
             <xs:annotation>
                 <xs:documentation>
                     There are as much as types (of type request) as available defined and accessible event handlers.
-                    Most used are java, service, service-multi, simple and bsf (or groovy).
+                    Most used are java, service, service-multi, simple and groovy (or bsf).
                     A most comprehensive list can be found in the common-controller.
                 </xs:documentation>
             </xs:annotation>

Modified: ofbiz/site/dtds/widget-common.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-common.xsd?rev=1701151&r1=1701150&r2=1701151&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-common.xsd (original)
+++ ofbiz/site/dtds/widget-common.xsd Fri Sep  4 03:54:31 2015
@@ -583,11 +583,11 @@ under the License.
             <xs:element minOccurs="0" name="image" type="image" />
         </xs:sequence>
         <xs:attribute type="xs:string" name="text" />
-        <xs:attribute type="xs:string" name="id" >
+        <xs:attribute type="xs:string" name="id">
             <xs:annotation>
-                 <xs:documentation>
-                     If you use id for link present in list form or multi form, you can use ${itemIndex} to generate an unique id by line.
-                 </xs:documentation>
+                <xs:documentation>
+                    If you use id for link present in list form or multi form, you can use ${itemIndex} to generate an unique id by line.
+                </xs:documentation>
             </xs:annotation>
         </xs:attribute>
         <xs:attribute type="xs:string" name="style" />
@@ -652,6 +652,22 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="request-confirmation" default="false">
+            <xs:annotation>
+                <xs:documentation>If true then the user is presented with a dialog box, if confirmation-message is empty, use default</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="confirmation-message" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>The message displayed in confirmation box</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:complexType>
     <xs:complexType name="image" mixed="true">
         <xs:attribute type="xs:string" name="src" />

Modified: ofbiz/site/dtds/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=1701151&r1=1701150&r2=1701151&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Fri Sep  4 03:54:31 2015
@@ -1263,22 +1263,6 @@ under the License.
                         <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 name="request-confirmation" default="false">
-                    <xs:annotation>
-                        <xs:documentation>If true then the user is presented with a dialog box, if confirmation-message is empty, use default</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="confirmation-message" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>The message displayed in confirmation box</xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
                 <xs:attribute name="also-hidden" default="true">
                     <xs:annotation>
                         <xs:documentation>If set to true, an hidden form field is also rendered, with the name of the field and its content.</xs:documentation>
@@ -1841,7 +1825,7 @@ under the License.
                     <xs:documentation>The name of the field in the looked up entity that will be used for the key value; if empty defaults to the entry-name of the field this is in.</xs:documentation>
                 </xs:annotation>
             </xs:attribute>
-            <xs:attribute type="xs:string" name="description" use="required">
+            <xs:attribute type="xs:string" name="description" default="${description}">
                 <xs:annotation>
                     <xs:documentation>Will be presented to the user with field values substituted using the ${} syntax.</xs:documentation>
                 </xs:annotation>
@@ -1980,7 +1964,7 @@ under the License.
                 </xs:documentation>
                 </xs:annotation>
             </xs:attribute>
-            <xs:attribute type="xs:string" name="description">
+            <xs:attribute type="xs:string" name="description" default="${description}">
                 <xs:annotation>
                     <xs:documentation>Will be presented to the user with field values substituted using the ${} syntax.</xs:documentation>
                 </xs:annotation>