Skip to content
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

XWIKI-21521: DefaultSkin form should be accessible #2642

Merged
merged 4 commits into from
Feb 12, 2024
Merged

XWIKI-21521: DefaultSkin form should be accessible #2642

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
622018c
XWIKI-21521: DefaultSkin form should be accessible
Sereza7 Nov 21, 2023
18cc897
XWIKI-21521: DefaultSkin form should be accessible
Sereza7 Dec 12, 2023
337ea79
Merge branch 'xwiki:master' into XWIKI-21521-2
Sereza7 Feb 12, 2024
afe5ee9
XWIKI-21521: DefaultSkin form should be accessible
Sereza7 Feb 12, 2024
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
3 changes: 2 additions & 1 deletion ...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 @@ -80,7 +80,7 @@
#set ($class = $doc.getObject($className).xWikiClass)
#foreach ($prop in $class.properties)
#if ($prop.classType != 'TextArea')
; $services.rendering.escape($prop.prettyName, 'xwiki/2.1')
; {{html}}<label for="${className}_0_$escapetool.xml($prop.name)">$escapetool.xml($prop.prettyName)</label>{{/html}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not necessarily the object at index 0 is it? Chances are low but we could imagine that the retrieved object has another index no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just tried using the $prop.number attribute to fill up this id.
Seems like the number used in the ids is not the same, and so it doesn't match.
image
From what I could see in this form, all properties used 0 (because they were the only ones with their name, no duplicate names? ).
I'll be leaving the PR as is for now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just tried using the $prop.number attribute to fill up this id.

Yes it won't work with $prop.number: as the name suggest it's the index of the property. Here the 0 is the index of the xobject itself.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in afe5ee9 👍

Here is the result with the updated template:
21521-wihtoutHardcodedNumber
As we can see, all attribute values reference to the right nodes.

: #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
Expand Down Expand Up @@ -149,6 +149,7 @@
(((
{{html}}<button class="btn btn-default btn-xs">$services.icon.renderHTML('cross')</button>{{/html}}
)))
)))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot see any code that adds the corresponding (((, was this missing before?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, it was a mistake, I don't know what I did here...
Addressed in 18cc897 👍

(% class="overrideProperties hidden" %)
(((
#set ($className = 'XWiki.XWikiSkinFileOverrideClass')
Expand Down