From ec0fbaff3e6f475805ab62d4ed27d293dae97965 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 4 May 2011 21:23:55 +0000 Subject: [PATCH] modules/admin-full: move system/processes to status/processes --- modules/admin-full/luasrc/controller/admin/status.lua | 2 ++ modules/admin-full/luasrc/controller/admin/system.lua | 1 - .../luasrc/model/cbi/{admin_system => admin_status}/processes.lua | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename modules/admin-full/luasrc/model/cbi/{admin_system => admin_status}/processes.lua (100%) diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua index 956bd47e3..ef6089f62 100644 --- a/modules/admin-full/luasrc/controller/admin/status.lua +++ b/modules/admin-full/luasrc/controller/admin/status.lua @@ -33,6 +33,8 @@ function index() entry({"admin", "status", "connections"}, template("admin_status/connections"), i18n("Realtime Connections"), 8).leaf = true entry({"admin", "status", "connections_status"}, call("action_connections")).leaf = true + + entry({"admin", "status", "processes"}, cbi("admin_status/processes"), i18n("Processes"), 20) end function action_syslog() diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index da2ad9500..c79397b5e 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -24,7 +24,6 @@ function index() entry({"admin", "system", "admin"}, form("admin_system/admin"), i18n("Administration"), 2) entry({"admin", "system", "packages"}, call("action_packages"), i18n("Software"), 10) entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg")) - entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("Processes"), 45) if nixio.fs.access("/etc/config/fstab") then entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("Mount Points"), 50) diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua b/modules/admin-full/luasrc/model/cbi/admin_status/processes.lua similarity index 100% rename from modules/admin-full/luasrc/model/cbi/admin_system/processes.lua rename to modules/admin-full/luasrc/model/cbi/admin_status/processes.lua -- 2.11.0