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.
xwiki · Feb 12, 2024 · f4714e7 · f4714e7
1 parent 09c9a0e
commit f4714e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...atform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/VelocityMacros.xml b/...atform-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/...bution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/...bution/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