diff --git a/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua b/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua index 92cf489c4..0270652c7 100644 --- a/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua +++ b/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua @@ -8,8 +8,8 @@ function index() entry({"admin", "services", "familycloud"},firstchild(), _("天翼家庭云/云盘提速"), 80).dependent = false - entry({"admin", "services", "familycloud", "general"},cbi("familycloud"), _("Base Setting"), 1) - entry({"admin", "services", "familycloud", "log"},form("familycloudlog"), _("Log"), 2) + entry({"admin", "services", "familycloud", "general"},cbi("familycloud/familycloud"), _("Base Setting"), 1) + entry({"admin", "services", "familycloud", "log"},form("familycloud/familycloudlog"), _("Log"), 2) entry({"admin","services","familycloud","status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-familycloud/luasrc/model/cbi/familycloud.lua b/package/lean/luci-app-familycloud/luasrc/model/cbi/familycloud/familycloud.lua similarity index 100% rename from package/lean/luci-app-familycloud/luasrc/model/cbi/familycloud.lua rename to package/lean/luci-app-familycloud/luasrc/model/cbi/familycloud/familycloud.lua diff --git a/package/lean/luci-app-familycloud/luasrc/model/cbi/familycloudlog.lua b/package/lean/luci-app-familycloud/luasrc/model/cbi/familycloud/familycloudlog.lua similarity index 100% rename from package/lean/luci-app-familycloud/luasrc/model/cbi/familycloudlog.lua rename to package/lean/luci-app-familycloud/luasrc/model/cbi/familycloud/familycloudlog.lua diff --git a/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua b/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua index 986af5808..8ff7a5427 100644 --- a/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua +++ b/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua @@ -8,5 +8,5 @@ Modify: ayongwifi@126.com www.openwrtdl.com module("luci.controller.filetransfer", package.seeall) function index() - entry({"admin", "system", "filetransfer"}, form("updownload"), _("FileTransfer"),89) + entry({"admin", "system", "filetransfer"}, form("filetransfer"), _("FileTransfer"),89) end diff --git a/package/lean/luci-app-filetransfer/luasrc/model/cbi/updownload.lua b/package/lean/luci-app-filetransfer/luasrc/model/cbi/filetransfer.lua similarity index 94% rename from package/lean/luci-app-filetransfer/luasrc/model/cbi/updownload.lua rename to package/lean/luci-app-filetransfer/luasrc/model/cbi/filetransfer.lua index f44a95c73..0317b48c2 100644 --- a/package/lean/luci-app-filetransfer/luasrc/model/cbi/updownload.lua +++ b/package/lean/luci-app-filetransfer/luasrc/model/cbi/filetransfer.lua @@ -7,18 +7,18 @@ ful.submit = false sul = ful:section(SimpleSection, "", translate("Upload file to '/tmp/upload/'")) fu = sul:option(FileUpload, "") -fu.template = "cbi/other_upload" +fu.template = "filetransfer/other_upload" um = sul:option(DummyValue, "", nil) -um.template = "cbi/other_dvalue" +um.template = "filetransfer/other_dvalue" fdl = SimpleForm("download", translate("Download"), nil) fdl.reset = false fdl.submit = false sdl = fdl:section(SimpleSection, "", translate("Download file")) fd = sdl:option(FileUpload, "") -fd.template = "cbi/other_download" +fd.template = "filetransfer/other_download" dm = sdl:option(DummyValue, "", nil) -dm.template = "cbi/other_dvalue" +dm.template = "filetransfer/other_dvalue" function Download() local sPath, sFile, fd, block @@ -138,7 +138,7 @@ function IsIpkFile(name) end btnis = tb:option(Button, "install", translate("Install")) -btnis.template = "cbi/other_button" +btnis.template = "filetransfer/other_button" btnis.render = function(self, section, scope) if not inits[section] then return false end if IsIpkFile(inits[section].name) then diff --git a/package/lean/luci-app-filetransfer/luasrc/view/cbi/other_button.htm b/package/lean/luci-app-filetransfer/luasrc/view/filetransfer/other_button.htm similarity index 100% rename from package/lean/luci-app-filetransfer/luasrc/view/cbi/other_button.htm rename to package/lean/luci-app-filetransfer/luasrc/view/filetransfer/other_button.htm diff --git a/package/lean/luci-app-filetransfer/luasrc/view/cbi/other_download.htm b/package/lean/luci-app-filetransfer/luasrc/view/filetransfer/other_download.htm similarity index 100% rename from package/lean/luci-app-filetransfer/luasrc/view/cbi/other_download.htm rename to package/lean/luci-app-filetransfer/luasrc/view/filetransfer/other_download.htm diff --git a/package/lean/luci-app-filetransfer/luasrc/view/cbi/other_dvalue.htm b/package/lean/luci-app-filetransfer/luasrc/view/filetransfer/other_dvalue.htm similarity index 100% rename from package/lean/luci-app-filetransfer/luasrc/view/cbi/other_dvalue.htm rename to package/lean/luci-app-filetransfer/luasrc/view/filetransfer/other_dvalue.htm diff --git a/package/lean/luci-app-filetransfer/luasrc/view/cbi/other_upload.htm b/package/lean/luci-app-filetransfer/luasrc/view/filetransfer/other_upload.htm similarity index 100% rename from package/lean/luci-app-filetransfer/luasrc/view/cbi/other_upload.htm rename to package/lean/luci-app-filetransfer/luasrc/view/filetransfer/other_upload.htm diff --git a/package/lean/luci-app-filetransfer/etc/uci-defaults/luci-filetransfer b/package/lean/luci-app-filetransfer/root/etc/uci-defaults/luci-filetransfer similarity index 100% rename from package/lean/luci-app-filetransfer/etc/uci-defaults/luci-filetransfer rename to package/lean/luci-app-filetransfer/root/etc/uci-defaults/luci-filetransfer diff --git a/package/lean/luci-app-netdata/luasrc/controller/netdata.lua b/package/lean/luci-app-netdata/luasrc/controller/netdata.lua index b9c8a4448..84d9b8e73 100644 --- a/package/lean/luci-app-netdata/luasrc/controller/netdata.lua +++ b/package/lean/luci-app-netdata/luasrc/controller/netdata.lua @@ -2,5 +2,5 @@ module("luci.controller.netdata", package.seeall) function index() - entry({"admin","status","netdata"},template("netdata"),_("NetData"),10).leaf=true + entry({"admin","status","netdata"},template("netdata/netdata"),_("NetData"),10).leaf=true end \ No newline at end of file diff --git a/package/lean/luci-app-netdata/luasrc/view/netdata.htm b/package/lean/luci-app-netdata/luasrc/view/netdata/netdata.htm similarity index 100% rename from package/lean/luci-app-netdata/luasrc/view/netdata.htm rename to package/lean/luci-app-netdata/luasrc/view/netdata/netdata.htm diff --git a/package/lean/luci-app-ttyd/luasrc/controller/terminal.lua b/package/lean/luci-app-ttyd/luasrc/controller/terminal.lua index f4618f2da..8b6954b04 100644 --- a/package/lean/luci-app-ttyd/luasrc/controller/terminal.lua +++ b/package/lean/luci-app-ttyd/luasrc/controller/terminal.lua @@ -5,5 +5,5 @@ function index() return end - entry({"admin", "system", "terminal"}, template("terminal"), _("TTYD Terminal"), 10).leaf = true + entry({"admin", "system", "terminal"}, template("terminal/terminal"), _("TTYD Terminal"), 10).leaf = true end diff --git a/package/lean/luci-app-ttyd/luasrc/view/terminal.htm b/package/lean/luci-app-ttyd/luasrc/view/terminal/terminal.htm similarity index 100% rename from package/lean/luci-app-ttyd/luasrc/view/terminal.htm rename to package/lean/luci-app-ttyd/luasrc/view/terminal/terminal.htm diff --git a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua index 3a4c77303..2ad39847f 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua @@ -8,8 +8,8 @@ function index() entry({"admin", "services", "unblockmusic"},firstchild(), _("Unblock Netease Music"), 50).dependent = false - entry({"admin", "services", "unblockmusic", "general"},cbi("unblockmusic"), _("Base Setting"), 1) - entry({"admin", "services", "unblockmusic", "log"},form("unblockmusiclog"), _("Log"), 2) + entry({"admin", "services", "unblockmusic", "general"},cbi("unblockmusic/unblockmusic"), _("Base Setting"), 1) + entry({"admin", "services", "unblockmusic", "log"},form("unblockmusic/unblockmusiclog"), _("Log"), 2) entry({"admin", "services", "unblockmusic", "status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic/unblockmusic.lua similarity index 100% rename from package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua rename to package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic/unblockmusic.lua diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic/unblockmusiclog.lua similarity index 100% rename from package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua rename to package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic/unblockmusiclog.lua diff --git a/package/lean/luci-app-wrtbwmon/htdocs/luci-static/wrtbwmon.js b/package/lean/luci-app-wrtbwmon/htdocs/luci-static/wrtbwmon/wrtbwmon.js similarity index 100% rename from package/lean/luci-app-wrtbwmon/htdocs/luci-static/wrtbwmon.js rename to package/lean/luci-app-wrtbwmon/htdocs/luci-static/wrtbwmon/wrtbwmon.js diff --git a/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua b/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua index 25909c846..be60c32ab 100644 --- a/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua +++ b/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua @@ -2,7 +2,7 @@ module("luci.controller.wrtbwmon", package.seeall) function index() entry({"admin", "nlbw", "usage"}, alias("admin", "nlbw", "usage", "details"), _("Usage"), 60) - entry({"admin", "nlbw", "usage", "details"}, template("wrtbwmon"), _("Details"), 10).leaf=true + entry({"admin", "nlbw", "usage", "details"}, template("wrtbwmon/wrtbwmon"), _("Details"), 10).leaf=true entry({"admin", "nlbw", "usage", "config"}, cbi("wrtbwmon/config"), _("Configuration"), 20).leaf=true entry({"admin", "nlbw", "usage", "custom"}, form("wrtbwmon/custom"), _("User file"), 30).leaf=true entry({"admin", "nlbw", "usage", "check_dependency"}, call("check_dependency")).dependent=true diff --git a/package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm b/package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon/wrtbwmon.htm similarity index 97% rename from package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm rename to package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon/wrtbwmon.htm index 68713b123..c5f8b371c 100644 --- a/package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm +++ b/package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon/wrtbwmon.htm @@ -42,5 +42,5 @@ <%=translate("Loading...")%> - + <%+footer%>