modules/admin-full: switch static lease page to /etc/config/dhcp, add better labels...

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / dhcpleases.lua

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
index 25187ae..678ebab 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
@@ -11,17 +11,24 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-require("luci.sys")
-require("luci.tools.webadmin")
-m2 = Map("luci_ethers", translate("dhcp_leases"))
+
+local uci = require "luci.model.uci".cursor()
+local sys = require "luci.sys"
+local wa  = require "luci.tools.webadmin"
+local fs  = require "nixio.fs"
+
+m2 = Map("dhcp", translate("DHCP Leases"),
+       translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " ..
+               "DHCP clients. They are also required for non-dynamic interface configurations where " ..
+               "only hosts with a corresponding lease are served."))
 
 local leasefn, leasefp, leases
-luci.model.uci.foreach("dhcp", "dnsmasq",
+uci:foreach("dhcp", "dnsmasq",
  function(section)
        leasefn = section.leasefile
  end
 ) 
-local leasefp = leasefn and luci.fs.access(leasefn) and io.lines(leasefn)
+local leasefp = leasefn and fs.access(leasefn) and io.lines(leasefn)
 if leasefp then
        leases = {}
        for lease in leasefp do
@@ -30,35 +37,37 @@ if leasefp then
 end
 
 if leases then
-       v = m2:section(Table, leases, translate("dhcp_leases_active"))
-       v.anonymous = true
-       v.rowcolors = true
-       
-       ip = v:option(DummyValue, 3, translate("ipaddress"))
+       v = m2:section(Table, leases, translate("Active Leases"))
+       ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
        
-       mac  = v:option(DummyValue, 2, translate("macaddress"))
+       mac  = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
        
-       ltime = v:option(DummyValue, 1, translate("dhcp_timeremain"))
+       ltime = v:option(DummyValue, 1, translate("Leasetime remaining"))
        function ltime.cfgvalue(self, ...)
                local value = DummyValue.cfgvalue(self, ...)
-               return luci.tools.webadmin.date_format(
-                os.difftime(tonumber(value), os.time())
-               )
+               return wa.date_format(os.difftime(tonumber(value), os.time()))
        end
 end
 
-s = m2:section(TypedSection, "static_lease", translate("luci_ethers"))
+s = m2:section(TypedSection, "host", translate("Static Leases"),
+       translate("Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> " ..
+               "indentifies the host, the <em>IPv4-Address</em> specifies to the fixed address to " ..
+               "use and the <em>Hostname</em> is assigned as symbolic name to the requesting host."))
+
 s.addremove = true
 s.anonymous = true
 s.template = "cbi/tblsection"
 
-mac = s:option(Value, "macaddr", translate("macaddress"))
-ip = s:option(Value, "ipaddr", translate("ipaddress"))
-for i, dataset in ipairs(luci.sys.net.arptable()) do
-       ip:value(dataset["IP address"])
-       mac:value(dataset["HW address"],
-        dataset["HW address"] .. " (" .. dataset["IP address"] .. ")")
-end
+name = s:option(Value, "name", translate("Hostname"))
+mac = s:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+ip = s:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+sys.net.arptable(function(entry)
+       ip:value(entry["IP address"])
+       mac:value(
+               entry["HW address"],
+               entry["HW address"] .. " (" .. entry["IP address"] .. ")"
+       )
+end)
 
        
 return m2