svn commit: r1686735 - in /ofbiz/site/dtds: SeoConfig.xsd widget-common.xsd widget-form.xsd widget-screen.xsd

Author: jleroux
Date: Sun Jun 21 14:51:53 2015
New Revision: 1686735

URL: http://svn.apache.org/r1686735
Log:
Updates DTDS

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

Modified: ofbiz/site/dtds/SeoConfig.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/SeoConfig.xsd?rev=1686735&r1=1686734&r2=1686735&view=diff
==============================================================================
--- ofbiz/site/dtds/SeoConfig.xsd (original)
+++ ofbiz/site/dtds/SeoConfig.xsd Sun Jun 21 14:51:53 2015
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:element name="seo-config">

Modified: ofbiz/site/dtds/widget-common.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-common.xsd?rev=1686735&r1=1686734&r2=1686735&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-common.xsd (original)
+++ ofbiz/site/dtds/widget-common.xsd Sun Jun 21 14:51:53 2015
@@ -583,7 +583,13 @@ 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:annotation>
+        </xs:attribute>
         <xs:attribute type="xs:string" name="style" />
         <xs:attribute type="xs:string" name="name" />
         <xs:attribute type="xs:string" name="title" />

Modified: ofbiz/site/dtds/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=1686735&r1=1686734&r2=1686735&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Sun Jun 21 14:51:53 2015
@@ -827,6 +827,15 @@ under the License.
             </xs:documentation>
                 </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="ignore-when" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        This attribute is defined to enable ignoring a field on a form of type list or multi,
+                        which is not possible using use-when attribute. Like use-when it should be written using java syntax.
+                        The condition should be evaluated in the form context without looking for data coming from list that feeds the form.
+                        </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="encode-output" default="true">
                 <xs:annotation>
                     <xs:documentation>
@@ -915,7 +924,8 @@ under the License.
             <xs:attribute type="xs:string" name="form-name">
                 <xs:annotation>
                     <xs:documentation>
-                        The name of the parent form, needed at least for lookups when using skip-start="true"
+                        The name of the parent form. This is needed for lookups of children forms.
+                        The parent form being the first form with skip-end="true" which precedes the children forms (with skip-start="true").
                         Must be set also on the related field if description-field-name is used.
                     </xs:documentation>
                 </xs:annotation>
@@ -1368,6 +1378,9 @@ under the License.
                 </xs:simpleType>
             </xs:attribute>
             <xs:attribute name="read-only" default="false">
+                <xs:annotation>
+                    <xs:documentation>Makes the input field related to this lookup read-only (no edits allowed)</xs:documentation>
+                </xs:annotation>
                 <xs:simpleType>
                     <xs:restriction base="xs:token">
                         <xs:enumeration value="true" />
@@ -1446,6 +1459,30 @@ under the License.
             </xs:attribute>
         </xs:complexType>
     </xs:element>
+    <xs:element name="include-menu" substitutionGroup="AllFields">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="name" use="required" />
+            <xs:attribute type="xs:string" name="location" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="include-form" substitutionGroup="AllFields">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="name" use="required" />
+            <xs:attribute type="xs:string" name="location" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="include-grid" substitutionGroup="AllFields">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="name" use="required" />
+            <xs:attribute type="xs:string" name="location" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="include-screen" substitutionGroup="AllFields">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="name" use="required" />
+            <xs:attribute type="xs:string" name="location" use="required" />
+        </xs:complexType>
+    </xs:element>
     <xs:element name="password" substitutionGroup="AllFields">
         <xs:complexType>
             <xs:sequence>
@@ -1586,12 +1623,24 @@ under the License.
                     <xs:documentation>Defines a customized input mask. Use 9 for numeric, a for alpha and * for alphanumeric character.</xs:documentation>
                 </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="read-only" default="false">
+                <xs:annotation>
+                    <xs:documentation>Makes this text field read-only (no edits allowed)</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:complexType>
     </xs:element>
     <xs:element name="textarea" substitutionGroup="AllFields">
         <xs:complexType>
             <xs:attribute type="xs:positiveInteger" name="cols" default="60" />
             <xs:attribute type="xs:positiveInteger" name="rows" default="3" />
+            <xs:attribute type="xs:positiveInteger" name="maxlength"/>
             <xs:attribute type="xs:string" name="default-value" />
             <xs:attribute name="read-only" default="false">
                 <xs:annotation>

Modified: ofbiz/site/dtds/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=1686735&r1=1686734&r2=1686735&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-screen.xsd (original)
+++ ofbiz/site/dtds/widget-screen.xsd Sun Jun 21 14:51:53 2015
@@ -571,6 +571,8 @@ under the License.
                 <xs:element minOccurs="0" ref="swing" />
                 <xs:element minOccurs="0" ref="xsl-fo" />
                 <xs:element minOccurs="0" ref="xml" />
+                <xs:element minOccurs="0" ref="text" />
+                <xs:element minOccurs="0" ref="csv" />
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -594,6 +596,20 @@ under the License.
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="text">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="csv">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="HtmlWidgets" />
             </xs:sequence>
         </xs:complexType>
     </xs:element>