2 files changed, 30 insertions, 15 deletions
diff --git a/applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua b/applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua
deleted file mode 100644
index cf7e974d6c..0000000000
--- a/applications/luci-app-tinyproxy/luasrc/controller/tinyproxy.lua
+++ /dev/null
@@ -1,15 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.controller.tinyproxy", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/tinyproxy") then
-		return
-	end
-
-	entry({"admin", "services", "tinyproxy"}, alias("admin", "services", "tinyproxy", "config"), _("Tinyproxy"))
-	entry({"admin", "services", "tinyproxy", "status"}, template("tinyproxy_status"), _("Status"))
-	entry({"admin", "services", "tinyproxy", "config"}, cbi("tinyproxy"), _("Configuration"))
-end
diff --git a/applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json b/applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json
new file mode 100644
index 0000000000..e89c140e39
--- /dev/null
+++ b/applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json
@@ -0,0 +1,30 @@
+{
+	"admin/services/tinyproxy": {
+		"title": "Tinyproxy",
+		"action": {
+			"type": "firstchild"
+		},
+		"depends": {
+			"uci": { "tinyproxy": true }
+		}
+	},
+
+	"admin/services/tinyproxy/status": {
+		"title": "Status",
+		"order": 1,
+		"action": {
+			"type": "template",
+			"path": "tinyproxy_status"
+		}
+	},
+
+	"admin/services/tinyproxy/config": {
+		"title": "Configuration",
+		"order": 2,
+		"action": {
+			"type": "cbi",
+			"path": "tinyproxy",
+			"post": { "cbi.submit": true }
+		}
+	}
+}