2 files changed, 54 insertions, 25 deletions
diff --git a/applications/luci-app-nut/luasrc/controller/nut.lua b/applications/luci-app-nut/luasrc/controller/nut.lua
deleted file mode 100644
index 5598451d6e..0000000000
--- a/applications/luci-app-nut/luasrc/controller/nut.lua
+++ /dev/null
@@ -1,25 +0,0 @@
--- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com>
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.controller.nut", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/nut_server") and not nixio.fs.access("/etc/config/nut_monitor") and not nixio.fs.access("/etc/config/nut_cgi") then
-		return
-	end
-
-	entry({"admin", "services", "nut"}, firstchild(), _("Network UPS Tools"))
-
-	if nixio.fs.access("/etc/config/nut_server") then
-		entry({"admin", "services", "nut", "server"}, cbi("nut_server"), _("Network UPS Tools (Server)"), 20)
-	end
-
-	if nixio.fs.access("/etc/config/nut_monitor") then
-		entry({"admin", "services", "nut", "monitor"}, cbi("nut_monitor"), _("Network UPS Tools (Monitor)"), 30)
-	end
-
-	if nixio.fs.access("/etc/config/nut_cgi") then
-		entry({"admin", "services", "nut", "cgi"}, cbi("nut_cgi"), _("Network UPS Tools (CGI)"), 40)
-	end
-end
-
diff --git a/applications/luci-app-nut/root/usr/share/luci/menu.d/luci-app-nut.json b/applications/luci-app-nut/root/usr/share/luci/menu.d/luci-app-nut.json
new file mode 100644
index 0000000000..f2cd6e7853
--- /dev/null
+++ b/applications/luci-app-nut/root/usr/share/luci/menu.d/luci-app-nut.json
@@ -0,0 +1,54 @@
+{
+	"admin/services/nut": {
+		"title": "Network UPS Tools",
+		"action": {
+			"type": "firstchild"
+		},
+		"depends": {
+			"uci": [
+				{ "nut_server": true },
+				{ "nut_monitor": true },
+				{ "nut_cgi": true }
+			]
+		}
+	},
+
+	"admin/services/nut/server": {
+		"title": "Network UPS Tools (Server)",
+		"order": 1,
+		"action": {
+			"type": "cbi",
+			"path": "nut_server",
+			"post": { "cbi.submit": true }
+		},
+		"depends": {
+			"uci": { "nut_server": true }
+		}
+	},
+
+	"admin/services/nut/monitor": {
+		"title": "Network UPS Tools (Monitor)",
+		"order": 2,
+		"action": {
+			"type": "cbi",
+			"path": "nut_monitor",
+			"post": { "cbi.submit": true }
+		},
+		"depends": {
+			"uci": { "nut_monitor": true }
+		}
+	},
+
+	"admin/services/nut/cgi": {
+		"title": "Network UPS Tools (CGI)",
+		"order": 3,
+		"action": {
+			"type": "cbi",
+			"path": "nut_cgi",
+			"post": { "cbi.submit": true }
+		},
+		"depends": {
+			"uci": { "nut_cgi": true }
+		}
+	}
+}