From 04cb85cb0b576da2d59bee23abdbf69702fcdc85 Mon Sep 17 00:00:00 2001 From: Marius Dumitru Florea <marius@xwiki.com> Date: Mon, 19 Dec 2022 13:59:16 +0200 Subject: [PATCH] [misc] Apply xar format --- .../main/resources/CKEditor/AdminSection.xml | 105 ++++++++++++++---- .../main/resources/CKEditor/ConfigClass.xml | 34 +++++- .../main/resources/CKEditor/ConfigSheet.xml | 28 +++-- .../resources/CKEditor/ConfigTemplate.xml | 2 +- .../main/resources/CKEditor/ContentSheet.xml | 18 ++- .../main/resources/CKEditor/EditMenuEntry.xml | 84 ++++++++++++-- .../src/main/resources/CKEditor/EditSheet.xml | 64 +++++++++-- .../main/resources/CKEditor/HTMLConverter.xml | 2 +- .../resources/CKEditor/ImageEditorService.xml | 1 + .../CKEditor/ImageSelectorService.xml | 1 + .../ImageSelectorServiceUIX/DocumentTree.xml | 77 +++++++++++-- .../CKEditor/ImageSelectorServiceUIX/Icon.xml | 77 +++++++++++-- .../ImageSelectorServiceUIX/Upload.xml | 3 + .../CKEditor/ImageSelectorServiceUIX/Url.xml | 77 +++++++++++-- .../main/resources/CKEditor/InlineEditor.xml | 18 ++- .../resources/CKEditor/LinkLabelGenerator.xml | 2 +- .../resources/CKEditor/LinkSuggestions.xml | 2 +- .../resources/CKEditor/OfficeImporter.xml | 2 +- .../resources/CKEditor/ResourceDispatcher.xml | 2 +- .../CKEditor/SyntaxContentEditor.xml | 5 +- .../resources/CKEditor/Translations.de.xml | 2 +- .../resources/CKEditor/Translations.es.xml | 2 +- .../resources/CKEditor/Translations.fr.xml | 2 +- .../resources/CKEditor/Translations.hr.xml | 2 +- .../resources/CKEditor/Translations.ja.xml | 4 +- .../resources/CKEditor/Translations.ru.xml | 2 +- .../resources/CKEditor/Translations.tr.xml | 2 +- .../resources/CKEditor/Translations.uk.xml | 2 +- .../main/resources/CKEditor/Translations.xml | 10 +- .../resources/CKEditor/Translations.zh.xml | 2 +- .../main/resources/CKEditor/Translator.xml | 2 +- .../src/main/resources/CKEditor/WebHome.xml | 2 +- .../main/resources/CKEditor/XDOMEditor.xml | 5 +- 33 files changed, 533 insertions(+), 110 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/AdminSection.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/AdminSection.xml index db00ae34b74..6bbbde1fcf8 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/AdminSection.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/AdminSection.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.AdminSection" locale=""> +<xwikidoc version="1.5" reference="CKEditor.AdminSection" locale=""> <web>CKEditor</web> <name>AdminSection</name> <language/> @@ -116,6 +116,7 @@ <categoryIcon> <customDisplay/> <disabled>0</disabled> + <hint/> <name>categoryIcon</name> <number>11</number> <picker>0</picker> @@ -127,9 +128,11 @@ <classType>com.xpn.xwiki.objects.classes.StringClass</classType> </categoryIcon> <codeToExecute> + <contenttype>VelocityWiki</contenttype> <customDisplay/> <disabled>0</disabled> - <editor>Text</editor> + <editor>---</editor> + <hint/> <name>codeToExecute</name> <number>7</number> <picker>0</picker> @@ -142,35 +145,37 @@ <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> </codeToExecute> <configurationClass> + <cache>0</cache> + <classname/> <customDisplay/> + <defaultValue/> <disabled>0</disabled> + <displayType>input</displayType> + <freeText/> + <hint/> + <idField/> + <largeStorage>0</largeStorage> + <multiSelect>0</multiSelect> <name>configurationClass</name> <number>3</number> - <picker>0</picker> + <picker>1</picker> <prettyName>configurationClass</prettyName> + <relationalStorage>0</relationalStorage> + <separator> </separator> + <separators/> <size>30</size> + <sort>none</sort> + <sql/> <unmodifiable>0</unmodifiable> <validationMessage/> <validationRegExp/> - <classType>com.xpn.xwiki.objects.classes.StringClass</classType> + <valueField/> + <classType>com.xpn.xwiki.objects.classes.PageClass</classType> </configurationClass> - <configureGlobally> - <customDisplay/> - <defaultValue/> - <disabled>0</disabled> - <displayFormType>checkbox</displayFormType> - <displayType/> - <name>configureGlobally</name> - <number>4</number> - <prettyName>configureGlobally</prettyName> - <unmodifiable>0</unmodifiable> - <validationMessage/> - <validationRegExp/> - <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> - </configureGlobally> <displayBeforeCategory> <customDisplay/> <disabled>0</disabled> + <hint/> <name>displayBeforeCategory</name> <number>10</number> <picker>0</picker> @@ -184,6 +189,7 @@ <displayInCategory> <customDisplay/> <disabled>0</disabled> + <hint/> <name>displayInCategory</name> <number>9</number> <picker>0</picker> @@ -197,6 +203,7 @@ <displayInSection> <customDisplay/> <disabled>0</disabled> + <hint/> <name>displayInSection</name> <number>1</number> <picker>0</picker> @@ -210,6 +217,7 @@ <heading> <customDisplay/> <disabled>0</disabled> + <hint/> <name>heading</name> <number>2</number> <picker>0</picker> @@ -223,6 +231,7 @@ <iconAttachment> <customDisplay/> <disabled>0</disabled> + <hint/> <name>iconAttachment</name> <number>8</number> <picker>0</picker> @@ -236,6 +245,7 @@ <linkPrefix> <customDisplay/> <disabled>0</disabled> + <hint/> <name>linkPrefix</name> <number>5</number> <picker>0</picker> @@ -249,8 +259,12 @@ <propertiesToShow> <cache>0</cache> <customDisplay/> + <defaultValue/> <disabled>0</disabled> <displayType>input</displayType> + <freeText/> + <hint/> + <largeStorage>0</largeStorage> <multiSelect>1</multiSelect> <name>propertiesToShow</name> <number>6</number> @@ -267,9 +281,35 @@ <values/> <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </propertiesToShow> + <scope> + <cache>0</cache> + <customDisplay/> + <defaultValue/> + <disabled>0</disabled> + <displayType>select</displayType> + <freeText/> + <hint/> + <largeStorage>0</largeStorage> + <multiSelect>0</multiSelect> + <name>scope</name> + <number>12</number> + <picker>1</picker> + <prettyName>scope</prettyName> + <relationalStorage>0</relationalStorage> + <separator> </separator> + <separators>|, </separators> + <size>1</size> + <sort/> + <unmodifiable>0</unmodifiable> + <validationMessage/> + <validationRegExp/> + <values>WIKI|SPACE|ALL_SPACES|WIKI+ALL_SPACES</values> + <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> + </scope> <sectionOrder> <customDisplay/> <disabled>0</disabled> + <hint/> <name>sectionOrder</name> <number>12</number> <numberType>integer</numberType> @@ -314,6 +354,9 @@ <property> <propertiesToShow/> </property> + <property> + <scope/> + </property> <property> <sectionOrder/> </property> @@ -334,8 +377,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -355,6 +401,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -383,6 +430,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -476,11 +525,14 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> - <number>6</number> + <number>5</number> <prettyName>Caching policy</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> @@ -495,8 +547,9 @@ <disabled>0</disabled> <editor>PureText</editor> <name>code</name> - <number>3</number> + <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -506,9 +559,11 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>contentType</name> - <number>1</number> + <number>6</number> <prettyName>Content Type</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> @@ -521,7 +576,7 @@ <name> <disabled>0</disabled> <name>name</name> - <number>2</number> + <number>1</number> <prettyName>Name</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> @@ -532,7 +587,7 @@ <displayFormType>select</displayFormType> <displayType>yesno</displayType> <name>parse</name> - <number>5</number> + <number>4</number> <prettyName>Parse content</prettyName> <unmodifiable>0</unmodifiable> <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> @@ -541,9 +596,11 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> - <number>4</number> + <number>3</number> <prettyName>Use this extension</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigClass.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigClass.xml index 5b101732ab9..bc2a45590e8 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigClass.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigClass.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.ConfigClass" locale=""> +<xwikidoc version="1.5" reference="CKEditor.ConfigClass" locale=""> <web>CKEditor</web> <name>ConfigClass</name> <language/> @@ -146,17 +146,29 @@ <nameField/> <validationScript/> <sheet> + <cache>0</cache> + <classname/> <customDisplay/> <disabled>0</disabled> + <displayType>input</displayType> + <hint/> + <idField/> + <multiSelect>0</multiSelect> <name>sheet</name> <number>1</number> - <picker>0</picker> + <picker>1</picker> <prettyName>Sheet</prettyName> + <relationalStorage>0</relationalStorage> + <separator> </separator> + <separators/> <size>30</size> + <sort>none</sort> + <sql/> <unmodifiable>0</unmodifiable> <validationMessage/> <validationRegExp/> - <classType>com.xpn.xwiki.objects.classes.StringClass</classType> + <valueField/> + <classType>com.xpn.xwiki.objects.classes.PageClass</classType> </sheet> </class> <property> @@ -178,17 +190,29 @@ <nameField/> <validationScript/> <sheet> + <cache>0</cache> + <classname/> <customDisplay/> <disabled>0</disabled> + <displayType>input</displayType> + <hint/> + <idField/> + <multiSelect>0</multiSelect> <name>sheet</name> <number>1</number> - <picker>0</picker> + <picker>1</picker> <prettyName>Sheet</prettyName> + <relationalStorage>0</relationalStorage> + <separator> </separator> + <separators/> <size>30</size> + <sort>none</sort> + <sql/> <unmodifiable>0</unmodifiable> <validationMessage/> <validationRegExp/> - <classType>com.xpn.xwiki.objects.classes.StringClass</classType> + <valueField/> + <classType>com.xpn.xwiki.objects.classes.PageClass</classType> </sheet> </class> <property> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigSheet.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigSheet.xml index 09ec7cac0d7..c2e7a580f73 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigSheet.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigSheet.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.ConfigSheet" locale=""> +<xwikidoc version="1.5" reference="CKEditor.ConfigSheet" locale=""> <web>CKEditor</web> <name>ConfigSheet</name> <language/> @@ -120,8 +120,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -141,6 +144,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -169,6 +173,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -273,11 +279,14 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> - <number>6</number> + <number>5</number> <prettyName>Caching policy</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> @@ -292,8 +301,9 @@ <disabled>0</disabled> <editor>PureText</editor> <name>code</name> - <number>3</number> + <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -303,9 +313,11 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>contentType</name> - <number>1</number> + <number>6</number> <prettyName>Content Type</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> @@ -318,7 +330,7 @@ <name> <disabled>0</disabled> <name>name</name> - <number>2</number> + <number>1</number> <prettyName>Name</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> @@ -329,7 +341,7 @@ <displayFormType>select</displayFormType> <displayType>yesno</displayType> <name>parse</name> - <number>5</number> + <number>4</number> <prettyName>Parse content</prettyName> <unmodifiable>0</unmodifiable> <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> @@ -338,9 +350,11 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> - <number>4</number> + <number>3</number> <prettyName>Use this extension</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigTemplate.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigTemplate.xml index 33fb6f40fdf..add7e8a37a7 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigTemplate.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigTemplate.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.ConfigTemplate" locale=""> +<xwikidoc version="1.5" reference="CKEditor.ConfigTemplate" locale=""> <web>CKEditor</web> <name>ConfigTemplate</name> <language/> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ContentSheet.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ContentSheet.xml index cfdf4ab0bc8..6655c1b4efa 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ContentSheet.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ContentSheet.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.1"> +<xwikidoc version="1.5" reference="CKEditor.ContentSheet" locale=""> <web>CKEditor</web> <name>ContentSheet</name> <language/> @@ -109,25 +109,31 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> <prettyName>Caching policy</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>long|short|default|forbid</values> <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </cache> <code> + <contenttype>PureText</contenttype> <disabled>0</disabled> + <editor>PureText</editor> <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -137,13 +143,15 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>contentType</name> <number>6</number> <prettyName>Content Type</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>CSS|LESS</values> @@ -172,13 +180,15 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> <prettyName>Use this extension</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>currentPage|onDemand|always</values> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditMenuEntry.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditMenuEntry.xml index 7a590382f11..05a5185e4a0 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditMenuEntry.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditMenuEntry.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.1"> +<xwikidoc version="1.5" reference="CKEditor.EditMenuEntry" locale=""> <web>CKEditor</web> <name>EditMenuEntry</name> <language/> @@ -53,25 +53,31 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> <prettyName>Caching policy</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>long|short|default|forbid</values> <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </cache> <code> + <contenttype>PureText</contenttype> <disabled>0</disabled> + <editor>PureText</editor> <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -100,13 +106,15 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> <prettyName>Use this extension</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>currentPage|onDemand|always</values> @@ -150,21 +158,62 @@ <defaultWeb/> <nameField/> <validationScript/> + <async_cached> + <defaultValue>0</defaultValue> + <disabled>0</disabled> + <displayFormType>select</displayFormType> + <displayType/> + <name>async_cached</name> + <number>3</number> + <prettyName>Cached</prettyName> + <unmodifiable>0</unmodifiable> + <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> + </async_cached> + <async_context> + <cache>0</cache> + <disabled>0</disabled> + <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> + <multiSelect>1</multiSelect> + <name>async_context</name> + <number>4</number> + <prettyName>Context elements</prettyName> + <relationalStorage>0</relationalStorage> + <separator>, </separator> + <separators>|, </separators> + <size>5</size> + <unmodifiable>0</unmodifiable> + <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values> + <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> + </async_context> + <async_enabled> + <defaultValue>0</defaultValue> + <disabled>0</disabled> + <displayFormType>select</displayFormType> + <displayType/> + <name>async_enabled</name> + <number>2</number> + <prettyName>Asynchronous rendering</prettyName> + <unmodifiable>0</unmodifiable> + <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> + </async_enabled> <content> <disabled>0</disabled> <editor>Text</editor> <name>content</name> - <number>3</number> - <prettyName>Extension Content</prettyName> - <rows>10</rows> - <size>40</size> + <number>1</number> + <prettyName>Executed Content</prettyName> + <restricted>0</restricted> + <rows>25</rows> + <size>120</size> <unmodifiable>0</unmodifiable> <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> </content> <extensionPointId> <disabled>0</disabled> <name>extensionPointId</name> - <number>1</number> + <number>5</number> <prettyName>Extension Point ID</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> @@ -173,18 +222,20 @@ <name> <disabled>0</disabled> <name>name</name> - <number>2</number> + <number>6</number> <prettyName>Extension ID</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> <classType>com.xpn.xwiki.objects.classes.StringClass</classType> </name> <parameters> + <contenttype>PureText</contenttype> <disabled>0</disabled> <editor>PureText</editor> <name>parameters</name> - <number>4</number> + <number>7</number> <prettyName>Extension Parameters</prettyName> + <restricted>0</restricted> <rows>10</rows> <size>40</size> <unmodifiable>0</unmodifiable> @@ -194,9 +245,11 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>scope</name> - <number>5</number> + <number>8</number> <prettyName>Extension Scope</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> @@ -207,6 +260,15 @@ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </scope> </class> + <property> + <async_cached/> + </property> + <property> + <async_context/> + </property> + <property> + <async_enabled/> + </property> <property> <content>{{velocity}} ## Don't extend the Edit menu if the user can configure the default WYSIWYG editor. diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditSheet.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditSheet.xml index 62f97a616c3..90b876acd3d 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditSheet.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditSheet.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.1"> +<xwikidoc version="1.5" reference="CKEditor.EditSheet" locale=""> <web>CKEditor</web> <name>EditSheet</name> <language/> @@ -90,25 +90,31 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> <prettyName>Caching policy</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>long|short|default|forbid</values> <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </cache> <code> + <contenttype>PureText</contenttype> <disabled>0</disabled> + <editor>PureText</editor> <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -137,13 +143,15 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> <prettyName>Use this extension</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>currentPage|onDemand|always</values> @@ -392,8 +400,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -407,10 +418,13 @@ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </cache> <code> + <contenttype>PureText</contenttype> <disabled>0</disabled> + <editor>PureText</editor> <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -439,6 +453,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -648,8 +664,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -669,6 +688,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -697,6 +717,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -778,25 +800,31 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> <prettyName>Caching policy</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>long|short|default|forbid</values> <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </cache> <code> + <contenttype>PureText</contenttype> <disabled>0</disabled> + <editor>PureText</editor> <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -806,13 +834,15 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>contentType</name> <number>6</number> <prettyName>Content Type</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>CSS|LESS</values> @@ -841,13 +871,15 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> <prettyName>Use this extension</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> - <separators> ,|</separators> + <separators>|, </separators> <size>1</size> <unmodifiable>0</unmodifiable> <values>currentPage|onDemand|always</values> @@ -1211,8 +1243,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -1226,10 +1261,13 @@ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </cache> <code> + <contenttype>PureText</contenttype> <disabled>0</disabled> + <editor>PureText</editor> <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -1239,6 +1277,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>contentType</name> <number>6</number> @@ -1274,6 +1314,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -1431,16 +1473,18 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>1</multiSelect> <name>async_context</name> <number>4</number> <prettyName>Context elements</prettyName> <relationalStorage>0</relationalStorage> - <separator> </separator> + <separator>, </separator> <separators>|, </separators> <size>5</size> <unmodifiable>0</unmodifiable> - <values>doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.parameters=Request parameters|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values> + <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values> <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </async_context> <async_enabled> @@ -1460,6 +1504,7 @@ <name>content</name> <number>1</number> <prettyName>Executed Content</prettyName> + <restricted>0</restricted> <rows>25</rows> <size>120</size> <unmodifiable>0</unmodifiable> @@ -1490,6 +1535,7 @@ <name>parameters</name> <number>7</number> <prettyName>Extension Parameters</prettyName> + <restricted>0</restricted> <rows>10</rows> <size>40</size> <unmodifiable>0</unmodifiable> @@ -1499,6 +1545,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>scope</name> <number>8</number> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/HTMLConverter.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/HTMLConverter.xml index b353f8cd004..75858415261 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/HTMLConverter.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/HTMLConverter.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.1"> +<xwikidoc version="1.5" reference="CKEditor.HTMLConverter" locale=""> <web>CKEditor</web> <name>HTMLConverter</name> <language/> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageEditorService.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageEditorService.xml index f6e93425ac8..ddf11b74af9 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageEditorService.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageEditorService.xml @@ -258,6 +258,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorService.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorService.xml index 0f41451f036..956e13e71cd 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorService.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorService.xml @@ -126,6 +126,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/DocumentTree.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/DocumentTree.xml index da46f6eeb9d..8faf821cb44 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/DocumentTree.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/DocumentTree.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.ImageSelectorServiceUIX.DocumentTree" locale=""> +<xwikidoc version="1.5" reference="CKEditor.ImageSelectorServiceUIX.DocumentTree" locale=""> <web>CKEditor.ImageSelectorServiceUIX</web> <name>DocumentTree</name> <language/> @@ -53,8 +53,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -74,6 +77,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -102,6 +106,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -184,21 +190,62 @@ <defaultWeb/> <nameField/> <validationScript/> + <async_cached> + <defaultValue>0</defaultValue> + <disabled>0</disabled> + <displayFormType>select</displayFormType> + <displayType/> + <name>async_cached</name> + <number>3</number> + <prettyName>Cached</prettyName> + <unmodifiable>0</unmodifiable> + <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> + </async_cached> + <async_context> + <cache>0</cache> + <disabled>0</disabled> + <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> + <multiSelect>1</multiSelect> + <name>async_context</name> + <number>4</number> + <prettyName>Context elements</prettyName> + <relationalStorage>0</relationalStorage> + <separator>, </separator> + <separators>|, </separators> + <size>5</size> + <unmodifiable>0</unmodifiable> + <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values> + <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> + </async_context> + <async_enabled> + <defaultValue>0</defaultValue> + <disabled>0</disabled> + <displayFormType>select</displayFormType> + <displayType/> + <name>async_enabled</name> + <number>2</number> + <prettyName>Asynchronous rendering</prettyName> + <unmodifiable>0</unmodifiable> + <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> + </async_enabled> <content> <disabled>0</disabled> <editor>Text</editor> <name>content</name> - <number>3</number> - <prettyName>Extension Content</prettyName> - <rows>10</rows> - <size>40</size> + <number>1</number> + <prettyName>Executed Content</prettyName> + <restricted>0</restricted> + <rows>25</rows> + <size>120</size> <unmodifiable>0</unmodifiable> <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> </content> <extensionPointId> <disabled>0</disabled> <name>extensionPointId</name> - <number>1</number> + <number>5</number> <prettyName>Extension Point ID</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> @@ -207,7 +254,7 @@ <name> <disabled>0</disabled> <name>name</name> - <number>2</number> + <number>6</number> <prettyName>Extension ID</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> @@ -218,8 +265,9 @@ <disabled>0</disabled> <editor>PureText</editor> <name>parameters</name> - <number>4</number> + <number>7</number> <prettyName>Extension Parameters</prettyName> + <restricted>0</restricted> <rows>10</rows> <size>40</size> <unmodifiable>0</unmodifiable> @@ -229,9 +277,11 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>scope</name> - <number>5</number> + <number>8</number> <prettyName>Extension Scope</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> @@ -242,6 +292,15 @@ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </scope> </class> + <property> + <async_cached/> + </property> + <property> + <async_context/> + </property> + <property> + <async_enabled/> + </property> <property> <content>{{velocity}} #set ($discard = $xwiki.jsx.use('CKEditor.ImageSelectorServiceUIX.DocumentTree')) diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Icon.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Icon.xml index 466ab5c6f41..7ff1b37384b 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Icon.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Icon.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.ImageSelectorServiceUIX.Icon" locale=""> +<xwikidoc version="1.5" reference="CKEditor.ImageSelectorServiceUIX.Icon" locale=""> <web>CKEditor.ImageSelectorServiceUIX</web> <name>Icon</name> <language/> @@ -53,8 +53,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -74,6 +77,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -102,6 +106,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -161,21 +167,62 @@ <defaultWeb/> <nameField/> <validationScript/> + <async_cached> + <defaultValue>0</defaultValue> + <disabled>0</disabled> + <displayFormType>select</displayFormType> + <displayType/> + <name>async_cached</name> + <number>3</number> + <prettyName>Cached</prettyName> + <unmodifiable>0</unmodifiable> + <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> + </async_cached> + <async_context> + <cache>0</cache> + <disabled>0</disabled> + <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> + <multiSelect>1</multiSelect> + <name>async_context</name> + <number>4</number> + <prettyName>Context elements</prettyName> + <relationalStorage>0</relationalStorage> + <separator>, </separator> + <separators>|, </separators> + <size>5</size> + <unmodifiable>0</unmodifiable> + <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values> + <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> + </async_context> + <async_enabled> + <defaultValue>0</defaultValue> + <disabled>0</disabled> + <displayFormType>select</displayFormType> + <displayType/> + <name>async_enabled</name> + <number>2</number> + <prettyName>Asynchronous rendering</prettyName> + <unmodifiable>0</unmodifiable> + <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> + </async_enabled> <content> <disabled>0</disabled> <editor>Text</editor> <name>content</name> - <number>3</number> - <prettyName>Extension Content</prettyName> - <rows>10</rows> - <size>40</size> + <number>1</number> + <prettyName>Executed Content</prettyName> + <restricted>0</restricted> + <rows>25</rows> + <size>120</size> <unmodifiable>0</unmodifiable> <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> </content> <extensionPointId> <disabled>0</disabled> <name>extensionPointId</name> - <number>1</number> + <number>5</number> <prettyName>Extension Point ID</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> @@ -184,7 +231,7 @@ <name> <disabled>0</disabled> <name>name</name> - <number>2</number> + <number>6</number> <prettyName>Extension ID</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> @@ -195,8 +242,9 @@ <disabled>0</disabled> <editor>PureText</editor> <name>parameters</name> - <number>4</number> + <number>7</number> <prettyName>Extension Parameters</prettyName> + <restricted>0</restricted> <rows>10</rows> <size>40</size> <unmodifiable>0</unmodifiable> @@ -206,9 +254,11 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>scope</name> - <number>5</number> + <number>8</number> <prettyName>Extension Scope</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> @@ -219,6 +269,15 @@ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </scope> </class> + <property> + <async_cached/> + </property> + <property> + <async_context/> + </property> + <property> + <async_enabled/> + </property> <property> <content>{{velocity}} #set ($discard = $xwiki.jsx.use('CKEditor.ImageSelectorServiceUIX.Icon')) diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Upload.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Upload.xml index 1453338d5bc..34dca893235 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Upload.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Upload.xml @@ -77,6 +77,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -250,6 +251,7 @@ <name>content</name> <number>1</number> <prettyName>Executed Content</prettyName> + <restricted>0</restricted> <rows>25</rows> <size>120</size> <unmodifiable>0</unmodifiable> @@ -280,6 +282,7 @@ <name>parameters</name> <number>7</number> <prettyName>Extension Parameters</prettyName> + <restricted>0</restricted> <rows>10</rows> <size>40</size> <unmodifiable>0</unmodifiable> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Url.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Url.xml index 974147a6fa0..a067aada2bd 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Url.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ImageSelectorServiceUIX/Url.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.ImageSelectorServiceUIX.Url" locale=""> +<xwikidoc version="1.5" reference="CKEditor.ImageSelectorServiceUIX.Url" locale=""> <web>CKEditor.ImageSelectorServiceUIX</web> <name>Url</name> <language/> @@ -53,8 +53,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -74,6 +77,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -102,6 +106,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -161,21 +167,62 @@ <defaultWeb/> <nameField/> <validationScript/> + <async_cached> + <defaultValue>0</defaultValue> + <disabled>0</disabled> + <displayFormType>select</displayFormType> + <displayType/> + <name>async_cached</name> + <number>3</number> + <prettyName>Cached</prettyName> + <unmodifiable>0</unmodifiable> + <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> + </async_cached> + <async_context> + <cache>0</cache> + <disabled>0</disabled> + <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> + <multiSelect>1</multiSelect> + <name>async_context</name> + <number>4</number> + <prettyName>Context elements</prettyName> + <relationalStorage>0</relationalStorage> + <separator>, </separator> + <separators>|, </separators> + <size>5</size> + <unmodifiable>0</unmodifiable> + <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values> + <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> + </async_context> + <async_enabled> + <defaultValue>0</defaultValue> + <disabled>0</disabled> + <displayFormType>select</displayFormType> + <displayType/> + <name>async_enabled</name> + <number>2</number> + <prettyName>Asynchronous rendering</prettyName> + <unmodifiable>0</unmodifiable> + <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> + </async_enabled> <content> <disabled>0</disabled> <editor>Text</editor> <name>content</name> - <number>3</number> - <prettyName>Extension Content</prettyName> - <rows>10</rows> - <size>40</size> + <number>1</number> + <prettyName>Executed Content</prettyName> + <restricted>0</restricted> + <rows>25</rows> + <size>120</size> <unmodifiable>0</unmodifiable> <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> </content> <extensionPointId> <disabled>0</disabled> <name>extensionPointId</name> - <number>1</number> + <number>5</number> <prettyName>Extension Point ID</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> @@ -184,7 +231,7 @@ <name> <disabled>0</disabled> <name>name</name> - <number>2</number> + <number>6</number> <prettyName>Extension ID</prettyName> <size>30</size> <unmodifiable>0</unmodifiable> @@ -195,8 +242,9 @@ <disabled>0</disabled> <editor>PureText</editor> <name>parameters</name> - <number>4</number> + <number>7</number> <prettyName>Extension Parameters</prettyName> + <restricted>0</restricted> <rows>10</rows> <size>40</size> <unmodifiable>0</unmodifiable> @@ -206,9 +254,11 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>scope</name> - <number>5</number> + <number>8</number> <prettyName>Extension Scope</prettyName> <relationalStorage>0</relationalStorage> <separator> </separator> @@ -219,6 +269,15 @@ <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </scope> </class> + <property> + <async_cached/> + </property> + <property> + <async_context/> + </property> + <property> + <async_enabled/> + </property> <property> <content>{{velocity}} #set ($discard = $xwiki.jsx.use('CKEditor.ImageSelectorServiceUIX.Url')) diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/InlineEditor.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/InlineEditor.xml index 70299622899..49838e7c3d5 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/InlineEditor.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/InlineEditor.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.4" reference="CKEditor.InlineEditor" locale=""> +<xwikidoc version="1.5" reference="CKEditor.InlineEditor" locale=""> <web>CKEditor</web> <name>InlineEditor</name> <language/> @@ -53,8 +53,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -74,6 +77,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -102,6 +106,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -346,16 +352,18 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>1</multiSelect> <name>async_context</name> <number>4</number> <prettyName>Context elements</prettyName> <relationalStorage>0</relationalStorage> - <separator> </separator> + <separator>, </separator> <separators>|, </separators> <size>5</size> <unmodifiable>0</unmodifiable> - <values>doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.parameters=Request parameters|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values> + <values>action=Action|doc.reference=Document|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.url=Request URL|request.wiki=Request wiki|user=User|wiki=Wiki</values> <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> </async_context> <async_enabled> @@ -375,6 +383,7 @@ <name>content</name> <number>1</number> <prettyName>Executed Content</prettyName> + <restricted>0</restricted> <rows>25</rows> <size>120</size> <unmodifiable>0</unmodifiable> @@ -405,6 +414,7 @@ <name>parameters</name> <number>7</number> <prettyName>Extension Parameters</prettyName> + <restricted>0</restricted> <rows>10</rows> <size>40</size> <unmodifiable>0</unmodifiable> @@ -414,6 +424,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>scope</name> <number>8</number> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/LinkLabelGenerator.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/LinkLabelGenerator.xml index 32e4dc04c92..dc879012b55 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/LinkLabelGenerator.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/LinkLabelGenerator.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.3" reference="CKEditor.LinkLabelGenerator" locale=""> +<xwikidoc version="1.5" reference="CKEditor.LinkLabelGenerator" locale=""> <web>CKEditor</web> <name>LinkLabelGenerator</name> <language/> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/LinkSuggestions.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/LinkSuggestions.xml index 34f4dc88298..d626440a5f4 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/LinkSuggestions.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/LinkSuggestions.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.3" reference="CKEditor.LinkSuggestions" locale=""> +<xwikidoc version="1.5" reference="CKEditor.LinkSuggestions" locale=""> <web>CKEditor</web> <name>LinkSuggestions</name> <language/> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/OfficeImporter.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/OfficeImporter.xml index c899c635734..858a209fa86 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/OfficeImporter.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/OfficeImporter.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.3" reference="CKEditor.OfficeImporter" locale=""> +<xwikidoc version="1.5" reference="CKEditor.OfficeImporter" locale=""> <web>CKEditor</web> <name>OfficeImporter</name> <language/> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ResourceDispatcher.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ResourceDispatcher.xml index d0c65aad56b..6e8be501e79 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ResourceDispatcher.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ResourceDispatcher.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.ResourceDispatcher" locale=""> +<xwikidoc version="1.5" reference="CKEditor.ResourceDispatcher" locale=""> <web>CKEditor</web> <name>ResourceDispatcher</name> <language/> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/SyntaxContentEditor.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/SyntaxContentEditor.xml index cdce068828d..3b9b08d20b8 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/SyntaxContentEditor.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/SyntaxContentEditor.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.SyntaxContentEditor" locale=""> +<xwikidoc version="1.5" reference="CKEditor.SyntaxContentEditor" locale=""> <web>CKEditor</web> <name>SyntaxContentEditor</name> <language/> @@ -83,6 +83,7 @@ <name>code</name> <number>3</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>40</size> <unmodifiable>0</unmodifiable> @@ -119,6 +120,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>scope</name> <number>6</number> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.de.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.de.xml index 547bd625224..18ffff4ed53 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.de.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.de.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.Translations" locale="de"> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale="de"> <web>CKEditor</web> <name>Translations</name> <language>de</language> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.es.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.es.xml index 252a14659c1..1897709efc4 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.es.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.es.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.Translations" locale="es"> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale="es"> <web>CKEditor</web> <name>Translations</name> <language>es</language> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.fr.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.fr.xml index 878f0c943cc..ab3ea517857 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.fr.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.fr.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.3" reference="CKEditor.Translations" locale="fr"> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale="fr"> <web>CKEditor</web> <name>Translations</name> <language>fr</language> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.hr.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.hr.xml index eea0811a118..3bf864bfa2d 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.hr.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.hr.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.3" reference="CKEditor.Translations" locale="hr"> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale="hr"> <web>CKEditor</web> <name>Translations</name> <language>hr</language> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.ja.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.ja.xml index 7907708aba9..02184bad6ab 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.ja.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.ja.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.Translations" locale="ja"> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale="ja"> <web>CKEditor</web> <name>Translations</name> <language>ja</language> @@ -212,4 +212,4 @@ ## Used to indicate where deprecated keys end #@deprecatedend </content> - </xwikidoc> +</xwikidoc> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.ru.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.ru.xml index bd46cdab6d2..0f2cb5a8e8c 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.ru.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.ru.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.Translations" locale="ru"> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale="ru"> <web>CKEditor</web> <name>Translations</name> <language>ru</language> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.tr.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.tr.xml index 3089bfebf5a..249b6395ebc 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.tr.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.tr.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.Translations" locale="tr"> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale="tr"> <web>CKEditor</web> <name>Translations</name> <language>tr</language> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.uk.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.uk.xml index a5260e14d48..e6b38527d9d 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.uk.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.uk.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.Translations" locale="uk"> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale="uk"> <web>CKEditor</web> <name>Translations</name> <language>uk</language> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.xml index 10f1f6a7889..84c6fed89a1 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.Translations" locale=""> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale=""> <web>CKEditor</web> <name>Translations</name> <language/> @@ -250,8 +250,11 @@ <validationScript/> <cache> <cache>0</cache> + <defaultValue>long</defaultValue> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>cache</name> <number>5</number> @@ -271,6 +274,7 @@ <name>code</name> <number>2</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>50</size> <unmodifiable>0</unmodifiable> @@ -299,6 +303,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>use</name> <number>3</number> @@ -376,6 +382,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>scope</name> <number>1</number> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.zh.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.zh.xml index 4459004be65..17357e9f4c3 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.zh.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translations.zh.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.Translations" locale="zh"> +<xwikidoc version="1.5" reference="CKEditor.Translations" locale="zh"> <web>CKEditor</web> <name>Translations</name> <language>zh</language> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translator.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translator.xml index f96eb73e5ae..774de157799 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translator.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/Translator.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.3" reference="CKEditor.Translator" locale=""> +<xwikidoc version="1.5" reference="CKEditor.Translator" locale=""> <web>CKEditor</web> <name>Translator</name> <language/> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/WebHome.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/WebHome.xml index 45f7b8566cd..954bcdfdbed 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/WebHome.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/WebHome.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.WebHome" locale=""> +<xwikidoc version="1.5" reference="CKEditor.WebHome" locale=""> <web>CKEditor</web> <name>WebHome</name> <language/> diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/XDOMEditor.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/XDOMEditor.xml index abd99fa5e30..67d5a67a307 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/XDOMEditor.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/XDOMEditor.xml @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<xwikidoc version="1.2" reference="CKEditor.XDOMEditor" locale=""> +<xwikidoc version="1.5" reference="CKEditor.XDOMEditor" locale=""> <web>CKEditor</web> <name>XDOMEditor</name> <language/> @@ -66,6 +66,7 @@ <name>code</name> <number>3</number> <prettyName>Code</prettyName> + <restricted>0</restricted> <rows>20</rows> <size>40</size> <unmodifiable>0</unmodifiable> @@ -102,6 +103,8 @@ <cache>0</cache> <disabled>0</disabled> <displayType>select</displayType> + <freeText>forbidden</freeText> + <largeStorage>0</largeStorage> <multiSelect>0</multiSelect> <name>scope</name> <number>6</number> -- GitLab