Skip to content

[stable-17.4.x] XWIKI-15198: Skin logo doesn't change with the new Color Theme (#3281) #4720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2025
Merged

[stable-17.4.x] XWIKI-15198: Skin logo doesn't change with the new Color Theme (#3281) #4720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/Translations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 21 additions & 4 deletions ...iki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/XWikiSkinsSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,34 @@
#set ($deprecatedProperties = [])
#set ($className = 'XWiki.XWikiSkins')
#set ($class = $doc.getObject($className).xWikiClass)
{{html wiki='true'}}
&lt;dl&gt;
#foreach ($prop in $class.properties)
#if ($prop.classType != 'TextArea')
; {{html}}&lt;label for="${className}_$escapetool.xml($doc.getObject($className).getNumber())_$escapetool.xml($prop.name)"&gt;$escapetool.xml($prop.prettyName)&lt;/label&gt;{{/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
&lt;dt&gt;
&lt;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'))"&gt;
$escapetool.xml($services.rendering.escape($prop.prettyName, 'xwiki/2.1'))
&lt;/label&gt;
&lt;/dt&gt;
&lt;dd&gt;
#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
&lt;/dd&gt;

#else
#set($discard = $deprecatedProperties.add($prop))
#end
#end
&lt;/dl&gt;
{{/html}}
(% id="overrideSection" %)
(((
== {{translation key="skin.sheet.overriddenTemplates" /}} ==
Expand Down
Loading