diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-05-03 22:06:29 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-05-03 22:06:29 +0000 |
| commit | 0ecee984afd0b64e2030b547edc9fbdf038164c7 (patch) | |
| tree | da7a2fa0d769a8ad79bf781c1d0f5fd11389804a /modules/admin-full/luasrc/controller | |
| parent | a3850aa3c7ffbee487cfc9a7903b0561e532f335 (diff) | |
modules/admin-full: merge services/dnsmasq and network/dhcpleases into network/dhcp
Diffstat (limited to 'modules/admin-full/luasrc/controller')
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/network.lua | 6 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/services.lua | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua index bed96d89f7..76d432094d 100644 --- a/modules/admin-full/luasrc/controller/admin/network.lua +++ b/modules/admin-full/luasrc/controller/admin/network.lua @@ -106,9 +106,9 @@ function index() ) if nixio.fs.access("/etc/config/dhcp") then - page = node("admin", "network", "dhcpleases") - page.target = cbi("admin_network/dhcpleases") - page.title = i18n("DHCP Leases") + page = node("admin", "network", "dhcp") + page.target = cbi("admin_network/dhcp") + page.title = i18n("DHCP and DNS") page.order = 30 page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil) diff --git a/modules/admin-full/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua index 81c4426bae..14ced9f694 100644 --- a/modules/admin-full/luasrc/controller/admin/services.lua +++ b/modules/admin-full/luasrc/controller/admin/services.lua @@ -27,11 +27,4 @@ function index() page.title = i18n("Services") page.order = 40 page.index = true - - if nixio.fs.access("/etc/config/dhcp") then - local page = node("admin", "services", "dnsmasq") - page.target = cbi("admin_services/dnsmasq") - page.title = "Dnsmasq" - page.order = 30 - end end |