luci-0.8: merge r4520

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index a14b8fd700e1c74871f8bbaac61f705ee8a7dcb1..08a5dd0ef6e088ddcebc0c4ae46d063a97445896 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -28,12 +28,12 @@ function index()
        page.target = cbi("admin_network/vlan")
        page.title  = i18n("a_n_switch")
        page.order  = 20
-       
+
        local page = entry({"admin", "network", "wireless"}, arcombine(cbi("admin_network/wireless"), cbi("admin_network/wifi")), i18n("wifi"), 15)
        page.i18n   = "wifi"
        page.leaf = true
        page.subindex = true
-       
+
        uci:foreach("wireless", "wifi-device",
                function (section)
                        local ifc = section[".name"]
@@ -42,11 +42,11 @@ function index()
                                 ifc:upper()).i18n = "wifi"
                end
        )
-       
+
        local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("interfaces", "Schnittstellen"), 10)
        page.leaf   = true
        page.subindex = true
-       
+
        uci:foreach("network", "interface",
                function (section)
                        local ifc = section[".name"]
@@ -77,21 +77,7 @@ function index()
 
        local page  = node("admin", "network", "routes")
        page.target = cbi("admin_network/routes")
-       page.title  = i18n("a_n_routes")
+       page.title  = i18n("a_n_routes_static")
        page.order  = 50
-       page.leaf   = true
-
-       entry(
-        {"admin", "network", "routes", "static"},
-        function() end,
-        i18n("a_n_routes_static")
-       )
-
-       entry(
-               {"admin", "network", "conntrack"},
-               form("admin_network/conntrack"),
-               i18n("a_n_conntrack"),
-               60
-       )
 
-end
\ No newline at end of file
+end

diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index feb0802e5169911ef16cdded7045d1eb10663e5a..d8fa9e9f60a12264ac0a172cb21dffaac34f58ff 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -20,8 +20,10 @@ function index()
        entry({"admin", "status"}, template("admin_status/index"), i18n("status", "Status"), 20).index = true
        entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("interfaces", "Interfaces"), 1)
        entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("a_s_ipt", "Firewall"), 2)
-       entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "System Log"), 3)
-       entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("dmesg", "Kernel Log"), 4)
+       entry({"admin", "status", "conntrack"}, form("admin_status/conntrack"), i18n("a_n_conntrack"), 3)
+       entry({"admin", "status", "routes"}, form("admin_status/routes"), i18n("a_n_routes"), 4)
+       entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "System Log"), 5)
+       entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("dmesg", "Kernel Log"), 6)
 
 end
 

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua b/modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua
deleted file mode 100644 (file)
index f1c90d6..0000000
--- a/modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua
+++ /dev/null
@@ -1,49 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-f = SimpleForm("conntrack", translate("a_n_conntrack"), translate("a_n_conntrack_desc"))
-f.reset = false
-f.submit = false
-
-t = f:section(Table, luci.sys.net.arptable(), "ARP")
-t:option(DummyValue, "IP address", translate("ipaddress"))
-t:option(DummyValue, "HW address", translate("macaddress"))
-t:option(DummyValue, "Device", translate("interface"))
-
-t = f:section(Table, luci.sys.net.conntrack() or {}, translate("a_n_conntrack"))
-l3 = t:option(DummyValue, "layer3", translate("network"))
-function l3.cfgvalue(self, ...)
-       return DummyValue.cfgvalue(self, ...):upper()
-end
-
-
-l4 = t:option(DummyValue, "layer4", translate("protocol"))
-function l4.cfgvalue(self, ...)
-       return DummyValue.cfgvalue(self, ...):upper()
-end
-
-s = t:option(DummyValue, "src", translate("source"))
-function s.cfgvalue(self, section)
-       return "%s:%s" % { self.map:get(section, "src"),
-                                        self.map:get(section, "sport") or "*" }
-end
-
-d = t:option(DummyValue, "dst", translate("destination"))
-function d.cfgvalue(self, section)
-       return "%s:%s" % { self.map:get(section, "dst"),
-                                        self.map:get(section, "dport") or "*" }
-end
-
-return f
\ No newline at end of file

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
index 4767e07d5db832ad0f23ca9323385ffa47e755a5..7962d4da1c8f2687abd7b80f13ea33fb56b0d5b0 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
@@ -11,73 +11,13 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 require("luci.tools.webadmin")
 m = Map("network", translate("a_n_routes"), translate("a_n_routes1"))
 
 local routes6 = luci.sys.net.routes6()
 local bit = require "bit"
 
-if not arg or not arg[1] then
-       local routes = luci.sys.net.routes()
-
-       v = m:section(Table, routes, translate("a_n_routes_kernel4"))
-
-       net = v:option(DummyValue, "iface", translate("network"))
-       function net.cfgvalue(self, section)
-               return luci.tools.webadmin.iface_get_network(routes[section].device)
-                or routes[section].device
-       end
-
-       target  = v:option(DummyValue, "target", translate("target"))
-       function target.cfgvalue(self, section)
-               return routes[section].dest:network():string()
-       end
-
-       netmask = v:option(DummyValue, "netmask", translate("netmask"))
-       function netmask.cfgvalue(self, section)
-               return routes[section].dest:mask():string()
-       end
-
-       gateway = v:option(DummyValue, "gateway", translate("gateway"))
-       function gateway.cfgvalue(self, section)
-               return routes[section].gateway:string()
-       end
-
-       metric = v:option(DummyValue, "metric", translate("metric"))
-       function metric.cfgvalue(self, section)
-               return routes[section].metric
-       end
-
-       if routes6 then
-               v = m:section(Table, routes6, translate("a_n_routes_kernel6"))
-
-               net = v:option(DummyValue, "iface", translate("network"))
-               function net.cfgvalue(self, section)
-                       return luci.tools.webadmin.iface_get_network(routes6[section].device)
-                        or routes6[section].device
-               end
-
-               target  = v:option(DummyValue, "target", translate("target"))
-               function target.cfgvalue(self, section)
-                       return routes6[section].dest:string()
-               end
-
-               gateway = v:option(DummyValue, "gateway", translate("gateway6"))
-               function gateway.cfgvalue(self, section)
-                       return routes6[section].source:string()
-               end
-
-               metric = v:option(DummyValue, "metric", translate("metric"))
-               function metric.cfgvalue(self, section)
-                       local metr = routes6[section].metric
-                       local lower = bit.band(metr, 0xffff)
-                       local higher = bit.rshift(bit.band(metr, 0xffff0000), 16)
-                       return "%04X%04X" % {higher, lower}
-               end
-       end
-end
-
-
 s = m:section(TypedSection, "route", translate("a_n_routes_static4"))
 s.addremove = true
 s.anonymous = true
@@ -87,14 +27,8 @@ s.template  = "cbi/tblsection"
 iface = s:option(ListValue, "interface", translate("interface"))
 luci.tools.webadmin.cbi_add_networks(iface)
 
-if not arg or not arg[1] then
-       net.titleref = iface.titleref
-end
-
 s:option(Value, "target", translate("target"), translate("a_n_r_target1"))
-
 s:option(Value, "netmask", translate("netmask"), translate("a_n_r_netmask1")).rmemepty = true
-
 s:option(Value, "gateway", translate("gateway"))
 
 if routes6 then
@@ -107,12 +41,7 @@ if routes6 then
        iface = s:option(ListValue, "interface", translate("interface"))
        luci.tools.webadmin.cbi_add_networks(iface)
 
-       if not arg or not arg[1] then
-               net.titleref = iface.titleref
-       end
-
        s:option(Value, "target", translate("target"), translate("a_n_r_target6"))
-
        s:option(Value, "gateway", translate("gateway6")).rmempty = true
 end
 

diff --git a/modules/admin-full/luasrc/model/cbi/admin_status/conntrack.lua b/modules/admin-full/luasrc/model/cbi/admin_status/conntrack.lua
new file mode 100644 (file)
index 0000000..d970bdf
--- /dev/null
+++ b/modules/admin-full/luasrc/model/cbi/admin_status/conntrack.lua
@@ -0,0 +1,49 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+f = SimpleForm("conntrack", translate("a_n_conntrack"), translate("a_n_conntrack_desc"))
+f.reset = false
+f.submit = false
+
+t = f:section(Table, luci.sys.net.arptable(), "ARP")
+t:option(DummyValue, "IP address", translate("ipaddress"))
+t:option(DummyValue, "HW address", translate("macaddress"))
+t:option(DummyValue, "Device", translate("interface"))
+
+t = f:section(Table, luci.sys.net.conntrack() or {}, translate("a_n_conntrack"))
+l3 = t:option(DummyValue, "layer3", translate("network"))
+function l3.cfgvalue(self, ...)
+       return DummyValue.cfgvalue(self, ...):upper()
+end
+
+
+l4 = t:option(DummyValue, "layer4", translate("protocol"))
+function l4.cfgvalue(self, ...)
+       return DummyValue.cfgvalue(self, ...):upper()
+end
+
+s = t:option(DummyValue, "src", translate("source"))
+function s.cfgvalue(self, section)
+       return "%s:%s" % { self.map:get(section, "src"),
+                                        self.map:get(section, "sport") or "*" }
+end
+
+d = t:option(DummyValue, "dst", translate("destination"))
+function d.cfgvalue(self, section)
+       return "%s:%s" % { self.map:get(section, "dst"),
+                                        self.map:get(section, "dport") or "*" }
+end
+
+return f

diff --git a/modules/admin-full/luasrc/model/cbi/admin_status/routes.lua b/modules/admin-full/luasrc/model/cbi/admin_status/routes.lua
new file mode 100644 (file)
index 0000000..5b147ef
--- /dev/null
+++ b/modules/admin-full/luasrc/model/cbi/admin_status/routes.lua
@@ -0,0 +1,79 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.tools.webadmin")
+m = Map("network", translate("a_n_routes"), translate("a_n_routes1"))
+
+local routes = luci.sys.net.routes()
+local routes6 = luci.sys.net.routes6()
+local bit = require "bit"
+
+v = m:section(Table, routes, translate("a_n_routes_kernel4"))
+
+net = v:option(DummyValue, "iface", translate("network"))
+function net.cfgvalue(self, section)
+       return luci.tools.webadmin.iface_get_network(routes[section].device)
+        or routes[section].device
+end
+
+target  = v:option(DummyValue, "target", translate("target"))
+function target.cfgvalue(self, section)
+       return routes[section].dest:network():string()
+end
+
+netmask = v:option(DummyValue, "netmask", translate("netmask"))
+function netmask.cfgvalue(self, section)
+       return routes[section].dest:mask():string()
+end
+
+gateway = v:option(DummyValue, "gateway", translate("gateway"))
+function gateway.cfgvalue(self, section)
+       return routes[section].gateway:string()
+end
+
+metric = v:option(DummyValue, "metric", translate("metric"))
+function metric.cfgvalue(self, section)
+       return routes[section].metric
+end
+
+if routes6 then
+       v = m:section(Table, routes6, translate("a_n_routes_kernel6"))
+
+       net = v:option(DummyValue, "iface", translate("network"))
+       function net.cfgvalue(self, section)
+               return luci.tools.webadmin.iface_get_network(routes6[section].device)
+                or routes6[section].device
+       end
+
+       target  = v:option(DummyValue, "target", translate("target"))
+       function target.cfgvalue(self, section)
+               return routes6[section].dest:string()
+       end
+
+       gateway = v:option(DummyValue, "gateway", translate("gateway6"))
+       function gateway.cfgvalue(self, section)
+               return routes6[section].source:string()
+       end
+
+       metric = v:option(DummyValue, "metric", translate("metric"))
+       function metric.cfgvalue(self, section)
+               local metr = routes6[section].metric
+               local lower = bit.band(metr, 0xffff)
+               local higher = bit.rshift(bit.band(metr, 0xffff0000), 16)
+               return "%04X%04X" % {higher, lower}
+       end
+end
+
+
+return m

diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index ae38cce91319a7a720a2c8537e3e908d3dee0020..425113e62dc91d2209f4b2625ab7b92a0dde7d1f 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -60,7 +60,7 @@ $Id$
                <% if flashsize > 0 and filesize > flashsize then %>
                        <br /><br />
                        <div class="error"><%:admin_upgrade_toolarge It appears that you try to
-                               flash an image that does not fit in the flash memory, please verify
+                               flash an image that does not fit into the flash memory, please verify
                                the image file! %></div>
                <% end %>
 
@@ -73,7 +73,7 @@ $Id$
        
                                if flashsize > 0 then
                                        write(luci.i18n.translatef(
-                                               "admin_upgrade_spaceavil",
+                                               "admin_upgrade_spaceavail",
                                                " (%s available)",
                                                w.byte_format(flashsize)
                                        ))