From 9589b8414927019fdee182db0905f94c4c1dc1d6 Mon Sep 17 00:00:00 2001 From: ralf Date: Fri, 3 May 2024 08:00:16 +0200 Subject: [PATCH] some more dtd fixes/updates --- doc/etemplate2-rng.php | 2 + doc/etemplate2/etemplate2.0.dtd | 436 +++++++--- doc/etemplate2/etemplate2.0.rng | 1339 ++++++++++++++++++++++--------- 3 files changed, 1290 insertions(+), 487 deletions(-) diff --git a/doc/etemplate2-rng.php b/doc/etemplate2-rng.php index ea6949aa22..4ad443e3e2 100755 --- a/doc/etemplate2-rng.php +++ b/doc/etemplate2-rng.php @@ -131,6 +131,8 @@ $overwrites = [ 'noSubmit' => 'boolean', ], ], + 'Et2ButtonIcon' => 'Et2Button', // no inheritance from Et2Button, but Et2ButtonMixin, which is not recognised + 'Et2ButtonScroll' => 'Et2Button', 'Et2Select' => [ '.attrs' => [ 'rows' => 'int', diff --git a/doc/etemplate2/etemplate2.0.dtd b/doc/etemplate2/etemplate2.0.dtd index 77a2ba71cd..254acf8f8e 100644 --- a/doc/etemplate2/etemplate2.0.dtd +++ b/doc/etemplate2/etemplate2.0.dtd @@ -25,22 +25,23 @@ |tracker-value|records-value|hidden|radio|radiogroup|diff|styles|customfields|customfields-list|html |htmlarea|toolbar|historylog|hrule|file|progress|vfs|vfs-name|vfs-size|vfs-mode|vfs-upload|video |audio|barcode|itempicker|script|countdown|customfields-types|nextmatch|nextmatch-header - |nextmatch-customfields|nextmatch-sortheader|et2-avatar|et2-avatar-group|et2-lavatar|et2-checkbox - |et2-button|et2-button-icon|et2-button-scroll|et2-button-timestamp|et2-colorpicker|et2-description - |et2-label|et2-date|et2-date-duration|et2-date-range|et2-date-since|et2-date-time|et2-date-timeonly - |et2-date-time-today|et2-dialog|et2-dropdown-button|et2-email|et2-favorites|et2-iframe|et2-appicon - |et2-image|et2-link|et2-link-add|et2-link-apps|et2-link-entry|et2-link-list|et2-link-paste-dialog - |et2-link-search|et2-link-string|et2-link-to|et2-portlet|et2-listbox|et2-select|et2-spinner - |et2-switch|et2-textarea|et2-number|et2-password|et2-searchbox|et2-textbox|et2-tree - |et2-tree-dropdown|et2-tree-cat|et2-url|et2-url-email|et2-url-fax|et2-url-phone|et2-vfs-mime - |et2-vfs-path|et2-vfs-select|et2-vfs-select-dialog|et2-vfs-select-row|et2-vfs-uid|et2-vfs-gid - |et2-description-expose|et2-image-expose|et2-select-access|et2-select-account|et2-select-app - |et2-select-bitwise|et2-select-bool|et2-select-cat|et2-select-country|et2-select-day|et2-select-dow - |et2-select-hour|et2-select-lang|et2-select-month|et2-select-number|et2-select-percent - |et2-select-priority|et2-select-state|et2-select-tab|et2-select-thumbnail|et2-select-timezone - |et2-select-year|et2-category-tag|et2-email-tag|et2-tag|et2-thumbnail-tag|et2-box|et2-hbox|et2-vbox - |et2-details|et2-split|et2-tabbox|et2-nextmatch-columnselection|et2-nextmatch-header-account - |et2-nextmatch-header-custom|et2-nextmatch-header-entry|et2-nextmatch-header-filter"> + |nextmatch-customfields|nextmatch-sortheader|et2-avatar|et2-avatar-group|et2-lavatar|et2-button + |et2-button-icon|et2-button-scroll|et2-button-timestamp|et2-checkbox|et2-colorpicker|et2-date + |et2-date-duration|et2-date-range|et2-date-since|et2-date-time|et2-date-timeonly|et2-date-time-today + |et2-description|et2-label|et2-dialog|et2-dropdown-button|et2-email|et2-favorites|et2-iframe + |et2-appicon|et2-image|et2-link|et2-link-add|et2-link-apps|et2-link-entry|et2-link-list + |et2-link-paste-dialog|et2-link-search|et2-link-string|et2-link-to|et2-portlet|et2-listbox + |et2-select|et2-spinner|et2-switch|et2-textarea|et2-number|et2-password|et2-searchbox|et2-textbox + |et2-tree|et2-tree-dropdown|et2-tree-cat|et2-url|et2-url-email|et2-url-fax|et2-url-phone + |et2-vfs-mime|et2-vfs-path|et2-vfs-select|et2-vfs-select-dialog|et2-vfs-select-row|et2-vfs-uid + |et2-vfs-gid|et2-description-expose|et2-image-expose|et2-select-access|et2-select-account + |et2-select-app|et2-select-bitwise|et2-select-bool|et2-select-cat|et2-select-country|et2-select-day + |et2-select-dow|et2-select-hour|et2-select-lang|et2-select-month|et2-select-number + |et2-select-percent|et2-select-priority|et2-select-state|et2-select-tab|et2-select-thumbnail + |et2-select-timezone|et2-select-year|et2-category-tag|et2-email-tag|et2-tag|et2-thumbnail-tag + |et2-box|et2-hbox|et2-vbox|et2-details|et2-split|et2-tabbox|et2-nextmatch-columnselection + |et2-nextmatch-header-account|et2-nextmatch-header-custom|et2-nextmatch-header-entry + |et2-nextmatch-header-filter"> @@ -1384,34 +1385,6 @@ span CDATA #IMPLIED slot CDATA #IMPLIED> - - - - - - - - - - - - - + - + + + + + + + + - + - - - - - + tabindex CDATA #IMPLIED> @@ -1596,6 +1565,9 @@ onchange CDATA #IMPLIED autofocus (false|true|1) #IMPLIED autocomplete CDATA 'on' + ariaLabel CDATA #IMPLIED + ariaDescription CDATA #IMPLIED + helpText CDATA #IMPLIED class CDATA #IMPLIED disabled (false|true|1) 'false' hidden (false|true|1) #IMPLIED @@ -1632,6 +1604,9 @@ onchange CDATA #IMPLIED autofocus (false|true|1) #IMPLIED autocomplete CDATA 'on' + ariaLabel CDATA #IMPLIED + ariaDescription CDATA #IMPLIED + helpText CDATA #IMPLIED class CDATA #IMPLIED disabled (false|true|1) 'false' hidden (false|true|1) #IMPLIED @@ -1660,6 +1635,9 @@ onchange CDATA #IMPLIED autofocus (false|true|1) #IMPLIED autocomplete CDATA 'on' + ariaLabel CDATA #IMPLIED + ariaDescription CDATA #IMPLIED + helpText CDATA #IMPLIED class CDATA #IMPLIED disabled (false|true|1) 'false' hidden (false|true|1) #IMPLIED @@ -1708,6 +1686,9 @@ onchange CDATA #IMPLIED autofocus (false|true|1) #IMPLIED autocomplete CDATA 'on' + ariaLabel CDATA #IMPLIED + ariaDescription CDATA #IMPLIED + helpText CDATA #IMPLIED class CDATA #IMPLIED disabled (false|true|1) 'false' hidden (false|true|1) #IMPLIED @@ -1738,6 +1719,9 @@ onchange CDATA #IMPLIED autofocus (false|true|1) #IMPLIED autocomplete CDATA 'on' + ariaLabel CDATA #IMPLIED + ariaDescription CDATA #IMPLIED + helpText CDATA #IMPLIED class CDATA #IMPLIED disabled (false|true|1) 'false' hidden (false|true|1) #IMPLIED @@ -1780,6 +1764,58 @@ span CDATA #IMPLIED slot CDATA #IMPLIED> + + + + + + + + + allowFreeEntries (false|true|1) #IMPLIED> \ No newline at end of file diff --git a/doc/etemplate2/etemplate2.0.rng b/doc/etemplate2/etemplate2.0.rng index 51c1ad8999..3d508d82f5 100644 --- a/doc/etemplate2/etemplate2.0.rng +++ b/doc/etemplate2/etemplate2.0.rng @@ -66,14 +66,12 @@ - + - - @@ -81,6 +79,8 @@ + + @@ -4953,122 +4953,6 @@ - - - - - - - - - - - - - - - - - - - - false - true - 1 - - - - - - - false - true - 1 - - - - - - - - - - false - true - 1 - - - - - - - - - - - - - false - true - 1 - - - - - - - false - true - 1 - - - - - - - - - - - - - - - - - - - false - true - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5112,6 +4996,15 @@ + + + + + + + + + @@ -5235,146 +5128,13 @@ - + - - - false - true - 1 - - + - - - false - true - 1 - - - - - - - - - - - - - - - - - - - false - true - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - true - 1 - - - - - - - false - true - 1 - - - - - - - - - - false - true - 1 - - - - - + @@ -5455,13 +5215,57 @@ - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + false + true + 1 + + + + + + + + + + + + + + + + + + + + @@ -5498,6 +5302,152 @@ + + + + + + + + + + + + + + + + false + true + 1 + + + + + + + false + true + 1 + + + + + + + + + + + + + + + + + + + false + true + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + true + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + false + true + 1 + + + + + + + false + true + 1 + + + + + + + + + + false + true + 1 + + + + + + + + + + + + + + + @@ -5565,15 +5515,18 @@ - - - + + + - + - + + + + false true @@ -5582,16 +5535,37 @@ - + + + false + true + 1 + + - + - + + + false + true + 1 + + - + + + + + + + + + + @@ -5623,9 +5597,6 @@ - - - @@ -5660,102 +5631,7 @@ - - - - - - - - - - - - - - - - - false - true - 1 - - - - - - - false - true - 1 - - - - - - - - - - - - - - - - - - - - - - false - true - 1 - - - - - - - - - - - - - false - true - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -5825,6 +5701,15 @@ + + + + + + + + + @@ -5989,6 +5874,15 @@ + + + + + + + + + @@ -6111,6 +6005,15 @@ + + + + + + + + + @@ -6301,6 +6204,15 @@ + + + + + + + + + @@ -6435,6 +6347,15 @@ + + + + + + + + + @@ -6603,6 +6524,202 @@ + + + + + + + + + + + false + true + 1 + + + + + + + + + + + + + + + + + + + + + + + + + false + true + 1 + + + + + + + false + true + 1 + + + + + + + + + + + + + + + + + + + + + + false + true + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + true + 1 + + + + + + + false + true + 1 + + + + + + + + + + + + + + + + + + + + + + false + true + 1 + + + + + + + + + + + + + false + true + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6783,6 +6900,15 @@ + + + + + + + + + @@ -6941,6 +7067,15 @@ + + + + + + + + + @@ -7078,6 +7213,15 @@ + + + + + + + + + @@ -7577,6 +7721,15 @@ + + + + + + + + + @@ -7744,6 +7897,15 @@ + + + + + + + + + @@ -7893,6 +8055,15 @@ + + + + + + + + + @@ -8113,6 +8284,15 @@ + + + + + + + + + @@ -8307,6 +8487,15 @@ + + + + + + + + + @@ -8542,6 +8731,15 @@ + + + + + + + + + @@ -8759,6 +8957,15 @@ + + + + + + + + + @@ -8910,6 +9117,15 @@ + + + + + + + + + @@ -9112,6 +9328,15 @@ + + + + + + + + + @@ -9231,6 +9456,15 @@ + + + + + + + + + @@ -9359,6 +9593,15 @@ + + + + + + + + + @@ -9496,6 +9739,15 @@ + + + + + + + + + @@ -9639,6 +9891,15 @@ + + + + + + + + + @@ -9770,6 +10031,15 @@ + + + + + + + + + @@ -9931,6 +10201,15 @@ + + + + + + + + + @@ -10014,6 +10293,9 @@ + + + @@ -10071,6 +10353,15 @@ + + + + + + + + + @@ -10196,6 +10487,15 @@ + + + + + + + + + @@ -10259,6 +10559,9 @@ + + + @@ -10351,6 +10654,15 @@ + + + + + + + + + @@ -10476,6 +10788,15 @@ + + + + + + + + + @@ -10604,6 +10925,15 @@ + + + + + + + + + @@ -10729,6 +11059,15 @@ + + + + + + + + + @@ -10964,6 +11303,15 @@ + + + + + + + + + @@ -11113,6 +11461,15 @@ + + + + + + + + + @@ -11262,6 +11619,15 @@ + + + + + + + + + @@ -11657,6 +12023,9 @@ + + + @@ -11847,6 +12216,15 @@ + + + + + + + + + @@ -12011,6 +12389,15 @@ + + + + + + + + + @@ -12172,6 +12559,15 @@ + + + + + + + + + @@ -12333,6 +12729,15 @@ + + + + + + + + + @@ -12494,6 +12899,15 @@ + + + + + + + + + @@ -12670,6 +13084,15 @@ + + + + + + + + + @@ -12831,6 +13254,15 @@ + + + + + + + + + @@ -12992,6 +13424,15 @@ + + + + + + + + + @@ -13153,6 +13594,15 @@ + + + + + + + + + @@ -13314,6 +13764,15 @@ + + + + + + + + + @@ -13475,6 +13934,15 @@ + + + + + + + + + @@ -13636,6 +14104,15 @@ + + + + + + + + + @@ -13812,6 +14289,15 @@ + + + + + + + + + @@ -13988,6 +14474,15 @@ + + + + + + + + + @@ -14149,6 +14644,15 @@ + + + + + + + + + @@ -14313,6 +14817,15 @@ + + + + + + + + + @@ -14474,6 +14987,15 @@ + + + + + + + + + @@ -14635,6 +15157,15 @@ + + + + + + + + + @@ -14796,6 +15327,15 @@ + + + + + + + + + @@ -14972,6 +15512,15 @@ + + + + + + + + + @@ -15899,6 +16448,15 @@ + + + + + + + + + @@ -16045,6 +16603,15 @@ + + + + + + + + + @@ -16200,6 +16767,15 @@ + + + + + + + + + @@ -16325,6 +16901,15 @@ + + + + + + + + + @@ -16438,6 +17023,15 @@ + + + + + + + + + @@ -16620,6 +17214,15 @@ + + + + + + + + + @@ -16696,4 +17299,4 @@ - + \ No newline at end of file