Skip to content

A few fixes to ALTUI displays #39

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

Open
rafale77 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

A few fixes to ALTUI displays #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daf6475
A few fixes to ALTUI displays
rafale77 Mar 10, 2021
bf34215
Update J_ALTUI_plugins.js
rafale77 Mar 13, 2021
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
12 changes: 7 additions & 5 deletions J_ALTUI_plugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ var ALTUI_PluginDisplays= ( function( window, undefined ) {
style += ".altui-dimmable-qubino-btn { padding: 3px 0px 0px 0px; height:25px;}";
style += ".altui-dimmable-qubino-btn-img { width:100%; height:100% }";
style += ".altui-dimmable-slider { margin-left: 60px; margin-right: 70px; margin-top:5px;}";
style += ".altui-window-slider { margin-left: 60px; margin-right: 110px; margin-top:5px;}";
style += ".altui-colorpicker { margin-top: 2px; width:30px; margin-right: 15px; }";
style += ".altui-infoviewer-log-btn,.altui-infoviewer-btn,.altui-window-btn,.altui-datamine-open { margin-top: 10px; }";
style += ".altui-infoviewer-pattern { font-size: 14px; }";
Expand Down Expand Up @@ -689,11 +690,12 @@ var ALTUI_PluginDisplays= ( function( window, undefined ) {
html += (" <button id ='altui-window-Down' type='button' class='altui-window-btn btn btn-light btn-sm {0}'>"+_T("Down")+"</button>").format( (status==0) ? 'active' : '' );
html += "</div>";
html += "</div>";

html += ("<span id='slider-val-"+device.altuiid+"' class='altui-dimmable' >"+status+"% </span>");
html += ("<div id='slider-{0}' class='altui-window-slider' ></div>").format(device.altuiid);
html += "<script type='text/javascript'>";
html += " $('div#altui-wc-{0} button').on('click', function() { ALTUI_PluginDisplays.onClickWindowCoverButton($(this)); } );".format(device.altuiid);
html += "$('div#slider-{0}.altui-window-slider').slider({ max:100,min:0,value:{1},change:ALTUI_PluginDisplays.onSliderChange });".format(device.altuiid,status);
html += "</script>";

return html;
};

Expand Down Expand Up @@ -776,8 +778,8 @@ var ALTUI_PluginDisplays= ( function( window, undefined ) {
// "w,c,r,g,b" - w = warm white value, c = cool white value
// "ct" - ct = color temperature value in Kelvin (integer between 2000 and 9000)

// try Target then Current
current = MultiBox.getStatus(device,'urn:micasaverde-com:serviceId:Color1','TargetColor') || MultiBox.getStatus(device,'urn:micasaverde-com:serviceId:Color1','CurrentColor');
// try Current then Target
current = MultiBox.getStatus(device,'urn:micasaverde-com:serviceId:Color1','CurrentColor') || MultiBox.getStatus(device,'urn:micasaverde-com:serviceId:Color1','TargetColor');
if (current!=null) {
var parts = current.split(","); // 0=0,1=0,2=0,3=0,4=255
// normalize the values
Expand Down Expand Up @@ -1840,7 +1842,7 @@ var ALTUI_PluginDisplays= ( function( window, undefined ) {
}
html += " </div>"+
"</div>";
}
}
html += "<div style='height: 20px;'>&nbsp;</div>"+
"<div class='container-fluid'>"+
" <div class='row' style='height: 30px;'>"+
Expand Down