2 files changed, 34 insertions, 37 deletions
diff --git a/applications/luci-app-rosy-file-server/luasrc/controller/rosy-file-server/rosy-file-server.lua b/applications/luci-app-rosy-file-server/luasrc/controller/rosy-file-server/rosy-file-server.lua
deleted file mode 100644
index dd5598a689..0000000000
--- a/applications/luci-app-rosy-file-server/luasrc/controller/rosy-file-server/rosy-file-server.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- Copyright 2018 Rosy Song <rosysong@rosinson.com>
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.controller.rosy-file-server.rosy-file-server", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/rosyfs") then
-		return
-	end
-
-	local root = node()
-	if not root.target then
-		root.target = alias("httpfs")
-		root.index = true
-	end
-
-	page          = node()
-	page.lock     = true
-	page.target   = alias("httpfs")
-	page.subindex = true
-	page.index    = false
-
-	page          = node("httpfs")
-	page.title    = _("Rosy File Server")
-	page.target   = alias("httpfs", "rosy-file-server")
-	page.order    = 5
-	page.setuser  = "root"
-	page.setgroup = "root"
-	page.index    = true
-
-	entry({"httpfs", "rosy-file-server"},
-		form("rosy-file-server/rosy-file-server"), _("Rosy File Server"), 10)
-
-	entry({"admin", "services", "rosyfs"},
-		cbi("rosy-file-server/rosyfs"), _("Rosy File Server"), 61)
-end
-
diff --git a/applications/luci-app-rosy-file-server/root/usr/share/luci/menu.d/luci-app-rosy-file-server.json b/applications/luci-app-rosy-file-server/root/usr/share/luci/menu.d/luci-app-rosy-file-server.json
new file mode 100644
index 0000000000..03e7fd0f4a
--- /dev/null
+++ b/applications/luci-app-rosy-file-server/root/usr/share/luci/menu.d/luci-app-rosy-file-server.json
@@ -0,0 +1,34 @@
+{
+	"httpfs": {
+		"title": "Rosy File Server",
+		"order": 5,
+		"setuser": "root",
+		"setgroup": "root",
+		"action": {
+			"type": "firstchild"
+		},
+		"depends": {
+			"uci": { "rosyfs": true }
+		}
+	},
+
+	"httpfs/rosy-file-server": {
+		"title": "Rosy File Server",
+		"order": 1,
+		"action": {
+			"type": "form",
+			"path": "rosy-file-server/rosy-file-server",
+			"post": { "cbi.submit": true }
+		}
+	},
+
+	"admin/services/rosyfs": {
+		"title": "Rosy File Server",
+		"order": 61,
+		"action": {
+			"type": "cbi",
+			"path": "rosy-file-server/rosyfs",
+			"post": { "cbi.submit": true }
+		}
+	}
+}