v.3.36.1

CHANGELOG.md

@@ -1,4 +1,11 @@
 # Versionsinformationen
+## v.3.36.1 (21.01.2023)
+**Bugfix**
+- Standard-Template: Icongröße für Menü korrigiert, wenn ein Slider verwendet wird
+
+**sonstiges**
+- sicherheitsrelevante Updates
+
 ## v.3.36.0 (27.11.2022)
 **Features**
 - Template Chart2: alternatives Template zu Chart mit verbesserten Konfigurarionsmöglichkeiten 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhemapp",
-  "version": "3.36.0", 
+  "version": "3.36.1", 
   "private": true,
   "author": "jemu75",
   "scripts": {

public/cfg/templ_shellyswitch_timer_mqtt.json

@@ -0,0 +1,30 @@
+{
+  "name": "shellyswitch_timer_mqtt",
+  "author": "jemu75",
+  "date": "2022-12-10",
+  "status": {
+    "bar": ["state:off:0:on","apower:5:100:on","apower:0.1:100:standby","relay_0_power:0.1:100:on","relay_0_power:0:100:standby","state:on:100:on"],
+    "error": ["mqtt_connected:false:100:error:keine Verbindung"]
+  },
+  "main": [
+    {
+        "text": ["state:off:aus","apower:5:an","apower:0.1:standby","relay_0_power:0.1:an","relay_0_power:0:standby","state:on:an"],
+        "rightBtn": "mdi-timer-outline",
+        "rightMenu": ["aus:off","30 Minuten:on-for-timer 1800","1 Stunde:on-for-timer 3600","2 Stunden:on-for-timer 7200"]
+      },  
+    {
+      "leftBtn": "mdi-power-off",
+      "leftClick": ["state::off"],
+      "text": ["state:off:aus","apower:5:an","apower:0.1:standby","relay_0_power:0.1:an","relay_0_power:0:standby","state:on:an"],
+      "rightBtn": "mdi-power-on",
+      "rightClick": ["state::on"]
+    }
+  ],
+  "info": {
+    "left1": ["state:on::mdi-power-plug","state:::mdi-power-plug-off"],
+    "left2": ["relay_0_power:0.1:%n.2w","apower:0.1:%n.1w"],
+    "mid1": ["temperature::%n.1°C"],
+    "right1": ["new_fw:true::mdi-cloud-download"],
+    "right2": ["mqtt_connected:true::mdi-wifi","mqtt_connected:::mdi-wifi-off"]
+  }
+}

src/components/TemplDefault.vue

@@ -104,9 +104,18 @@
                         v-bind="attrs"
                         v-on="on"
                       >
+                      <div v-if="level.slider">
+                        <v-icon>
+                          {{ level.leftBtn }}
+                        </v-icon>
+                      </div>                        
+
+                      <div v-if="!level.slider">
                         <v-icon large>
                           {{ level.leftBtn }}
                         </v-icon>
+                      </div>                        
+
                       </v-btn>
                     </template>
 
@@ -315,9 +324,18 @@
                         v-bind="attrs"
                         v-on="on"
                       >
+
+                      <div v-if="level.slider">
+                        <v-icon>
+                          {{ level.rightBtn }}
+                        </v-icon>
+                      </div>                        
+
+                      <div v-if="!level.slider">
                         <v-icon large>
                           {{ level.rightBtn }}
                         </v-icon>
+                      </div>                        
                       </v-btn>
                     </template>
 

www/fhemapp/cfg/templ_shellyswitch_timer_mqtt.json

@@ -0,0 +1,30 @@
+{
+  "name": "shellyswitch_timer_mqtt",
+  "author": "jemu75",
+  "date": "2022-12-10",
+  "status": {
+    "bar": ["state:off:0:on","apower:5:100:on","apower:0.1:100:standby","relay_0_power:0.1:100:on","relay_0_power:0:100:standby","state:on:100:on"],
+    "error": ["mqtt_connected:false:100:error:keine Verbindung"]
+  },
+  "main": [
+    {
+        "text": ["state:off:aus","apower:5:an","apower:0.1:standby","relay_0_power:0.1:an","relay_0_power:0:standby","state:on:an"],
+        "rightBtn": "mdi-timer-outline",
+        "rightMenu": ["aus:off","30 Minuten:on-for-timer 1800","1 Stunde:on-for-timer 3600","2 Stunden:on-for-timer 7200"]
+      },  
+    {
+      "leftBtn": "mdi-power-off",
+      "leftClick": ["state::off"],
+      "text": ["state:off:aus","apower:5:an","apower:0.1:standby","relay_0_power:0.1:an","relay_0_power:0:standby","state:on:an"],
+      "rightBtn": "mdi-power-on",
+      "rightClick": ["state::on"]
+    }
+  ],
+  "info": {
+    "left1": ["state:on::mdi-power-plug","state:::mdi-power-plug-off"],
+    "left2": ["relay_0_power:0.1:%n.2w","apower:0.1:%n.1w"],
+    "mid1": ["temperature::%n.1°C"],
+    "right1": ["new_fw:true::mdi-cloud-download"],
+    "right2": ["mqtt_connected:true::mdi-wifi","mqtt_connected:::mdi-wifi-off"]
+  }
+}

www/fhemapp/index.html

@@ -1 +1 @@
-<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" src="js/chunk-vendors.60a5ef53.js"></script><script defer="defer" src="js/app.7b104092.js"></script><link href="css/chunk-vendors.d5cb8535.css" rel="stylesheet"><link href="css/app.9b8c7eb5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" src="js/chunk-vendors.e75fc7f3.js"></script><script defer="defer" src="js/app.7f5956b9.js"></script><link href="css/chunk-vendors.d5cb8535.css" rel="stylesheet"><link href="css/app.9b8c7eb5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>