From 7cf816c903fbab203ca12470e5f5f610880780a7 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 16 Sep 2021 17:15:22 +0200 Subject: [PATCH] Added collapsable panels to zigbee network page --- ...node_overview.tmpl => zigbee_network.tmpl} | 50 ++++++++++++++----- ...erviewPage.java => ZigbeeNetworkPage.java} | 10 ++-- .../src/se/hal/plugin/zigbee/plugin.json | 2 +- 3 files changed, 44 insertions(+), 18 deletions(-) rename plugins/hal-zigbee/resource/resource/web/{zigbee_node_overview.tmpl => zigbee_network.tmpl} (75%) rename plugins/hal-zigbee/src/se/hal/plugin/zigbee/page/{ZigbeeNodeOverviewPage.java => ZigbeeNetworkPage.java} (82%) diff --git a/plugins/hal-zigbee/resource/resource/web/zigbee_node_overview.tmpl b/plugins/hal-zigbee/resource/resource/web/zigbee_network.tmpl similarity index 75% rename from plugins/hal-zigbee/resource/resource/web/zigbee_node_overview.tmpl rename to plugins/hal-zigbee/resource/resource/web/zigbee_network.tmpl index cc200e91..84298066 100644 --- a/plugins/hal-zigbee/resource/resource/web/zigbee_node_overview.tmpl +++ b/plugins/hal-zigbee/resource/resource/web/zigbee_network.tmpl @@ -33,8 +33,12 @@ {{#nodes}}
-
Node: {{.getIeeeAddress()}}
-
+ + + +
Node Description
@@ -90,19 +94,24 @@
+ +
{{#.getEndpoints()}}
-
Endpoint: {{.getDeviceId()}}
-
+ +
-

Input Clusters:

+

Input Clusters:

{{#.inputClusters.values()}}
-
Cluster: {{.getClusterId()}}
-
- + +
@@ -123,12 +132,14 @@ {{/.inputClusters.values()}} -

Output Clusters:

+

Output Clusters:

{{#.outputClusters.values()}}
-
Cluster: {{.getClusterId()}}
-
ID
@@ -156,4 +167,19 @@ -{{/nodes}} \ No newline at end of file +{{/nodes}} + + \ No newline at end of file diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/page/ZigbeeNodeOverviewPage.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/page/ZigbeeNetworkPage.java similarity index 82% rename from plugins/hal-zigbee/src/se/hal/plugin/zigbee/page/ZigbeeNodeOverviewPage.java rename to plugins/hal-zigbee/src/se/hal/plugin/zigbee/page/ZigbeeNetworkPage.java index 79ea01bc..72e70ee4 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/page/ZigbeeNodeOverviewPage.java +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/page/ZigbeeNetworkPage.java @@ -12,12 +12,12 @@ import zutil.parser.Templator; import java.util.Map; import java.util.Set; -public class ZigbeeNodeOverviewPage extends HalWebPage { - private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/zigbee_node_overview.tmpl"; +public class ZigbeeNetworkPage extends HalWebPage { + private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/zigbee_network.tmpl"; - public ZigbeeNodeOverviewPage() { - super("zigbee_overview"); - super.getRootNav().createSubNav("Settings").createSubNav(this.getId(), "Zigbee Overview").setWeight(10_000); + public ZigbeeNetworkPage() { + super("zigbee_network"); + super.getRootNav().createSubNav("Settings").createSubNav(this.getId(), "Zigbee Network").setWeight(10_000); } @Override diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json index 1885883a..e2a77789 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json @@ -13,6 +13,6 @@ {"se.hal.intf.HalAutostartController": "se.hal.plugin.zigbee.ZigbeeController"}, {"se.hal.intf.HalDaemon": "se.hal.plugin.zigbee.ZigbeeAttributeUpdateDaemon"}, - {"se.hal.intf.HalWebPage": "se.hal.plugin.zigbee.page.ZigbeeNodeOverviewPage"} + {"se.hal.intf.HalWebPage": "se.hal.plugin.zigbee.page.ZigbeeNetworkPage"} ] } \ No newline at end of file