OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[BasicUI] Fix label color initialization for color widget (#1753) 

Fix #1752

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
pull/1751/head^2
lolodomo 2023-03-04 22:24:22 +01:00 committed by GitHub
parent 7553748c78
commit 66b55547a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java
View File

@ -89,19 +89,8 @@ public class ColorpickerRenderer extends AbstractWidgetRenderer {
snippet = snippet.replace("%frequency%", frequency); snippet = snippet.replace("%frequency%", frequency);
snippet = snippet.replace("%servletname%", WebAppServlet.SERVLET_PATH); snippet = snippet.replace("%servletname%", WebAppServlet.SERVLET_PATH);
String style = ""; // Process the color tags
String color = itemUIRegistry.getLabelColor(w); snippet = processColor(w, snippet);
if (color != null) {
style = "color:" + color;
}
snippet = snippet.replace("%labelstyle%", style);
style = "";
color = itemUIRegistry.getValueColor(w);
if (color != null) {
style = "color:" + color;
}
snippet = snippet.replace("%valuestyle%", style);
sb.append(snippet); sb.append(snippet);
return ECollections.emptyEList(); return ECollections.emptyEList();

2
bundles/org.openhab.ui.basic/src/main/resources/snippets/colorpicker.html
View File

@ -2,7 +2,7 @@
<span class="mdl-form__icon"> <span class="mdl-form__icon">
%icon_snippet% %icon_snippet%
</span> </span>
<span class="mdl-form__label"> <span %labelstyle% class="mdl-form__label">
%label% %label%
</span> </span>
<div <div