From 7d0f5021541697374716b82b8b331669a69f4a81 Mon Sep 17 00:00:00 2001 From: doudz Date: Mon, 12 Aug 2019 11:00:35 +0200 Subject: [PATCH 1/7] update zigate lib --- resources/zigate_version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/zigate_version.txt b/resources/zigate_version.txt index 989b29c..d721c76 100644 --- a/resources/zigate_version.txt +++ b/resources/zigate_version.txt @@ -1 +1 @@ -0.32.2 +0.32.3 From c1fe54d53fd3e9cf641d7d97a30b70c19cff3f73 Mon Sep 17 00:00:00 2001 From: doudz Date: Mon, 12 Aug 2019 11:04:43 +0200 Subject: [PATCH 2/7] bump to 1.3.6 --- plugin_info/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin_info/info.json b/plugin_info/info.json index c241ee3..8e7cd96 100644 --- a/plugin_info/info.json +++ b/plugin_info/info.json @@ -16,5 +16,5 @@ "documentation": "https://jeedom-zigate.github.io/jeedom-plugin-zigate", "language": ["fr_FR", "en_US"], "compatibility": ["Jeedomboard", "RPI/RPI2", "Docker", "DIY"], - "pluginVersion": "1.3.5" + "pluginVersion": "1.3.6" } From 26f24258a1eb7d8b9f015314272d3cc51fbdd9bd Mon Sep 17 00:00:00 2001 From: doudz Date: Fri, 16 Aug 2019 15:18:02 +0200 Subject: [PATCH 3/7] =?UTF-8?q?Pr=C3=A9paration=20support=20jeedom=20v4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop/js/zigate.js | 8 --- desktop/php/zigate.php | 139 ++++++++++++++++------------------------- plugin_info/info.json | 2 +- 3 files changed, 54 insertions(+), 95 deletions(-) diff --git a/desktop/js/zigate.js b/desktop/js/zigate.js index 31606f4..a331b13 100644 --- a/desktop/js/zigate.js +++ b/desktop/js/zigate.js @@ -90,14 +90,6 @@ $('#bt_reset').on('click', function () { reset(); }); -$('#bt_touchlink').on('click', function () { - callZiGate('initiate_touchlink'); -}); - -$('#bt_networkscan').on('click', function () { - callZiGate('start_network_scan'); -}); - $('#bt_cleanup_devices').on('click', function () { bootbox.confirm('{{Etes-vous sûr de vouloir effacer les équipements manquants ?}}', function (result) { if (result) { diff --git a/desktop/php/zigate.php b/desktop/php/zigate.php index 4d848f5..136bf32 100644 --- a/desktop/php/zigate.php +++ b/desktop/php/zigate.php @@ -32,119 +32,86 @@ ?>
-
-
- -
-
- -
- {{Gestion}} +
+ {{Gestion}}
-
-
- -
-
{{Mode inclusion}}
 -
- -
-
- -
-
{{Scan réseau}}
 +
+ +
+ {{Mode inclusion}}
-
-
- -
-
{{Synchroniser}}
 +
+ +
+ {{Synchroniser}}
-
-
- -
-

{{Nettoyer}}

 +
+ +
+ {{Nettoyer}}
-
-
- -
-
{{Redémarrage Zigate}}
 +
+ +
+ {{Redémarrage Zigate}}
-
-
- -
-

{{Effacement Zigate}}

 +
+ +
+ {{Effacement Zigate}}
-
-
- -
- {{Configuration}} +
+ +
+ {{Configuration}}
-
-
- -
-
{{Santé}}
 +
+ +
+ {{Santé}}
-
-
- -
-
{{Terminal}}
 +
+ +
+ {{Terminal}}
- {{Mes équipements ZiGate}} - + {{Mes équipements ZiGate}} +
getIsEnable()) ? '' : jeedom::getConfiguration('eqLogic:style:noactive'); - echo '
'; + $opacity = ($eqLogic->getIsEnable()) ? '' : 'disableCard'; + echo '
'; echo "
"; echo ''; echo "
"; - echo '
' . $eqLogic->getHumanName(true, true) . '
'; + echo 'getHumanName(true, true) . ''; echo '
'; } - // phpcs:enable Generic.Files.LineLength.TooLong ?> -
-