From 8c9aef1b2de7df6838b939c9eb314ad613bab3d9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 26 Oct 2011 00:58:12 +0000 Subject: [PATCH] modules/admin-full: - move crontab to system menu - delete now empty services dispatcher - move service menu declaration into index --- modules/admin-full/luasrc/controller/admin/index.lua | 3 +++ .../admin-full/luasrc/controller/admin/services.lua | 20 -------------------- .../admin-full/luasrc/controller/admin/system.lua | 1 + .../cbi/{admin_services => admin_system}/crontab.lua | 0 4 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 modules/admin-full/luasrc/controller/admin/services.lua rename modules/admin-full/luasrc/model/cbi/{admin_services => admin_system}/crontab.lua (100%) diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua index 663ef7022..344848904 100644 --- a/modules/admin-full/luasrc/controller/admin/index.lua +++ b/modules/admin-full/luasrc/controller/admin/index.lua @@ -30,6 +30,9 @@ function index() page.ucidata = true page.index = true + -- Empty services menu to be populated by addons + entry({"admin", "services"}, firstchild(), _("Services"), 40).index = true + entry({"admin", "logout"}, call("action_logout"), _("Logout"), 90) end diff --git a/modules/admin-full/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua deleted file mode 100644 index aa1fd94ce..000000000 --- a/modules/admin-full/luasrc/controller/admin/services.lua +++ /dev/null @@ -1,20 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2008 Steven Barth - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ -]]-- - -module("luci.controller.admin.services", package.seeall) - -function index() - entry({"admin", "services"}, firstchild(), _("Services"), 40).index = true - entry({"admin", "services", "crontab"}, form("admin_services/crontab"), _("Scheduled Tasks"), 50) -end diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index 114acba66..68f3d258d 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -28,6 +28,7 @@ function index() end entry({"admin", "system", "startup"}, form("admin_system/startup"), _("Startup"), 45) + entry({"admin", "system", "crontab"}, form("admin_system/crontab"), _("Scheduled Tasks"), 46) if nixio.fs.access("/etc/config/fstab") then entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), _("Mount Points"), 50) diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua b/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua similarity index 100% rename from modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua rename to modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua -- 2.11.0