diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-05-03 03:35:56 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-05-03 03:35:56 +0000 |
| commit | 32d667edbbeab29005000ea6cb0b1604cf4228c4 (patch) | |
| tree | 47938a6ef2f776bdcef7239d360763407d064928 /modules/admin-full/luasrc/controller | |
| parent | b95ec6c93a3475731ff31feadd2abfa44ac24d10 (diff) | |
modules/admin-full: merge system/password, system/sshkeys and service/dropbear into system/admin
Diffstat (limited to 'modules/admin-full/luasrc/controller')
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/services.lua | 13 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/system.lua | 3 |
2 files changed, 5 insertions, 11 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua index b88e8ab57..38e3448f0 100644 --- a/modules/admin-full/luasrc/controller/admin/services.lua +++ b/modules/admin-full/luasrc/controller/admin/services.lua @@ -16,7 +16,7 @@ module("luci.controller.admin.services", package.seeall) function index() luci.i18n.loadc("base") local i18n = luci.i18n.translate - + local page = node("admin", "services", "crontab") page.target = form("admin_services/crontab") page.title = i18n("Scheduled Tasks") @@ -24,10 +24,10 @@ function index() local page = node("admin", "services") page.target = template("admin_services/index") - page.title = i18n("Services") + page.title = i18n("Services") page.order = 40 page.index = true - + if nixio.fs.access("/etc/config/lucittpd") then local page = node("admin", "services", "lucittpd") page.target = cbi("admin_services/lucittpd") @@ -41,13 +41,8 @@ function index() page.title = "Busybox HTTPd" page.order = 11 end - - local page = node("admin", "services", "dropbear") - page.target = cbi("admin_services/dropbear") - page.title = "Dropbear SSHd" - page.order = 20 - if nixio.fs.access("/etc/config/dhcp") then + if nixio.fs.access("/etc/config/dhcp") then local page = node("admin", "services", "dnsmasq") page.target = cbi("admin_services/dnsmasq") page.title = "Dnsmasq" diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index 95961f49d..da2ad9500 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -21,10 +21,9 @@ function index() entry({"admin", "system"}, alias("admin", "system", "system"), i18n("System"), 30).index = true entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("System"), 1) + 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", "passwd"}, form("admin_system/passwd"), i18n("Admin Password"), 20) - entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("<abbr title=\"Secure Shell\">SSH</abbr>-Keys"), 30) entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("Processes"), 45) if nixio.fs.access("/etc/config/fstab") then |