diff --git a/VERSION.md b/VERSION.md index 6d7de6e..21e8796 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -1.0.2 +1.0.3 diff --git a/static/css/custom.css b/static/css/custom.css index cb156d8..ee21c03 100755 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -467,7 +467,7 @@ table.no-margin .progress { @media(max-width:768px) { .tile_stats_count .count { - font-size: 30px !important; + font-size: 5.5vw !important; } .tile_stats_count .right span { font-size: 12px; @@ -1961,7 +1961,7 @@ span.right { } .tile_stats_count .count { - font-size: 40px; + font-size: 2.5vw; line-height: 47px; font-weight: 600; } diff --git a/static/js/domoboard.js b/static/js/domoboard.js index e40f72b..f1c2a45 100644 --- a/static/js/domoboard.js +++ b/static/js/domoboard.js @@ -39,7 +39,6 @@ function setDimmerState(id, idx) { var url = "/api?type=devices&rid=" + idx; requestAPI(flask_server + url, function(d) { _json = JSON.parse(d); - console.log(id); if (_json['result'][0]['Data'] != 'Off') { $('#' + id).css({'background-image': '-webkit-linear-gradient(top, #f9f9f9 0%, green 100%)', 'background-image': '-o-linear-gradient(top, #f9f9f9 0%, green 100%)', 'background-image': 'linear-gradient(to bottom, #f9f9f9 0%, green 100%)'}); } else { @@ -107,15 +106,22 @@ function refreshTopTiles(updateDivs, block, tilesPreviousArray, updateDivsTypeAr if (updateDivsUnitsArray[i]) { tilesArray[2] = updateDivsUnitsArray[i]; } - if (tilesArray[1] < tilesPreviousArray[i]) { - - $("#" + block + divID + "_" + updateDivsTypeArray[i]).html(tilesArray[1] + "" + tilesArray[2] + " "); + if (parseFloat(tilesArray[1]) < parseFloat(tilesPreviousArray[i])) { + $("#" + block + divID + "_" + updateDivsTypeArray[i]).html(tilesArray[1] + "" + tilesArray[2] + ""); + $("#" + block + divID + "_" + updateDivsTypeArray[i] + "_arrow").removeClass("green"); + $("#" + block + divID + "_" + updateDivsTypeArray[i] + "_arrow").addClass("red"); + $("#" + block + divID + "_" + updateDivsTypeArray[i] + "_arrow").removeClass("fa-caret-up"); + $("#" + block + divID + "_" + updateDivsTypeArray[i] + "_arrow").addClass("fa-caret-down"); tilesPreviousArray[i] = tilesArray[1]; - } else if (tilesArray[1] > tilesPreviousArray[i]) { - $("#" + block + divID + "_" + updateDivsTypeArray[i]).html(tilesArray[1] + "" + tilesArray[2] + " "); + } else if (parseFloat(tilesArray[1]) > parseFloat(tilesPreviousArray[i])) { + $("#" + block + divID + "_" + updateDivsTypeArray[i]).html(tilesArray[1] + "" + tilesArray[2] + ""); + $("#" + block + divID + "_" + updateDivsTypeArray[i] + "_arrow").removeClass("red"); + $("#" + block + divID + "_" + updateDivsTypeArray[i] + "_arrow").addClass("green"); + $("#" + block + divID + "_" + updateDivsTypeArray[i] + "_arrow").removeClass("fa-caret-down"); + $("#" + block + divID + "_" + updateDivsTypeArray[i] + "_arrow").addClass("fa-caret-up"); tilesPreviousArray[i] = tilesArray[1]; } else { - $("#" + block + divID + "_" + updateDivsTypeArray[i]).html(tilesArray[1] + "" + tilesArray[2] + " "); + $("#" + block + divID + "_" + updateDivsTypeArray[i]).html(tilesArray[1] + "" + tilesArray[2] + ""); } } else { $("#" + block + divID + "_" + updateDivsTypeArray[i]).html(data); @@ -338,7 +344,6 @@ function changeSetpoint(idx, val) { function refreshSetpoints(updateSetpoints, block) { $.each(updateSetpoints, function(i, setpointID) { - console.log(setpointID); var url = flask_server + "/api?type=devices&rid="+ setpointID; var setpointVal = document.getElementById("setpoint_" + setpointID + "_block_" + block); requestAPI(url, function(d) { diff --git a/templates/top_tiles.html b/templates/top_tiles.html index 8ed1bb0..b829e36 100644 --- a/templates/top_tiles.html +++ b/templates/top_tiles.html @@ -4,8 +4,8 @@
- {{k}} -
+ {{k}} +
{% endfor %}