summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-05-04 21:23:55 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-05-04 21:23:55 +0000
commitec0fbaff3e6f475805ab62d4ed27d293dae97965 (patch)
treececb6ba0ad94565882842a1ffb6e6be80ceb955c /modules/admin-full
parent9424177aca293101c7262ddfcbc6a6aecdf6b3c4 (diff)
modules/admin-full: move system/processes to status/processes
Diffstat (limited to 'modules/admin-full')
-rw-r--r--modules/admin-full/luasrc/controller/admin/status.lua2
-rw-r--r--modules/admin-full/luasrc/controller/admin/system.lua1
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_status/processes.lua (renamed from modules/admin-full/luasrc/model/cbi/admin_system/processes.lua)0
3 files changed, 2 insertions, 1 deletions
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
index c34c70ffa..c34c70ffa 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_status/processes.lua