XWIKI-15198: Skin logo doesn't change with the new Color Theme (#3281)

* Added a translation to contain the warning for users.
* Added this warning
* Replaced the wiki syntax with HTML syntax for the creation of the DL. Note that now when there's no property, the DL is still generated, but I verified that it's invisible both visually and semantically
* Added wiki escaping before the HTML escaping since we support wiki syntax in this HTML macro now.

(cherry picked from commit c3f7e05)

Author: Sereza7

xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/Translations.xml

@@ -38,6 +38,7 @@
   <hidden>true</hidden>
   <content>skin.sheet.title=Skin
 skin.sheet.properties=Skin Properties
+skin.sheet.properties.logo.warning=This logo is usually overridden by the one defined in the color theme. If you want to change the wiki logo, consider editing the current color theme instead.
 skin.sheet.deprecatedProperties=Deprecated properties
 skin.sheet.overriddenTemplates=Overridden templates
 skin.sheet.addTemplate=Add a new overriding template

xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/XWikiSkinsSheet.xml

@@ -78,17 +78,34 @@
   #set ($deprecatedProperties = [])
   #set ($className = 'XWiki.XWikiSkins')
   #set ($class = $doc.getObject($className).xWikiClass)
+  {{html wiki='true'}}
+  <dl>
   #foreach ($prop in $class.properties)
     #if ($prop.classType != 'TextArea')
-    ; {{html}}<label for="${className}_$escapetool.xml($doc.getObject($className).getNumber())_$escapetool.xml($prop.name)">$escapetool.xml($prop.prettyName)</label>{{/html}}
-    : #if($prop.name == 'logo')## Avoid line break
-      {{attachmentSelector classname="${className}" property="${services.rendering.escape($prop.name, 'xwiki/2.1')}" filter="png,jpg,gif,svg" displayImage="true"/}}## Avoid line break
-    #else$doc.display($prop.name)#end
+    <dt>
+      <label for="${className}_$escapetool.xml($services.rendering.escape($doc.getObject($className).getNumber(), 'xwiki/2.1'))_$escapetool.xml($services.rendering.escape($prop.name, 'xwiki/2.1'))">
+        $escapetool.xml($services.rendering.escape($prop.prettyName, 'xwiki/2.1'))
+      </label>
+    </dt>
+    <dd>
+      #if($prop.name == 'logo')
+        
+        {{warning}}
+          {{translation key="skin.sheet.properties.logo.warning" /}}
+        {{/warning}}
+        
+        {{attachmentSelector classname="${className}" property="${services.rendering.escape($prop.name, 'xwiki/2.1')}" filter="png,jpg,gif,svg" displayImage="true"/}} 
+      #else 
+        $doc.display($prop.name)
+      #end
+    </dd>
 
     #else
       #set($discard = $deprecatedProperties.add($prop))
     #end
   #end
+  </dl>
+  {{/html}}
   (% id="overrideSection" %)
   (((
     == {{translation key="skin.sheet.overriddenTemplates" /}} ==