Merge pull request #42 from domoticz/beta

v1.16.2
domoticz · Aug 24, 2020 · 83e6be5 · 83e6be5
2 parents a96773a + 7d965f4
commit 83e6be5
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ git clone https://github.com/domoticz/machinon.git machinon
 sudo /etc/init.d/domoticz.sh restart
 ```
 
-Tu update it:
+To update it:
 ```
 cd /home/${USER}/domoticz/www/styles/machinon
 git pull

diff --git a/css/floorplan.css b/css/floorplan.css
@@ -40,6 +40,12 @@ g text {
     fill: var(--main-text-color) !important;
 }
 
+g.selector .level-list .level path {
+    fill: var(--main-item-bg-color);
+    stroke: var(--main-item-bg-color);
+}
+
+
 image#twisty {
     display: none;
 }

diff --git a/custom.css b/custom.css
@@ -120,6 +120,7 @@ h4,
 #logdata_status,
 #logdata_error {
     background: var(--main-navbar-bg-color);
+    max-height: calc(100vh - 220px);
 }
 
 .lognorm {
@@ -208,9 +209,10 @@ h4,
     }
 
     #search:hover #searchInput,
-        #search:active #searchInput,
-        #search:focus  #searchInput {
+    #search:active #searchInput,
+    #search:focus #searchInput {
         width: calc(100% - 60px);
+        max-width: unset;
         transform: translate(30px, 45px);
         background: var(--main-blue-color);
         box-shadow: 0px 0px 10px 2px rgba(0, 0, 0, 0.2);
@@ -555,7 +557,16 @@ div.bannercontent .row.divider {
     border-radius: 5px;
 }
 
-.btn-group::-webkit-scrollbar-thumb,
+.item .btn-group {
+    display: flex !important;
+    flex-flow: wrap;
+    justify-content: space-evenly;
+    scrollbar-width: thin;
+    scrollbar-color: var(--main-blue-color) var(--main-bg-color);
+    width: 100%;
+}
+
+.item .btn-group::-webkit-scrollbar-thumb,
 .item #status::-webkit-scrollbar-thumb,
 .item .status::-webkit-scrollbar-thumb {
     background: var(--main-blue-color);
@@ -1168,10 +1179,10 @@ button.savebtn:disabled {
 }
 
 .btn-danger {
-    background: none;
+    background: rgba(255, 255, 255, .4);
     border-color: #c74343;
-    color: #c74343;
     border-radius: 1px;
+    color: #c74343;
 }
 
 .btn-danger:hover {
@@ -1652,13 +1663,7 @@ select.ui-corner-all option {
 }
 
 .btn-group {
-    display: flex !important;
-    flex-flow: wrap;
-    justify-content: space-evenly;
     padding-bottom: 1px;
-    scrollbar-width: thin;
-    scrollbar-color: var(--main-blue-color) var(--main-bg-color);
-    width: 100%;
 }
 
 /* Selector */

diff --git a/custom.js b/custom.js
@@ -174,7 +174,7 @@ function init_theme() {
             }
             $("html").addClass(theme.background_type);
             $("html").css("background-image", "url(" + bg_url + ")");
-            $("body").css("cssText", "background: transparent !important");
+            $("body").attr('style', function(i,s) { return (s || '') + 'background: transparent !important;' });
         }
         $("#cSetup").click(function() {
             showThemeSettings();

diff --git a/js/devices.js b/js/devices.js
@@ -199,8 +199,10 @@ function setDeviceLastUpdate(idx, lastupdate) {
                 $(this).find("#timeago > span").livestamp( moment(lastupdate).format());
             }
         } else {
+            var lastupd = moment(lastupdate);
+            lastupd.locale(window.navigator.language);
             $(this).find("#lastupdate").attr("title", $.t("Last Seen"));
-            $(this).find("#lastupdate").text(moment(lastupdate).format("L LT"));
+            $(this).find("#lastupdate").text(lastupd.format("L LT"));
             if ($(this).find("#lastSeen").length == 0) {
                 $(this).find("#lastupdate").prepend("<i id='lastSeen' class='ion-ios-pulse'></i> ");
             }

diff --git a/js/functions.js b/js/functions.js
@@ -76,17 +76,19 @@ function setSearch() {
 
 function searchFunction() {
     var value = $("#searchInput").val().toLowerCase();
-    $("div .item").filter(function() {
+    $("div .item").each(function() {
         var element = $(this);
         if ($("#dashcontent").length || $("#weatherwidgets").length || $("#tempwidgets").length) {
             element = $(this).parent();
         }
-        element.toggle($(this).find("#name").html().toLowerCase().indexOf(value) > -1);
+        var visibility = $(this).find("#name").html().toLowerCase().indexOf(value) > -1;
+        element.toggle(visibility);
     });
-    $(".mobileitem tr").filter(function() {
-        $(this).toggle($(this).html().toLowerCase().indexOf(value) > -1);
-    });
-    removeEmptySectionDashboard();
+    $("div.row.divider").show();
+    $("section").show();
+    if (value.length) {
+        removeEmptySectionDashboard();
+    }
 }
 
 function locationHashChanged() {

diff --git a/theme.json b/theme.json
@@ -3,7 +3,7 @@
     "name": "Machinon",
     "description": "Machinon custom theme, simple and light",
     "license": "GNU General Public License v3.0",
-    "version":"1.16.1",
+    "version":"1.16.2",
     "author": "EdddieN",
     "homepage": "https://www.github.com/domoticz/Machinon",
     "wiki": "https://www.domoticz.com/wiki/Machinon_Theme",