You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2020/02/21 09:22:49 UTC

[ofbiz-site] branch master updated: Improved: update dtds/widget-theme.xsd to synchronize it with the commit 38f972a0d0c0865b1d6fc5cf7bc71c50b4873355

This is an automated email from the ASF dual-hosted git repository.

nmalin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 058af0d  Improved: update dtds/widget-theme.xsd to synchronize it with the commit 38f972a0d0c0865b1d6fc5cf7bc71c50b4873355
058af0d is described below

commit 058af0d40cb60fa021710ba92dc8edef7ea7edb7
Author: Nicolas Malin <ni...@nereide.fr>
AuthorDate: Fri Feb 21 10:22:34 2020 +0100

    Improved: update dtds/widget-theme.xsd
    to synchronize it with the commit 38f972a0d0c0865b1d6fc5cf7bc71c50b4873355
---
 dtds/widget-theme.xsd | 58 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/dtds/widget-theme.xsd b/dtds/widget-theme.xsd
index 40fd549..3362cef 100644
--- a/dtds/widget-theme.xsd
+++ b/dtds/widget-theme.xsd
@@ -27,6 +27,7 @@ under the License.
                 <xs:element minOccurs="0" maxOccurs="1" ref="theme-properties"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="templates"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="common-screens"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="common-forms"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="common-menus"/>
             </xs:sequence>
             <xs:attribute type="xs:string" name="name" use="required" />
@@ -125,9 +126,9 @@ under the License.
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-        <xs:annotation><xs:documentation>
-            This element contains all properties dedicate with the theme technology
-        </xs:documentation></xs:annotation>
+    <xs:annotation><xs:documentation>
+        This element contains all properties dedicate with the theme technology
+    </xs:documentation></xs:annotation>
     <xs:element name="property">
         <xs:complexType>
             <xs:attribute type="xs:string" name="name" use="required">
@@ -146,9 +147,9 @@ under the License.
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-        <xs:annotation><xs:documentation>
-            This element contains all ftl macro template supported by this theme
-        </xs:documentation></xs:annotation>
+    <xs:annotation><xs:documentation>
+        This element contains all ftl macro template supported by this theme
+    </xs:documentation></xs:annotation>
     <xs:element name="template">
         <xs:complexType>
             <xs:sequence>
@@ -163,20 +164,20 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:element name="template-file">
-    <xs:complexType>
-        <xs:attribute name="widget" use="required" >
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="screen" />
-                    <xs:enumeration value="form" />
-                    <xs:enumeration value="tree" />
-                    <xs:enumeration value="menu" />
-                    <xs:enumeration value="error" />
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute type="xs:string" name="location" use="required"/>
-    </xs:complexType>
+        <xs:complexType>
+            <xs:attribute name="widget" use="required" >
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="screen" />
+                        <xs:enumeration value="form" />
+                        <xs:enumeration value="tree" />
+                        <xs:enumeration value="menu" />
+                        <xs:enumeration value="error" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="location" use="required"/>
+        </xs:complexType>
     </xs:element>
     <xs:element name="common-screens">
         <xs:annotation><xs:documentation>
@@ -190,6 +191,16 @@ under the License.
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="common-forms">
+        <xs:annotation><xs:documentation>
+            List the location of each common forms that the theme implement
+        </xs:documentation></xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="root-decorator" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="common-menus">
         <xs:annotation><xs:documentation>
             List the location of each common menus that the theme implement
@@ -204,6 +215,7 @@ under the License.
         <xs:complexType>
             <xs:choice>
                 <xs:element maxOccurs="unbounded" ref="screen"/>
+                <xs:element maxOccurs="unbounded" ref="form"/>
                 <xs:element maxOccurs="unbounded" ref="menu"/>
             </xs:choice>
             <xs:attribute type="xs:string" name="default-location" use="optional" />
@@ -231,6 +243,12 @@ under the License.
             <xs:attribute type="xs:string" name="location" use="optional"/>
         </xs:complexType>
     </xs:element>
+    <xs:element name="form">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="name" use="required"/>
+            <xs:attribute type="xs:string" name="location" use="optional"/>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="menu">
         <xs:complexType>
             <xs:attribute type="xs:string" name="name" use="required"/>