From b68f809a3f39cd757e4639c469b5ecf03e3abcdf Mon Sep 17 00:00:00 2001 From: p4u Date: Wed, 28 Aug 2013 02:16:54 +0200 Subject: [PATCH] luci-app-bmx6: several improvements and fixes, adapt main and advanced configuration to new config syntax --- .../lib/lua/luci/model/cbi/bmx6/advanced.lua | 3 ++- .../usr/lib/lua/luci/model/cbi/bmx6/main.lua | 24 ++++++++----------- .../usr/lib/lua/luci/view/bmx6/status_j.htm | 3 ++- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/advanced.lua b/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/advanced.lua index 9510214..c254899 100644 --- a/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/advanced.lua +++ b/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/advanced.lua @@ -34,7 +34,8 @@ else options = options.OPTIONS end -local general = m:section(NamedSection,"general","general","General Options") +local general = m:section(NamedSection,"general","bmx6") +general.addremove = true local name = "" local help = "" diff --git a/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua b/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua index 8c114bf..d4e0745 100644 --- a/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua +++ b/luci-app-bmx6/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua @@ -35,21 +35,17 @@ end -- Getting a list of interfaces local eth_int = luci.sys.net.devices() --- Getting the most important options from general -local general = m:section(NamedSection,"general","general","General") -general.addremove = false -general:option(Value,"globalPrefix","Global ip prefix","Specify global prefix for interfaces: NETADDR/LENGTH. If you are using IPv6 leave blank to let bmx6 autoassign an ULA IPv6 address.") - -if m:get("ipVersion","ipVersion") == "6" then - general:option(Value,"tun4Address","IPv4 address or range","specify default IPv4 tunnel address and announced range") -end +local tunDev = m:section(TypedSection,"tunDev",translate("Tunnel device"),translate("Define incoming ipip tunnel interface name")) +tunDev.addremove = true +tunDev.anonymous = true +tunDev:option(Value,"tunDev",translate("Name"),translate("Name for the tunnel network device")) +tunDev:option(Value,"tun4Address", translate("IPv4 address/length"),translate("Specify default IPv4 tunnel address and announced range (ex. 10.1.2.3/24)")) +tunDev:option(Value,"tun6Address", translate("IPv6 address/length"),translate("Specify default IPv6 tunnel address and announced range (ex. 2012:0:0:123:0:0:0:1/64)")) -- IP section --- ipVersion section is important, we are allways showing it -local ipV = m:section(NamedSection,"ipVersion","ipVersion","IP options") +local ipV = m:section(NamedSection,"ipVersion","ipVersion",translate("Miscellaneous IP options")) ipV.addremove = false -local lipv = ipV:option(ListValue,"ipVersion","IP version") -lipv:value("4","4") +local lipv = ipV:option(ListValue,"ipVersion",translate("IP version")) lipv:value("6","6") lipv.default = "6" @@ -88,10 +84,10 @@ for _,o in ipairs(ipoptions) do end -- Interfaces section -local interfaces = m:section(TypedSection,"dev","Devices","") +local interfaces = m:section(TypedSection,"dev",translate("Devices"),translate("Network devices to mesh with")) interfaces.addremove = true interfaces.anonymous = true -local intlv = interfaces:option(ListValue,"dev","Device") +local intlv = interfaces:option(ListValue,"dev",translate("Device")) for _,i in ipairs(eth_int) do intlv:value(i,i) diff --git a/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/status_j.htm b/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/status_j.htm index 5e51f09..0668db7 100644 --- a/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/status_j.htm +++ b/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/status_j.htm @@ -95,7 +95,9 @@ Visit bmx6.net for more info. sta.tun4Address,sta.myLocalId,sta.uptime,sta.cpu,sta.nodes]); return res; }); +//]]> + - <%+footer%>