Changeset 7018

Timestamp:

05/03/11 23:22:26 (2 years ago)

Author:

jow

Message:

modules/admin-full: join maps in merged dnsmasq page

Files:

• luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua (modified) (4 diffs)

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua

@@ -15 +15 @@
 local sys = require "luci.sys"
 
-m = Map("dhcp", translate("DHCP Server"),
+m = Map("dhcp", translate("DHCP and DNS"),
     translate("Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol" ..
         "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-" ..
@@ -21 +21 @@
         "firewalls"))
 
-s = m:section(TypedSection, "dnsmasq", translate("Settings"))
+s = m:section(TypedSection, "dnsmasq", translate("Server Settings"))
 s.anonymous = true
 s.addremove = false
@@ -208 +208 @@
 
 
-m2 = Map("dhcp", translate("DHCP Leases"),
+m:section(SimpleSection).template = "admin_network/lease_status"
+
+s = m:section(TypedSection, "host", translate("Static 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."))
-
-m2:section(SimpleSection).template = "admin_network/lease_status"
-
-s = m2:section(TypedSection, "host", translate("Static Leases"),
+        "only hosts with a corresponding lease are served.") .. "<br />" ..
     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 " ..
@@ -243 +241 @@
 
 
-return m, m2
+return m