modules/admin-full:

	- move crontab to system menu
	- delete now empty services dispatcher
	- move service menu declaration into index

diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index 663ef70229846ed33fb12c87e32c298955df267d..3448489044c726e5d4453f5381dfc568ea0dd89b 100644 (file)
--- 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 (file)
index aa1fd94..0000000
--- a/modules/admin-full/luasrc/controller/admin/services.lua
+++ /dev/null
@@ -1,20 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-
-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 114acba6698911efbe04e8f71dc58f3bd2e2c894..68f3d258ddff728225a6b0f1dd64215735b20404 100644 (file)
--- 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_services/crontab.lua
deleted file mode 100644 (file)
index 2ae5939..0000000
--- a/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
+++ /dev/null
@@ -1,37 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-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$
-]]--
-
-local fs = require "nixio.fs"
-local cronfile = "/etc/crontabs/root" 
-
-f = SimpleForm("crontab", translate("Scheduled Tasks"), translate("This is the system crontab in which scheduled tasks can be defined."))
-
-t = f:field(TextValue, "crons")
-t.rmempty = true
-t.rows = 10
-function t.cfgvalue()
-       return fs.readfile(cronfile) or ""
-end
-
-function f.handle(self, state, data)
-       if state == FORM_VALID then
-               if data.crons then
-                       fs.writefile(cronfile, data.crons:gsub("\r\n", "\n"))
-               end
-       end
-       return true
-end
-
-return f

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua b/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua
new file mode 100644 (file)
index 0000000..2ae5939
--- /dev/null
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua
@@ -0,0 +1,37 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+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$
+]]--
+
+local fs = require "nixio.fs"
+local cronfile = "/etc/crontabs/root" 
+
+f = SimpleForm("crontab", translate("Scheduled Tasks"), translate("This is the system crontab in which scheduled tasks can be defined."))
+
+t = f:field(TextValue, "crons")
+t.rmempty = true
+t.rows = 10
+function t.cfgvalue()
+       return fs.readfile(cronfile) or ""
+end
+
+function f.handle(self, state, data)
+       if state == FORM_VALID then
+               if data.crons then
+                       fs.writefile(cronfile, data.crons:gsub("\r\n", "\n"))
+               end
+       end
+       return true
+end
+
+return f