some fix and new firmware for shelly1

app/templates/js/script.js

@@ -64,16 +64,16 @@ if ('serviceWorker' in navigator) {
 $('select[name="atSelector"]').change(function(e) {
     console.log($(this).val());
     if( $(this).val() == 'time') {
-        
+
         $('input[name="atTime"]').prop( "disabled", false );
-        
+
         $('select[name="atDeviceValueInt"]').prop( "disabled", true );
         $('input[name="atDeviceValue"]').prop( "disabled", true );
     } else if( $(this).val() == 'atDeviceValue') {
-        
+
         $('select[name="atDeviceValue"]').prop( "disabled", false );
         $('input[name="atDeviceValueInt"]').prop( "disabled", false );
-        
+
         $('input[name="atTime"]').prop( "disabled", true );
     }
 });
@@ -88,7 +88,7 @@ $("div.square-content").on('touchend', function (e){
 $("div.square-content").on('touchstart', function (eTarget) {
     navigator.vibrate([500]);
     var id = '';
-    
+
     var windowLoc = $(location).attr('pathname');
     windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
     console.log(windowLoc);
@@ -99,9 +99,9 @@ $("div.square-content").on('touchstart', function (eTarget) {
     } else if (windowLoc == "/automation") {
         id = $(this).attr('id').replace('automation-', '');
     }
-    
+
     var subId = $(this).attr('data-sub-device-id');
-    
+
     touch++;
     if(touch == 2 && touchSubId == subId){
         console.log("Detail");
@@ -109,7 +109,7 @@ $("div.square-content").on('touchstart', function (eTarget) {
             $("#modal-detail-"+subId).removeClass('modal-container-hiden').show();
             ajaxChart(subId);
         } else if (windowLoc == "/scene") {
-            
+
         } else if (windowLoc == "/automation") {
         }
         touch = 0;
@@ -117,7 +117,7 @@ $("div.square-content").on('touchstart', function (eTarget) {
         return;
     }
     touchSubId = subId;
-    
+
     pressTimer = window.setTimeout(function (e) {
         console.log("Setting");
         $("#modal-setting-"+id).removeClass('modal-container-hiden').show();
@@ -202,14 +202,14 @@ var windowLoc = $(location).attr('pathname');
 windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
 console.log();
 if (windowLoc == "/") {
-    
+
     var selectRoomId = localStorage.getItem("selectedRoomId");
-    
+
     if (selectRoomId == null) {
         selectRoomId = 'all';
     }
-    
-    
+
+
     console.log('Saved Selected Room ID '+ selectRoomId);
     $('[name="room"]').val(selectRoomId);
     $('.device-button').each(function(){
@@ -221,8 +221,8 @@ if (windowLoc == "/") {
             }
         }
     });
-    
-    
+
+
 }
 
 //Room selector
@@ -239,51 +239,55 @@ $( '[name="room"]' ).change(function (e) {
         });
     }
 });
+
+
 /*
 var windowLoc = $(location).attr('pathname');
 windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
 console.log();
 if (windowLoc == "/") {
-var autoUpdate = setInterval(function(){
-if (pending == false) {
-pending = true;
-$.ajax({
-url: 'ajax',
-type: 'POST',
-dataType: 'json',
-data: {
-"action": 'getState'
-},
-success: function(data){
-console.log(data);
-for (const key in data) {
-if (data.hasOwnProperty(key)) {
-const device = data[key];
-$('[data-sub-device-id="'+key+'"]')
-.find('.device-button-value')
-.text(device['value'])
-.attr('title',device['time'])
-}
-}
-},
-error: function (request, status, error) {
-console.log("ERROR ajaxChart():", request, error);
-},
-complete: function (){
-pending = false;
-}
-});
-}
-},4000);
+    var autoUpdate = setInterval(function(){
+        if (pending == false) {
+            pending = true;
+            $.ajax({
+                url: 'ajax',
+                type: 'POST',
+                dataType: 'json',
+                data: {
+                    "action": 'getState'
+                },
+                success: function(data){
+                    console.log(data);
+                    for (const key in data) {
+                        if (data.hasOwnProperty(key)) {
+                            const device = data[key];
+                            $('[data-sub-device-id="'+key+'"]')
+                            .find('.device-button-value')
+                            .text(device['value'])
+                            .attr('title',device['time'])
+                        }
+                    }
+                },
+                error: function (request, status, error) {
+                    console.log("ERROR ajaxChart():", request, error);
+                },
+                complete: function (){
+                    pending = false;
+                }
+            });
+        }
+    },4000);
 }*/
 
 
+
+
 //Graphs
 $('.graph-period').on('click', function (e) {
     var subId = $(this).attr('data-sub-device-id');
     var period = $(this).attr('data-period');
     var groupBy = $(this).attr('data-group');
-    
+
     ajaxChart(subId, period, groupBy);
 });
 

app/templates/log.phtml

@@ -22,6 +22,7 @@
         </div>
         <div class="col-md-9 main-body">
             <div class="col-12 col-sm-9 mx-auto mt-4">
+                <label><?php echo $LANGMNG->get('l_logMaxLiveTime') . " " . $LOGTOLIVETIME . " days";?></label>
                 <form method="post" action="">
                     <div class="field">
                         <select class="input" name="LogFile">

app/templates/part/deviceEdit.phtml

@@ -22,11 +22,11 @@
                     </div>
                     <div class="label"><?php $LANGMNG->echo('l_permission'); ?></div>
                     <div class="row">
-                        
+
                         <div class="col-6">
                             <div class="label"> - <?php $LANGMNG->echo('l_owner'); ?></div>
                         </div>
-                        
+
                         <div class="col-6">
                             <?php
                             $permissions = $DEVICE['permission'];
@@ -40,7 +40,7 @@
                             <input type="radio" name="permissionOwner" value=1 <?php ECHO ($permissions[0] == 1 ? 'checked' : ''); ?>/><?php $LANGMNG->echo('l_read'); ?>
                             <input type="radio" name="permissionOwner" value=2 <?php ECHO ($permissions[0] == 2 ? 'checked' : ''); ?>/><?php $LANGMNG->echo('l_use'); ?>
                             <input type="radio" name="permissionOwner" value=3 <?php ECHO ($permissions[0] == 3 ? 'checked' : ''); ?>/><?php $LANGMNG->echo('l_edit'); ?>
-                            
+
                         </div>
                     </div>
                     <div class="row">
@@ -156,10 +156,10 @@
                             <div class="device-button col-4 col-sm-3 col-xl-2 square-wrap">
                                 <div class="square">
                                     <div class="square-content">
-                                        
+
                                         <?php echo $DEVICE['name']; ?>
-                                        
-                                        
+
+
                                     </div>
                                 </div>
                             </div>