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.

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

[Sitemap] Accept an optional icon for each value/label mapping #3809

Merged
merged 3 commits into from
Oct 2, 2023

Conversation

lolodomo
Copy link
Contributor

When set by the user, the icon can be used by UIs for switch element with mappings to render a button with the icon rather than the label.

Related to #3441

Signed-off-by: Laurent Garnier lg.hc@free.fr

When set by the user, the icon can be used by UIs for switch element with mappings to render a button with the icon rather than the label.

Related to openhab#3441

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
@lolodomo lolodomo requested a review from a team as a code owner September 23, 2023 08:25
@lolodomo
Copy link
Contributor Author

It is an enhancement of the sitemap syntax and of the sitemap REST API.

lolodomo added a commit to lolodomo/openhab-webui that referenced this pull request Sep 23, 2023
lolodomo added a commit to lolodomo/openhab-webui that referenced this pull request Sep 24, 2023
Related to openhab/openhab-core#3441

Depends on openhab/openhab-core#3809

Icons will not be used if icons are nbot enabled (app setting).

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
@lolodomo
Copy link
Contributor Author

@openhab/core-maintainers : would it be possible to consider this PR relatively soon to let time to each sitemap UI to implement the new feature before OH 4.1 is released?
A PR is already ready for Basic UI.

Copy link
Member

@kaikreuzer kaikreuzer left a comment

Choose a reason for hiding this comment

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

Code lgtm (besides a small comment). May I ask you to rebase your PR to solve the merge conflicts?

@kaikreuzer kaikreuzer added the enhancement An enhancement or new feature of the Core label Oct 1, 2023
@lolodomo
Copy link
Contributor Author

lolodomo commented Oct 1, 2023

Code lgtm (besides a small comment). May I ask you to rebase your PR to solve the merge conflicts?

Rebase done solving the conflict and your comment considered.

Copy link
Member

@kaikreuzer kaikreuzer left a comment

Choose a reason for hiding this comment

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

Thanks!

@kaikreuzer kaikreuzer merged commit f7d1765 into openhab:main Oct 2, 2023
2 checks passed
@wborn wborn added this to the 4.1 milestone Oct 2, 2023
@lolodomo lolodomo deleted the sitemap_mapping_optional_icon branch October 2, 2023 10:14
@lolodomo
Copy link
Contributor Author

lolodomo commented Oct 2, 2023

Thank you Kai.
You could then check the Basic UI counterpart PR after it successfully builds.

kaikreuzer pushed a commit to openhab/openhab-webui that referenced this pull request Oct 3, 2023
Related to openhab/openhab-core#3441

Depends on openhab/openhab-core#3809

Icons will not be used if icons are not enabled (app setting).

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
lolodomo added a commit to lolodomo/openhab-docs that referenced this pull request Nov 4, 2023
Related to openhab/openhab-core#3809

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
stefan-hoehn pushed a commit to openhab/openhab-docs that referenced this pull request Nov 18, 2023
Related to openhab/openhab-core#3809

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement An enhancement or new feature of the Core
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants