From f4714e7dc000e768dc88176410782bbc6e5346c2 Mon Sep 17 00:00:00 2001
From: Lucas C <lucas.charpentier@imt-atlantique.net>
Date: Mon, 12 Feb 2024 16:55:15 +0100
Subject: [PATCH] XWIKI-21773: Admin section: make the WYSIWYG section pass
 webstandard tests (#2794)

* Fixed the input labels
* Removed the comment from the test for WYSIWYG
* Replaced the hard coded number value with a more robust computed one.
---
 .../src/main/resources/CKEditor/VelocityMacros.xml             | 2 +-
 .../xwiki-platform-distribution-flavor-test/pom.xml            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/VelocityMacros.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/VelocityMacros.xml
index d934fdae1974..b88229697122 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/VelocityMacros.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/VelocityMacros.xml
@@ -218,7 +218,7 @@
 
 #macro (displayCKEditorConfigProperty $configDoc $propName $action)
   &lt;dt&gt;
-    &lt;label&gt;$configDoc.displayPrettyName($propName)&lt;/label&gt;
+    &lt;label for="CKEditor.ConfigClass_$escapetool.xml($configDoc.getObject("CKEditor.ConfigClass").getNumber())_${propName}"&gt;$configDoc.displayPrettyName($propName)&lt;/label&gt;
     &lt;span class="xHint"&gt;$escapetool.xml($services.localization.render("CKEditor.ConfigClass_${propName}.hint"))&lt;/span&gt;
   &lt;/dt&gt;
   &lt;dd&gt;#displayCKEditorConfigPropertyValue($configDoc $propName $action)&lt;/dd&gt;
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
index e9c4d8602b16..ff4b6bfe541b 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
@@ -281,8 +281,7 @@
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Delete
                 <!-- Editing -->
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Editing
-                <!-- /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=WYSIWYG
-                  TODO https://jira.xwiki.org/browse/XWIKI-21773 -->
+                /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=WYSIWYG
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Syntaxes
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=nameStrategies
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=SyntaxHighlighting