summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-fw
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2009-01-04 15:46:08 +0000
committerSteven Barth <steven@midlink.org>2009-01-04 15:46:08 +0000
commitbb44869de9ba8d5035d4c74e3651e911e959a863 (patch)
tree3ca6bf2c61fcb6d47e126349f80051f54773ec60 /applications/luci-fw
parentf911758bc2b5799f05290954bdfe23e81577548b (diff)
Cleanup overview / details nodes
Diffstat (limited to 'applications/luci-fw')
-rw-r--r--applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua24
-rw-r--r--applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua2
-rw-r--r--applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua2
3 files changed, 7 insertions, 21 deletions
diff --git a/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua b/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
index 90213cf544..2be03d6883 100644
--- a/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
+++ b/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
@@ -3,25 +3,11 @@ module("luci.controller.luci_fw.luci_fw", package.seeall)
function index()
require("luci.i18n").loadc("luci-fw")
local i18n = luci.i18n.translate
-
- local nodes = {}
- table.insert(nodes, entry({"admin", "network", "firewall"}, alias("admin", "network", "firewall", "zones"), i18n("fw_fw"), 60))
- nodes[#nodes].index = true
-
- table.insert(nodes, entry({"admin", "network", "firewall", "zones"}, cbi("luci_fw/zones"), i18n("fw_zones"), 10))
- table.insert(nodes, entry({"admin", "network", "firewall", "redirection"}, cbi("luci_fw/redirect"), i18n("fw_redirect"), 30))
- table.insert(nodes, entry({"admin", "network", "firewall", "traffic"}, cbi("luci_fw/traffic"), i18n("fw_traffic"), 20))
-
- table.insert(nodes, entry({"admin", "network", "firewall", "rule"}, cbi("luci_fw/trule")))
- nodes[#nodes].leaf = true
- table.insert(nodes, entry({"admin", "network", "firewall", "redirect"}, cbi("luci_fw/rrule")))
- nodes[#nodes].leaf = true
-
- table.insert(nodes, entry({"mini", "network", "portfw"}, cbi("luci_fw/miniportfw", {autoapply=true}), i18n("fw_portfw", "Portweiterleitung"), 70))
+ entry({"admin", "network", "firewall"}, alias("admin", "network", "firewall", "zones"), i18n("fw_fw"), 60).i18n = "luci-fw"
+ entry({"admin", "network", "firewall", "zones"}, cbi("luci_fw/zones"), i18n("fw_zones"), 10)
+ entry({"admin", "network", "firewall", "redirect"}, arcombine(cbi("luci_fw/redirect"), cbi("luci_fw/rrule")), i18n("fw_redirect"), 30).leaf = true
+ entry({"admin", "network", "firewall", "rule"}, arcombine(cbi("luci_fw/traffic"), cbi("luci_fw/trule")), i18n("fw_traffic"), 20).leaf = true
- for i,n in ipairs(nodes) do
- n.i18n = "luci-fw"
- n.dependent = true
- end
+ entry({"mini", "network", "portfw"}, cbi("luci_fw/miniportfw", {autoapply=true}), i18n("fw_portfw", "Portweiterleitung"), 70).i18n = "luci-fw"
end \ No newline at end of file
diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua
index 1610698c4b..9c40d958f5 100644
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua
@@ -23,7 +23,7 @@ s.addremove = false
back = s:option(DummyValue, "_overview", translate("overview"))
back.value = ""
-back.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "redirection")
+back.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "redirect")
name = s:option(Value, "_name", translate("name"))
name.rmempty = true
diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
index f860bff3e6..d8fe59c9bd 100644
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
@@ -20,7 +20,7 @@ s.addremove = false
back = s:option(DummyValue, "_overview", translate("overview"))
back.value = ""
-back.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "traffic")
+back.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "rule")
name = s:option(Value, "_name", translate("name")..translate("cbi_optional"))