svn commit: r1844697 - /ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-theme.xsd

[jnicolas]

Author: jnicolas
Date: Tue Oct 23 20:11:00 2018
New Revision: 1844697

URL: http://svn.apache.org/viewvc?rev=1844697&view=rev
Log:
fixed: Change the Menu extends-resource management to allow structure changes by themes

(OFBIZ-10600)

Fixed the lack of menu theme definition in the xsd file

Thanks: To Jacques Le Roux for being more attentive to the log file than I have been ;)

Modified:
    ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-theme.xsd

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-theme.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-theme.xsd?rev=1844697&r1=1844696&r2=1844697&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-theme.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-theme.xsd Tue Oct 23 20:11:00 2018
@@ -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-menus"/>
             </xs:sequence>
             <xs:attribute type="xs:string" name="name" use="required" />
         </xs:complexType>
@@ -201,11 +202,22 @@ under the License.
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:element name="root-decorator">
+    <xs:element name="common-menus">
+        <xs:annotation><xs:documentation>
+            List the location of each common menus that the theme implement
+        </xs:documentation></xs:annotation>
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="unbounded" ref="screen" />
+                <xs:element ref="root-decorator" />
             </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="root-decorator">
+        <xs:complexType>
+            <xs:choice>
+                <xs:element maxOccurs="unbounded" ref="screen"/>
+                <xs:element maxOccurs="unbounded" ref="menu"/>
+            </xs:choice>
             <xs:attribute type="xs:string" name="default-location" use="optional" />
         </xs:complexType>
     </xs:element>
@@ -229,6 +241,12 @@ under the License.
         <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"/>
+            <xs:attribute type="xs:string" name="location" use="optional"/>
         </xs:complexType>
     </xs:element>