XWIKI-22504: Update icon names to respect our icon naming convention #2986
Conversation
*Reordered the icon set variables in alphabetical order * Fixed some of the names that didn't fit the new convention.
* Updated and deprecated icon names to fit the new naming conventions
* Updated version of deprecation comments
...re/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/icons/default.iconset
Outdated
Show resolved
Hide resolved
* Improved deprecation comments
| ## Deprecated since 16.2.0 to conform to the new naming convention. | ||
| bullet_black = bullet_black | ||
| credit-card = creditcards | ||
| emoticon_smile = emoticon_smile | ||
| fast-backward = control_rewind | ||
| arrow_in = arrow_in | ||
| fast-forward = control_fastforward | ||
| floppy-disk = disk | ||
| log-in=user_go | ||
| log-out=user_go | ||
| shopping-cart = cart |
There was a problem hiding this comment.
Preferably those would be moved in a legacy module. But, I'm not sure we have an easy way to do that.
There was a problem hiding this comment.
There's the same kind of deprecated block in all icon themes. I'd rather have the same structure as the one we already have in translation files. It keeps things easy to maintain and understand, even if it might not the most optimized.
* Updated deprecation comments
| @@ -60,7 +60,7 @@ function initWrapper({provide} = {}) { | |||
| id: 'sortPanel', | |||
| title: 'Sort', | |||
| component: 'LivedataAdvancedPanelSort', | |||
| icon: 'table_sort' | |||
| icon: 'table-sort' | |||
There was a problem hiding this comment.
I'm a bit confused here: in Silk I see table-sort and in FA I see table_sort?
There was a problem hiding this comment.
I remapped everything in the standard icon themes to match the convention that was introduced a few months ago.
I made sure to keep the old mappings as to avoid backward incompatibility
FA mapping :
This second mapping is only here for backwards compatibility:
The files are huge so this can be a bit confusing. I thought it would be the best solution to organize things like this. Let me know if I missed an obvious compromise that'd be better :)
...re/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/icons/default.iconset
Outdated
Show resolved
Hide resolved
* Updated version numbers on deprecated blocks
|
I think this should have a Jira issue as introducing new icon names and deprecating old ones affects users and developer. Further, I wonder if we should make any efforts to not list deprecated icon names, e.g., in the icon picker. Currently, both will be listed I think which will confuse users. |
Sereza7
changed the title
Created https://jira.xwiki.org/browse/XWIKI-22504 and updated this PR intro post with the relevant info. 👍
Until recently with https://jira.xwiki.org/browse/XWIKI-12013 the set of icons listed in the icon picker was hardcoded so there was no issue with this kind of deprecation. I failed to see the implications of listing all icons with this new deprecation system. Indeed we shouldn't use deprecated icons in the icon picker. |
|
Setting this PR as a draft until a solution for the iconPicker "deprecated" icons has been found and implemented here. |
Jira URL
https://jira.xwiki.org/browse/XWIKI-22504
Changes
Description
deprecatedsection.Clarifications
Screenshots & Video
N/A
Executed Tests
N/A
A typo might break a mapping in one of the three themes. I don't think we have auto tests for those mappings.
I did my best to stay focused and provide the changes on the three files at the same time, but the risk for breaking a mapping is still here. Note that breaking a mapping shouldn't be a large regression because:
Expected merging strategy