v.3.36.2

jemu75 · Jan 21, 2023 · 091c17e · 091c17e
1 parent 94fb1b5
commit 091c17e
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Versionsinformationen
+## v.3.36.2 (21.01.2023)
+**Bugfix**
+- Standard-Template: bei Verwendung von Menu wird jetzt auch die Iconfarbe und Disabled berücksichtigt
+
 ## v.3.36.1 (21.01.2023)
 **Bugfix**
 - Standard-Template: Icongröße für Menü korrigiert, wenn ein Slider verwendet wird

diff --git a/README.md b/README.md
@@ -206,20 +206,20 @@ In den Template-Dateien können folgende Eigenschaften definiert werden. Die Zuw
   },
   "main": [
     {
-      "leftBtn": ["reading:value:icon:disabled"],
+      "leftBtn": ["reading:value:icon:disabled:color"],
       "leftClick": ["reading:value:set_param"],
       "leftLong": ["reading:value:set_param"],
       "leftLongRelease": ["reading:value:set_param"],
       "leftMenu": ["text:set_param"],
       "text": ["reading:value:text:align"],
       "text2": ["reading:value:text:align"],
       "slider": ["reading:value:set_param:current:min:max:steps"],
-      "midBtn": ["reading:value:icon:disabled"],
+      "midBtn": ["reading:value:icon:disabled:color"],
       "midClick": ["reading:value:set_param"],
       "midLong": ["reading:value:set_param"],
       "midLongRelease": ["reading:value:set_param"],
       "midMenu": ["text:set_param"],
-      "rightBtn": ["reading:value:icon:disabled"],
+      "rightBtn": ["reading:value:icon:disabled:color"],
       "rightClick": ["reading:value:set_param"],
       "rightLong": ["reading:value:set_param"],
       "rightLongRelease": ["reading:value:set_param"],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhemapp",
-  "version": "3.36.1", 
+  "version": "3.36.2", 
   "private": true,
   "author": "jemu75",
   "scripts": {

diff --git a/public/cfg/config.json b/public/cfg/config.json
@@ -1,4 +1,9 @@
-{  
+{
+  "connection": {
+    "location": "http://fhem",
+    "port": "8083",
+    "path": "fhem"
+  },
   "options": {
     "maxChartPoints": 150,
     "logBuffer": 500

diff --git a/src/components/TemplDefault.vue b/src/components/TemplDefault.vue
@@ -101,6 +101,8 @@
                       <v-btn
                         small
                         icon
+                        :color="level.leftBtnColor"
+                        :disabled="level.leftBtnDisabled"
                         v-bind="attrs"
                         v-on="on"
                       >
@@ -214,6 +216,8 @@
                         v-if="!level.text"
                         small
                         icon
+                        :disabled="level.midBtnDisabled"
+                        :color="level.midBtnColor"
                         v-bind="attrs"
                         v-on="on"
                       >
@@ -321,6 +325,8 @@
                       <v-btn
                         small
                         icon
+                        :disabled="level.rightBtnDisabled"
+                        :color="level.rightBtnColor"
                         v-bind="attrs"
                         v-on="on"
                       >

diff --git a/www/fhemapp/css/609.7dde73af.css → www/fhemapp/css/259.7dde73af.css b/www/fhemapp/css/609.7dde73af.css → www/fhemapp/css/259.7dde73af.css
diff --git a/www/fhemapp/index.html b/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.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>
+<!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.cac0b616.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>
diff --git a/www/fhemapp/js/259.f397cfaa.js b/www/fhemapp/js/259.f397cfaa.js
diff --git a/www/fhemapp/js/609.352726ea.js b/www/fhemapp/js/609.352726ea.js
diff --git a/www/fhemapp/js/654.9f84969d.js → www/fhemapp/js/654.d05facf3.js b/www/fhemapp/js/654.9f84969d.js → www/fhemapp/js/654.d05facf3.js
diff --git a/www/fhemapp/js/app.7f5956b9.js → www/fhemapp/js/app.cac0b616.js b/www/fhemapp/js/app.7f5956b9.js → www/fhemapp/js/app.cac0b616.js
Original file line number	Diff line number	Diff line change
		@@ -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.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>
		<!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.cac0b616.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>