-
-
Notifications
You must be signed in to change notification settings - Fork 429
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
Extend item syntax for category/icon #3539
Conversation
With the following items definition
and this sitemap
|
It seems the build succeeded but with the now so famous final "Finished: UNSTABLE". |
The icon value can now contain until 3 segments separated by a semi-column. First segment is the icon source. Example: oh, if, iconify, material, f7, ... Second segment is the icon set. Example: classic Third segment is the icon name (and can contain hyphen). Example: temperature In case only two segments are provided, the first segment is the icon source and the second the icon name. "classic" icon set is assumed if icon source is "oh". In case only one segment is provided, the icon source is assumed to be the openHAB server and its classic icon set and the value is then the icon name. Ability to use a string containing anything has been removed. Related to openhab#3052 Signed-off-by: Laurent Garnier <[email protected]>
e9453ba
to
0f54b4f
Compare
I finally changed the expectation when the icon value contains only 2 segments to be more compliant with Main UI syntax.
and this sitemap
|
Related to openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Note that it is a breaking change as quotes are no more accepted inside the |
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
…1521) Related to openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]>
@lolodomo I assume this will not impact the definition of icons in a sitemap file using the |
@lolodomo @J-N-K I created openhab/openhab-webui#1843 that includes fixes for this, tested with the examples provided. |
This pull request has been mentioned on openHAB Community. There might be relevant details there: https://community.openhab.org/t/openhab4-m1-earlybird/145193/25 |
* New icon sources for an item Related to openhab/openhab-core#3052 Depends on the merge of PR openhab/openhab-core#3539 Signed-off-by: Laurent Garnier <[email protected]> * First set of review comments considered Signed-off-by: Laurent Garnier <[email protected]> * Remove the constraint regarding hyphen in icon name Signed-off-by: Laurent Garnier <[email protected]> * Consider one remaining opened comment Signed-off-by: Laurent Garnier <[email protected]> * Hide < and > Signed-off-by: Laurent Garnier <[email protected]> * Include HTTP link to icon sources directly in the table Signed-off-by: Laurent Garnier <[email protected]> --------- Signed-off-by: Laurent Garnier <[email protected]>
- Adapt sitemap and item lexers to changes in icon name syntax - Restrict the elements that can be added to a sitemap - Added extra sitemap validations (in line with xtext validation in core) - Added test for sitemap parser and validation This solves the issue in main UI created by openhab/openhab-core#3539 and openhab/openhab-core#3378. Signed-off-by: Mark Herwege <[email protected]>
The icon value can now contain until 3 segments separated by a semi-column.
First segment is the icon source. Example: oh, if, iconify, material, f7, ...
Second segment is the icon set. Example: classic
Third segment is the icon name (and can contain hyphen). Example: temperature
In case only two segments are provided, the first segment is the icon source and the second the icon name. "classic" icon set is assumed.
In case only one segment is provided, the icon source is assumed to be the openHAB server and its classic icon set and the value is then the icon name.
Ability to use a string containing anything has been removed.
Related to #3052
Signed-off-by: Laurent Garnier [email protected]