svn commit: r689843 - in /ofbiz/site/dtds: simple-methods.xsd widget-form.xsd widget-screen.xsd widget-tree.xsd

[hansbak-2]

Author: hansbak
Date: Thu Aug 28 07:47:55 2008
New Revision: 689843

URL: http://svn.apache.org/viewvc?rev=689843&view=rev
Log:
xsd updated for ignore flag

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

Modified: ofbiz/site/dtds/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods.xsd?rev=689843&r1=689842&r2=689843&view=diff
==============================================================================
--- ofbiz/site/dtds/simple-methods.xsd (original)
+++ ofbiz/site/dtds/simple-methods.xsd Thu Aug 28 07:47:55 2008
@@ -2643,6 +2643,14 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="ignore" default="false">
+            <xs:annotation>
+                <xs:documentation>
+                    Ignore the condition if flag is true.
+                    Defaults to false.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="condition-object">
         <xs:annotation>
@@ -4908,7 +4916,7 @@
                 The type of fields or value is Timestamp.
                 
                 Again you can use the flexible string expander here, the ${} syntax and such. It can also do a type conversion,
-                so going from whatever type the source data is in,which would be a string value or whatever the variable
+                so going from whatever type the source data is in, which would be a string value or whatever the variable
                 type is for a from field, it can convert that to any ofthese types before setting it in the target field.                                
                 
                 You can also specify a default value in the case that the value evaluates to an empty string or the from-field is
@@ -4986,52 +4994,59 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:integer" name="years">
+        <xs:attribute type="xs:string" name="years">
             <xs:annotation>
                 <xs:documentation>
-                    Add (optionally using +) or subtract (using -) a number of year(s)
+                    Add (optionally using +) or subtract (using -) a number of year(s).
+                    If an expression is used, it should evaluate to an integer.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:integer" name="months">
+        <xs:attribute type="xs:string" name="months">
             <xs:annotation>
                 <xs:documentation>
-                    Add (optionally using +) or subtract (using -) a number of month(s)
+                    Add (optionally using +) or subtract (using -) a number of month(s).
+                    If an expression is used, it should evaluate to an integer.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:integer" name="days">
+        <xs:attribute type="xs:string" name="days">
             <xs:annotation>
                 <xs:documentation>
-                    Add (optionally using +) or subtract (using -) a number of days(s)
+                    Add (optionally using +) or subtract (using -) a number of days(s).
+                    If an expression is used, it should evaluate to an integer.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:integer" name="hours">
+        <xs:attribute type="xs:string" name="hours">
             <xs:annotation>
                 <xs:documentation>
-                    Add (optionally using +) or subtract (using -) a number of hour(s)
+                    Add (optionally using +) or subtract (using -) a number of hour(s).
+                    If an expression is used, it should evaluate to an integer.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:integer" name="minutes">
+        <xs:attribute type="xs:string" name="minutes">
             <xs:annotation>
                 <xs:documentation>
-                    Add (optionally using +) or subtract (using -) a number of minute(s)
+                    Add (optionally using +) or subtract (using -) a number of minute(s).
+                    If an expression is used, it should evaluate to an integer.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:integer" name="seconds">
+        <xs:attribute type="xs:string" name="seconds">
             <xs:annotation>
                 <xs:documentation>
-                    Add (optionally using +) or subtract (using -) a number of second(s)
+                    Add (optionally using +) or subtract (using -) a number of second(s).
+                    If an expression is used, it should evaluate to an integer.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:integer" name="millis">
+        <xs:attribute type="xs:string" name="millis">
             <xs:annotation>
                 <xs:documentation>
-                    Add (optionally using +) or subtract (using -) a number of milli-second(s)
+                    Add (optionally using +) or subtract (using -) a number of milli-second(s).
+                    If an expression is used, it should evaluate to an integer.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>

Modified: ofbiz/site/dtds/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=689843&r1=689842&r2=689843&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Thu Aug 28 07:47:55 2008
@@ -485,6 +485,26 @@
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute type="xs:string" name="default-value"/>
+        <xs:attribute name="default-option-from" default="equals">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="equals"/>
+                    <xs:enumeration value="sameDay"/>
+                    <xs:enumeration value="greaterThanFromDayStart"/>
+                    <xs:enumeration value="greaterThan"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="default-option-thru" default="lessThan">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="lessThan"/>
+                    <xs:enumeration value="upToDay"/>
+                    <xs:enumeration value="upThruDay"/>
+                    <xs:enumeration value="empty"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="date-time" substitutionGroup="AllFields">
         <xs:annotation>
@@ -527,6 +547,9 @@
     </xs:attributeGroup>
     <xs:element name="display" substitutionGroup="AllFields">
         <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="in-place-editor" minOccurs="0" maxOccurs="1"/>
+            </xs:sequence>
             <xs:attributeGroup ref="attlist.display"/>
         </xs:complexType>
     </xs:element>
@@ -592,6 +615,7 @@
     <xs:element name="drop-down" substitutionGroup="AllFields">
         <xs:complexType>
             <xs:sequence>
+                <xs:element ref="auto-complete" minOccurs="0" maxOccurs="1"/>
                 <xs:choice minOccurs="0" maxOccurs="unbounded">
                     <xs:element ref="entity-options"/>
                     <xs:element ref="list-options"/>
@@ -603,15 +627,6 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.drop-down">
-        <xs:attribute name="type" default="traditional">
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="traditional"/>
-                    <xs:enumeration value="auto-complete-server"/>
-                    <!-- <xs:enumeration value="auto-complete-client"/> something to consider for the future -->
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
         <xs:attribute name="allow-empty" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -812,6 +827,23 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="default-option-from" default="greaterThanEqualTo">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="equals"/>
+                    <xs:enumeration value="greaterThan"/>
+                    <xs:enumeration value="greaterThanEqualTo"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="default-option-thru" default="lessThanEqualTo">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="lessThan"/>
+                    <xs:enumeration value="lessThanEqualTo"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="reset" substitutionGroup="AllFields">
         <xs:complexType/>
@@ -971,6 +1003,49 @@
     </xs:attributeGroup>
 
     <!-- ================== FIELD SUB-ELEMENTS ==================== -->
+    <xs:element name="auto-complete">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.auto-complete"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.auto-complete">
+        <xs:attribute name="auto-select" default="false">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute type="xs:double" name="frequency" default="0.4"/>
+        <xs:attribute type="xs:positiveInteger" name="min-chars" default="1"/>
+        <xs:attribute type="xs:positiveInteger" name="choices" default="10"/>
+        <xs:attribute name="partial-search" default="true">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute type="xs:positiveInteger" name="partial-chars" default="2"/>
+        <xs:attribute name="ignore-case" default="true">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="full-search" default="false">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
     <xs:element name="entity-constraint">
         <xs:complexType>
             <xs:attributeGroup ref="attlist.entity-constraint"/>
@@ -1058,6 +1133,90 @@
     <xs:attributeGroup name="attlist.entity-order-by">
         <xs:attribute type="xs:string" name="field-name" use="required"/>
     </xs:attributeGroup>
+    <xs:element name="in-place-editor">
+        <xs:annotation>
+            <xs:documentation>Enables in place editon for the display field.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:choice minOccurs="1" maxOccurs="1">
+                    <xs:element ref="simple-editor"/>
+                </xs:choice>
+                <xs:element ref="field-map" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="attlist.in-place-editor"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.in-place-editor">
+        <xs:attribute name="url" type="xs:string" use="required"/>
+        <xs:attribute name="cancel-control">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="link"/>
+                    <xs:enumeration value="button"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="cancel-text" type="xs:string"/>
+        <xs:attribute name="click-to-edit-text" type="xs:string"/>
+        <xs:attribute name="field-post-creation">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="activate"/>
+                    <xs:enumeration value="focus"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="form-class-name" type="xs:string"/>
+        <xs:attribute name="form-id" type="xs:string"/>
+        <xs:attribute name="highlight-color" type="xs:string"/>
+        <xs:attribute name="highlight-end-color" type="xs:string"/>
+        <xs:attribute name="hover-class-name" type="xs:string"/>
+        <xs:attribute name="html-response" default="false">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="false"/>
+                    <xs:enumeration value="true"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="loading-class-name" type="xs:string"/>
+        <xs:attribute name="loading-text" type="xs:string"/>
+        <xs:attribute name="ok-control">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="link"/>
+                    <xs:enumeration value="button"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="ok-text" type="xs:string"/>
+        <xs:attribute name="param-name" type="xs:string"/>
+        <xs:attribute name="saving-class-name" type="xs:string"/>
+        <xs:attribute name="saving-text" type="xs:string"/>
+        <xs:attribute name="submit-on-blur">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="false"/>
+                    <xs:enumeration value="true"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="text-after-controls" type="xs:string"/>
+        <xs:attribute name="text-before-controls" type="xs:string"/>
+        <xs:attribute name="text-between-controls" type="xs:string"/>
+        <xs:attribute name="update-after-request-call" default="true">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="false"/>
+                    <xs:enumeration value="true"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
     <xs:element name="list-options">
         <xs:annotation>
             <xs:documentation>list-options will create options based on data in a list</xs:documentation>
@@ -1106,6 +1265,15 @@
             <xs:annotation><xs:documentation>What the user will see in the widget; defaults to the value of the key attribute.</xs:documentation></xs:annotation>
         </xs:attribute>
     </xs:attributeGroup>
+    <xs:element name="simple-editor">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.simple-editor"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.simple-editor">
+        <xs:attribute name="rows" type="xs:positiveInteger" default="1"/>
+        <xs:attribute name="cols" type="xs:positiveInteger" default="40"/>
+    </xs:attributeGroup>
     <xs:element name="sub-hyperlink">
         <xs:complexType>
             <xs:attributeGroup ref="attlist.sub-hyperlink"/>
@@ -1426,6 +1594,14 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="ignore" default="false">
+            <xs:annotation>
+                <xs:documentation>
+                    Ignore the condition if flag is true.
+                    Defaults to false.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="condition-list">
         <xs:complexType>

Modified: ofbiz/site/dtds/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=689843&r1=689842&r2=689843&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-screen.xsd (original)
+++ ofbiz/site/dtds/widget-screen.xsd Thu Aug 28 07:47:55 2008
@@ -669,6 +669,14 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="ignore" default="false">
+            <xs:annotation>
+                <xs:documentation>
+                    Ignore the condition if flag is true.
+                    Defaults to false.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="condition-object">
         <xs:complexType>
@@ -766,6 +774,16 @@
             </xs:annotation>
         </xs:attribute>
     </xs:attributeGroup>
+    <xs:element name="horizontal-separator" substitutionGroup="AllWidgets">
+        <xs:complexType mixed="true">
+            <xs:attributeGroup ref="attlist.horizontal-separator"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.horizontal-separator">
+        <xs:attribute type="xs:string" name="id"/>
+        <xs:attribute type="xs:string" name="name"/>
+        <xs:attribute type="xs:string" name="style"/>
+    </xs:attributeGroup>
     <xs:element name="image" substitutionGroup="AllWidgets">
         <xs:complexType mixed="true">
             <xs:attributeGroup ref="attlist.image"/>
@@ -861,12 +879,8 @@
         <xs:attribute type="xs:string" name="title">
             <xs:annotation><xs:documentation>Title text to be placed in the screenlet title bar.</xs:documentation></xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="id">
-            <xs:annotation><xs:documentation>Collapsible screenlets must have a name or ID.</xs:documentation></xs:annotation>
-        </xs:attribute>
-        <xs:attribute type="xs:string" name="name">
-            <xs:annotation><xs:documentation>Collapsible screenlets must have a name or ID.</xs:documentation></xs:annotation>
-        </xs:attribute>
+        <xs:attribute type="xs:string" name="id"/>
+        <xs:attribute type="xs:string" name="name"/>
         <xs:attribute name="collapsible" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">

Modified: ofbiz/site/dtds/widget-tree.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-tree.xsd?rev=689843&r1=689842&r2=689843&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-tree.xsd (original)
+++ ofbiz/site/dtds/widget-tree.xsd Thu Aug 28 07:47:55 2008
@@ -504,6 +504,14 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="ignore" default="false">
+            <xs:annotation>
+                <xs:documentation>
+                    Ignore the condition if flag is true.
+                    Defaults to false.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
 
     <!-- ================ CONDITIONS ================ -->