summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorCraig M. Coffee <craigc@netlab7.com>2010-05-15 18:28:19 +0000
committerCraig M. Coffee <craigc@netlab7.com>2010-05-15 18:28:19 +0000
commit0f503431a99204666bfebb7f4242dd5f93b42f2e (patch)
treedecc65900258d87e2aac9a8607c9a75628847a38
parentdc217653e24f67b6f2d69687c073a2c97d78ed30 (diff)
[applications] luci-multiwan: relocated default route selection to bottom of configuration page
-rw-r--r--applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua19
-rw-r--r--applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua19
2 files changed, 22 insertions, 16 deletions
diff --git a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
index 3494ac74a5..b17b940a05 100644
--- a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
+++ b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
@@ -19,14 +19,6 @@ function e.cfgvalue(self, section)
return (os.execute("/etc/init.d/multiwan enabled") == 0) and "1" or "0"
end
-default_route = s:option(ListValue, "default_route", translate("Default Route"))
-luci.tools.webadmin.cbi_add_networks(default_route)
-default_route:value("fastbalancer", translate("Fast Balancer"))
-default_route:value("balancer", translate("Load Balancer"))
-default_route.default = "balancer"
-default_route.optional = false
-default_route.rmempty = false
-
s = m:section(TypedSection, "interface", translate("WAN Interfaces"),
translate("Health Monitor detects and corrects network changes and failed connections."))
s.addremove = true
@@ -150,4 +142,15 @@ wanrule.default = "fastbalancer"
wanrule.optional = false
wanrule.rmempty = false
+s = m:section(NamedSection, "config", "", "")
+s.addremove = false
+
+default_route = s:option(ListValue, "default_route", translate("Default Route"))
+luci.tools.webadmin.cbi_add_networks(default_route)
+default_route:value("fastbalancer", translate("Fast Balancer"))
+default_route:value("balancer", translate("Load Balancer"))
+default_route.default = "balancer"
+default_route.optional = false
+default_route.rmempty = false
+
return m
diff --git a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
index 829ecda451..18c052df24 100644
--- a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
+++ b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
@@ -19,14 +19,6 @@ function e.cfgvalue(self, section)
return (os.execute("/etc/init.d/multiwan enabled") == 0) and "1" or "0"
end
-default_route = s:option(ListValue, "default_route", translate("Default Route"))
-luci.tools.webadmin.cbi_add_networks(default_route)
-default_route:value("fastbalancer", translate("Fast Balancer"))
-default_route:value("balancer", translate("Load Balancer"))
-default_route.default = "balancer"
-default_route.optional = false
-default_route.rmempty = false
-
s = m:section(TypedSection, "mwanfw", translate("Multi-WAN Traffic Rules"),
translate("Configure rules for directing outbound traffic through specified WAN Uplinks."))
s.template = "cbi/tblsection"
@@ -62,4 +54,15 @@ wanrule.default = "fastbalancer"
wanrule.optional = false
wanrule.rmempty = false
+s = m:section(NamedSection, "config", "", "")
+s.addremove = false
+
+default_route = s:option(ListValue, "default_route", translate("Default Route"))
+luci.tools.webadmin.cbi_add_networks(default_route)
+default_route:value("fastbalancer", translate("Fast Balancer"))
+default_route:value("balancer", translate("Load Balancer"))
+default_route.default = "balancer"
+default_route.optional = false
+default_route.rmempty = false
+
return m