diff --git a/doc/etemplate2-rng.php b/doc/etemplate2-rng.php index 0a575615fd..ea6949aa22 100755 --- a/doc/etemplate2-rng.php +++ b/doc/etemplate2-rng.php @@ -60,6 +60,7 @@ $overwrites = [ '.attrs' => [ 'placeholder' => 'string', 'maxlength' => 'int', + 'size' => 'int', ], ], 'Et2InvokerMixin' => 'Et2TextBox', @@ -73,6 +74,7 @@ $overwrites = [ 'maxlength' => 'int', 'rows' => 'int', 'resizeRatio' => 'number', // is this correct + 'size' => 'int', ], ], 'et2-date' => [ @@ -136,6 +138,9 @@ $overwrites = [ 'allowFreeEntries' => 'boolean', ], ], + 'et2-select' => [ + '.children' => ['.quantity' => 'zeroOrMore', 'option'], + ], 'et2-email' => [ '.attrs' => [ 'onTagClick' => 'function', @@ -172,6 +177,7 @@ $missing_legacy_attributes = [ 'minWidth' => 'column', 'onchange' => 'customfields-types', 'onselect' => 'nextmatch', + 'value' => 'option', 'readonly' => 'customfields-types', 'sortmode' => [ '.values' => ['ASC', 'DESC'], @@ -179,7 +185,7 @@ $missing_legacy_attributes = [ 'nextmatch-sortheader', ], 'span' => ['nextmatch', 'nextmatch-header', 'nextmatch-customfields', 'nextmatch-sortheader', 'customfields-types'], - 'statustext' => ['tab', 'customfields-types'], + 'statustext' => ['tab', 'customfields-types', 'option'], 'template' => ['.optional' => false, 'nextmatch'], 'tab' => 'customfields', ]; @@ -292,9 +298,11 @@ foreach($data['modules'] as $module) } else { - $list = $element->addChild('oneOrMore'); // zeroOrMore for e.g. empty boxes? + $children = (array)$overwrites[$export['name']]['.children']; + $list = $element->addChild($children['.quantity'] ?? 'oneOrMore'); // zeroOrMore for e.g. empty boxes? + unset($children['.quantity']); // add allowed children - foreach((array)$overwrites[$export['name']]['.children'] as $child) + foreach($children as $child) { $list->addChild('ref')->addAttribute('name', $child); } diff --git a/doc/etemplate2/etemplate2.0.dtd b/doc/etemplate2/etemplate2.0.dtd index 464df937d6..77a2ba71cd 100644 --- a/doc/etemplate2/etemplate2.0.dtd +++ b/doc/etemplate2/etemplate2.0.dtd @@ -452,7 +452,9 @@ + value CDATA #IMPLIED + value CDATA #IMPLIED + statustext CDATA #IMPLIED> @@ -2326,7 +2328,7 @@ span CDATA #IMPLIED slot CDATA #IMPLIED> - + @@ -2474,6 +2477,7 @@ slot CDATA #IMPLIED placeholder CDATA #IMPLIED maxlength CDATA #IMPLIED + size CDATA #IMPLIED tabindex CDATA #IMPLIED> @@ -2506,6 +2510,7 @@ slot CDATA #IMPLIED placeholder CDATA #IMPLIED maxlength CDATA #IMPLIED + size CDATA #IMPLIED tabindex CDATA #IMPLIED> @@ -2538,6 +2543,7 @@ slot CDATA #IMPLIED placeholder CDATA #IMPLIED maxlength CDATA #IMPLIED + size CDATA #IMPLIED tabindex CDATA #IMPLIED> @@ -2568,6 +2574,7 @@ slot CDATA #IMPLIED placeholder CDATA #IMPLIED maxlength CDATA #IMPLIED + size CDATA #IMPLIED tabindex CDATA #IMPLIED> @@ -2706,6 +2713,7 @@ slot CDATA #IMPLIED placeholder CDATA #IMPLIED maxlength CDATA #IMPLIED + size CDATA #IMPLIED tabindex CDATA #IMPLIED> @@ -2737,6 +2745,7 @@ emailDisplay CDATA #IMPLIED placeholder CDATA #IMPLIED maxlength CDATA #IMPLIED + size CDATA #IMPLIED tabindex CDATA #IMPLIED> @@ -2767,6 +2776,7 @@ slot CDATA #IMPLIED placeholder CDATA #IMPLIED maxlength CDATA #IMPLIED + size CDATA #IMPLIED tabindex CDATA #IMPLIED> @@ -2797,6 +2807,7 @@ slot CDATA #IMPLIED placeholder CDATA #IMPLIED maxlength CDATA #IMPLIED + size CDATA #IMPLIED tabindex CDATA #IMPLIED> diff --git a/doc/etemplate2/etemplate2.0.rng b/doc/etemplate2/etemplate2.0.rng index 950d82f138..51c1ad8999 100644 --- a/doc/etemplate2/etemplate2.0.rng +++ b/doc/etemplate2/etemplate2.0.rng @@ -1579,6 +1579,12 @@ + + + + + + @@ -8820,7 +8826,9 @@ - + + + @@ -9289,6 +9297,9 @@ + + + @@ -9423,6 +9434,9 @@ + + + @@ -9557,6 +9571,9 @@ + + + @@ -9697,6 +9714,9 @@ + + + @@ -9819,6 +9839,9 @@ + + + @@ -10403,6 +10426,9 @@ + + + @@ -10528,6 +10554,9 @@ + + + @@ -10650,6 +10679,9 @@ + + + @@ -10772,6 +10804,9 @@ + + +