100 files changed, 844 insertions, 194 deletions

diff --git a/modules/luci-base/luasrc/controller/admin/index.lua b/modules/luci-base/luasrc/controller/admin/index.lua
new file mode 100644
index 0000000000..7e0a207437
--- /dev/null
+++ b/modules/luci-base/luasrc/controller/admin/index.lua
@@ -0,0 +1,122 @@
+-- Copyright 2008 Steven Barth <steven@midlink.org>
+-- Licensed to the public under the Apache License 2.0.
+
+module("luci.controller.admin.index", package.seeall)
+
+function index()
+	function toplevel_page(page, preflookup, preftarget)
+		if preflookup and preftarget then
+			if lookup(preflookup) then
+				page.target = preftarget
+			end
+		end
+
+		if not page.target then
+			page.target = firstchild()
+		end
+	end
+
+	local uci = require("luci.model.uci").cursor()
+
+	local root = node()
+	if not root.target then
+		root.target = alias("admin")
+		root.index = true
+	end
+
+	local page   = node("admin")
+
+	page.title   = _("Administration")
+	page.order   = 10
+	page.sysauth = "root"
+	page.sysauth_authenticator = "htmlauth"
+	page.ucidata = true
+	page.index = true
+	page.target = firstnode()
+
+	-- Empty menu tree to be populated by addons and modules
+
+	page = node("admin", "status")
+	page.title = _("Status")
+	page.order = 10
+	page.index = true
+	-- overview is from mod-admin-full
+	toplevel_page(page, "admin/status/overview", alias("admin", "status", "overview"))
+
+	page = node("admin", "system")
+	page.title = _("System")
+	page.order = 20
+	page.index = true
+	-- system/system is from mod-admin-full
+	toplevel_page(page, "admin/system/system", alias("admin", "system", "system"))
+
+	-- Only used if applications add items
+	page = node("admin", "services")
+	page.title = _("Services")
+	page.order = 40
+	page.index = true
+	toplevel_page(page, false, false)
+
+	-- Even for mod-admin-full network just uses first submenu item as landing
+	page = node("admin", "network")
+	page.title = _("Network")
+	page.order = 50
+	page.index = true
+	toplevel_page(page, false, false)
+
+	if nixio.fs.access("/etc/config/dhcp") then
+		page = entry({"admin", "dhcplease_status"}, call("lease_status"), nil)
+		page.leaf = true
+	end
+
+	local has_wifi = false
+
+	uci:foreach("wireless", "wifi-device",
+		function(s)
+			has_wifi = true
+			return false
+		end)
+
+	if has_wifi then
+		page = entry({"admin", "wireless_assoclist"}, call("wifi_assoclist"), nil)
+		page.leaf = true
+	end
+
+	-- Logout is last
+	entry({"admin", "logout"}, call("action_logout"), _("Logout"), 999)
+end
+
+function action_logout()
+	local dsp = require "luci.dispatcher"
+	local utl = require "luci.util"
+	local sid = dsp.context.authsession
+
+	if sid then
+		utl.ubus("session", "destroy", { ubus_rpc_session = sid })
+
+		luci.http.header("Set-Cookie", "sysauth=%s; expires=%s; path=%s/" %{
+			sid, 'Thu, 01 Jan 1970 01:00:00 GMT', dsp.build_url()
+		})
+	end
+
+	luci.http.redirect(dsp.build_url())
+end
+
+
+function lease_status()
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write('[')
+	luci.http.write_json(s.dhcp_leases())
+	luci.http.write(',')
+	luci.http.write_json(s.dhcp6_leases())
+	luci.http.write(']')
+end
+
+function wifi_assoclist()
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(s.wifi_assoclist())
+end
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua b/modules/luci-base/luasrc/controller/admin/uci.lua
index 1d955dd982..1d955dd982 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/uci.lua
+++ b/modules/luci-base/luasrc/controller/admin/uci.lua
diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
index 6cf2712eb4..8b9003d207 100644
--- a/modules/luci-base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
@@ -724,32 +724,82 @@ end
 
 -- Subdispatchers --
 
-function _firstchild()
-   local path = { unpack(context.path) }
-   local name = table.concat(path, ".")
-   local node = context.treecache[name]
-
-   local lowest
-   if node and node.nodes and next(node.nodes) then
-	  local k, v
-	  for k, v in pairs(node.nodes) do
-		 if not lowest or
-			(v.order or 100) < (node.nodes[lowest].order or 100)
-		 then
-			lowest = k
-		 end
-	  end
-   end
+function _find_eligible_node(root, prefix, deep, types, descend)
+	local _, cur_name, cur_node
+	local childs = { }
+
+	for cur_name, cur_node in pairs(root.nodes) do
+		childs[#childs+1] = {
+			node = cur_node,
+			name = cur_name,
+			order = cur_node.order or 100
+		}
+	end
+
+	table.sort(childs, function(a, b)
+		if a.order == b.order then
+			return a.name < b.name
+		else
+			return a.order < b.order
+		end
+	end)
+
+	if not root.leaf and deep ~= nil then
+		local sub_path = { unpack(prefix) }
+
+		if deep == false then
+			deep = nil
+		end
+
+		for _, cur_node in ipairs(childs) do
+			sub_path[#prefix+1] = cur_node.name
+
+			local res_path = _find_eligible_node(cur_node.node, sub_path,
+			                                     deep, types, true)
+
+			if res_path then
+				return res_path
+			end
+		end
+	end
 
-   assert(lowest ~= nil,
-		  "The requested node contains no childs, unable to redispatch")
+	if descend and
+	   (not types or
+	    (type(root.target) == "table" and
+	     util.contains(types, root.target.type)))
+	then
+		return prefix
+	end
+end
+
+function _find_node(recurse, types)
+	local path = { unpack(context.path) }
+	local name = table.concat(path, ".")
+	local node = context.treecache[name]
+
+	path = _find_eligible_node(node, path, recurse, types)
 
-   path[#path+1] = lowest
-   dispatch(path)
+	if path then
+		dispatch(path)
+	else
+		require "luci.template".render("empty_node_placeholder")
+	end
+end
+
+function _firstchild()
+	return _find_node(false, nil)
 end
 
 function firstchild()
-   return { type = "firstchild", target = _firstchild }
+	return { type = "firstchild", target = _firstchild }
+end
+
+function _firstnode()
+	return _find_node(true, { "cbi", "form", "template", "arcombine" })
+end
+
+function firstnode()
+	return { type = "firstnode", target = _firstnode }
 end
 
 function alias(...)
diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua
index cce559aab1..7f7397032f 100644
--- a/modules/luci-base/luasrc/model/network.lua
+++ b/modules/luci-base/luasrc/model/network.lua
@@ -813,6 +813,7 @@ function del_wifinet(self, net)
 end
 
 function get_status_by_route(self, addr, mask)
+	local route_statuses = { }
 	local _, object
 	for _, object in ipairs(utl.ubus()) do
 		local net = object:match("^network%.interface%.(.+)")
@@ -822,12 +823,14 @@ function get_status_by_route(self, addr, mask)
 				local rt
 				for _, rt in ipairs(s.route) do
 					if not rt.table and rt.target == addr and rt.mask == mask then
-						return net, s
+						route_statuses[net] = s
 					end
 				end
 			end
 		end
 	end
+
+	return route_statuses
 end
 
 function get_status_by_address(self, addr)
@@ -856,24 +859,28 @@ function get_status_by_address(self, addr)
 	end
 end
 
-function get_wannet(self)
-	local net, stat = self:get_status_by_route("0.0.0.0", 0)
-	return net and network(net, stat.proto)
-end
+function get_wan_networks(self)
+	local k, v
+	local wan_nets = { }
+	local route_statuses = self:get_status_by_route("0.0.0.0", 0)
 
-function get_wandev(self)
-	local _, stat = self:get_status_by_route("0.0.0.0", 0)
-	return stat and interface(stat.l3_device or stat.device)
-end
+	for k, v in pairs(route_statuses) do
+		wan_nets[#wan_nets+1] = network(k, v.proto)
+	end
 
-function get_wan6net(self)
-	local net, stat = self:get_status_by_route("::", 0)
-	return net and network(net, stat.proto)
+	return wan_nets
 end
 
-function get_wan6dev(self)
-	local _, stat = self:get_status_by_route("::", 0)
-	return stat and interface(stat.l3_device or stat.device)
+function get_wan6_networks(self)
+	local k, v
+	local wan6_nets = { }
+	local route_statuses = self:get_status_by_route("::", 0)
+
+	for k, v in pairs(route_statuses) do
+		wan6_nets[#wan6_nets+1] = network(k, v.proto)
+	end
+
+	return wan6_nets
 end
 
 function get_switch_topologies(self)
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm b/modules/luci-base/luasrc/view/admin_uci/changelog.htm
index 8a162c88b6..8a162c88b6 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm
+++ b/modules/luci-base/luasrc/view/admin_uci/changelog.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm b/modules/luci-base/luasrc/view/admin_uci/changes.htm
index 43bd7c23fb..43bd7c23fb 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
+++ b/modules/luci-base/luasrc/view/admin_uci/changes.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm b/modules/luci-base/luasrc/view/admin_uci/revert.htm
index d8fd3de01e..d8fd3de01e 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm
+++ b/modules/luci-base/luasrc/view/admin_uci/revert.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm b/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
index ebb02e489b..ebb02e489b 100644
--- a/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm
+++ b/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
diff --git a/modules/luci-base/luasrc/view/empty_node_placeholder.htm b/modules/luci-base/luasrc/view/empty_node_placeholder.htm
new file mode 100644
index 0000000000..b7e276b960
--- /dev/null
+++ b/modules/luci-base/luasrc/view/empty_node_placeholder.htm
@@ -0,0 +1,11 @@
+<%#
+ Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
+ Copyright 2018 Daniel F. Dickinson <cshored@thecshore.com>
+ Licensed to the public under the Apache License 2.0.
+-%>
+
+<%+header%>
+
+<p>Component not present.</p>
+
+<%+footer%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm b/modules/luci-base/luasrc/view/lease_status.htm
index 8fbbdc9477..15b6b6908e 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
+++ b/modules/luci-base/luasrc/view/lease_status.htm
@@ -1,5 +1,5 @@
 <script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=url('admin/network/dhcplease_status')%>', null,
+	XHR.poll(5, '<%=url('admin/dhcplease_status')%>', null,
 		function(x, st)
 		{
 			var tb = document.getElementById('lease_status_table');
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_assoclist.htm b/modules/luci-base/luasrc/view/wifi_assoclist.htm
index b6f84c0607..700d998ad8 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_assoclist.htm
+++ b/modules/luci-base/luasrc/view/wifi_assoclist.htm
@@ -17,7 +17,7 @@
 		return s;
 	}
 
-	XHR.poll(5, '<%=url('admin/network/wireless_assoclist')%>', null,
+	XHR.poll(5, '<%=url('admin/wireless_assoclist')%>', null,
 		function(x, st)
 		{
 			var tb = document.getElementById('wifi_assoclist_table');
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 603c77834f..a7c06d5e36 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -637,6 +637,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Suma de verificació"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -668,6 +671,11 @@ msgstr ""
 "Fes clic a \"Genera l'arxiu\" per obtenir un fitxer .tar.gz amb els fitxers "
 "de configuració actuals."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Client"
 
@@ -1013,6 +1021,9 @@ msgstr "Descarrega i instal·la el paquet"
 msgid "Download backup"
 msgstr "Descarrega còpia de seguretat"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2926,6 +2937,12 @@ msgstr "Desa"
 msgid "Save & Apply"
 msgstr "Desa i aplica"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Escaneja"
 
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index b5947dbcf8..a9852f6c51 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -630,6 +630,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Kontrolní součet"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -660,6 +663,11 @@ msgid ""
 msgstr ""
 "Pro stažení archivu tar s aktuální konfigurací stiskněte \"Vytvořit archiv\"."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Klient"
 
@@ -1011,6 +1019,9 @@ msgstr "Stáhnout a nainstalovat balíček"
 msgid "Download backup"
 msgstr "Stáhnout zálohu"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2940,6 +2951,12 @@ msgstr "Uložit"
 msgid "Save & Apply"
 msgstr "Uložit & použít"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Skenovat"
 
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index e7f8826df8..795b50415d 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -653,6 +653,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Prüfsumme"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -684,6 +687,11 @@ msgstr ""
 "Zum Herunterladen der aktuellen Konfigurationsdateien als gepacktes Archiv "
 "\"Sicherung erstellen\" drücken."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Client"
 
@@ -1047,6 +1055,9 @@ msgstr "Paket herunterladen und installieren"
 msgid "Download backup"
 msgstr "Backup herunterladen"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr "Downstream SNR-Offset"
 
@@ -3054,6 +3065,12 @@ msgstr "Speichern"
 msgid "Save & Apply"
 msgstr "Speichern & Anwenden"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index 839e5ff83d..3028cf227e 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -639,6 +639,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Άθροισμα Ελέγχου"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -668,6 +671,11 @@ msgstr ""
 "Κλικ στο \"Δημιουργία αρχείου\" για να κατεβάσετε ένα tar αρχείο με τα "
 "τρέχοντα αρχεία παραμετροποίησης."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Πελάτης"
 
@@ -1022,6 +1030,9 @@ msgstr "Κατέβασμα και εγκατάσταση πακέτου"
 msgid "Download backup"
 msgstr "Κατέβασμα αντιγράφου ασφαλείας"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2944,6 +2955,12 @@ msgstr "Αποθήκευση"
 msgid "Save & Apply"
 msgstr "Αποθήκευση & Εφαρμογή"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Σάρωση"
 
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 603d39275d..ffbfe6f565 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -628,6 +628,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Checksum"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -657,6 +660,11 @@ msgstr ""
 "Click \"Generate archive\" to download a tar archive of the current "
 "configuration files."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Client"
 
@@ -1005,6 +1013,9 @@ msgstr "Download and install package"
 msgid "Download backup"
 msgstr ""
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2910,6 +2921,12 @@ msgstr "Save"
 msgid "Save & Apply"
 msgstr "Save & Apply"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 67415460c7..0c21b8347e 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -635,6 +635,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Comprobación"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -666,6 +669,11 @@ msgstr ""
 "Pulse \"generar archivo\" para descargar un fichero tar con los ficheros de "
 "configuración actuales."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Cliente"
 
@@ -1018,6 +1026,9 @@ msgstr "Descargar e instalar paquete"
 msgid "Download backup"
 msgstr "Descargar copia de seguridad"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2955,6 +2966,12 @@ msgstr "Guardar"
 msgid "Save & Apply"
 msgstr "Guardar y aplicar"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Explorar"
 
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index 204c5e88c6..33eb7edf54 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -640,6 +640,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Somme de contrôle"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -672,6 +675,11 @@ msgstr ""
 "Cliquer sur \"Construire l'archive\" pour télécharger une archive tar des "
 "fichiers de la configuration actuelle."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Client"
 
@@ -1027,6 +1035,9 @@ msgstr "Télécharge et installe le paquet"
 msgid "Download backup"
 msgstr "Télécharger la sauvegarde"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2967,6 +2978,12 @@ msgstr "Sauvegarder"
 msgid "Save & Apply"
 msgstr "Sauvegarder et Appliquer"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index 73a4622814..97047328c6 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -630,6 +630,9 @@ msgstr ""
 msgid "Checksum"
 msgstr ""
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -653,6 +656,11 @@ msgid ""
 "configuration files."
 msgstr ""
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr ""
 
@@ -992,6 +1000,9 @@ msgstr "הורד והתקן חבילות"
 msgid "Download backup"
 msgstr "הורד גיבוי"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2874,6 +2885,12 @@ msgstr ""
 msgid "Save & Apply"
 msgstr ""
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr ""
 
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index 47a0197c94..94d9ad109d 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -635,6 +635,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Ellenőrző összeg"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -667,6 +670,11 @@ msgstr ""
 "Kattintson az \"Archívum készítése\" gombra a jelenlegi konfiguráció tar "
 "archívumként történő letöltéséhez."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Ügyfél"
 
@@ -1018,6 +1026,9 @@ msgstr "Csomag letöltése és telepítése"
 msgid "Download backup"
 msgstr "Biztonsági mentés letöltése"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2958,6 +2969,12 @@ msgstr "Mentés"
 msgid "Save & Apply"
 msgstr "Mentés & Alkalmazás"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Felderítés"
 
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 83fb6054b3..9ba9308e2c 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -642,6 +642,9 @@ msgstr "Marca questa opzione per cancellare le reti esistenti da questa radio."
 msgid "Checksum"
 msgstr "Checksum"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -673,6 +676,11 @@ msgstr ""
 "Premi su \"Genera archivio\" per scaricare un archivio tar di backup dei "
 "file di configurazione attuali."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Cliente"
 
@@ -1024,6 +1032,9 @@ msgstr "Scarica e installa pacchetto"
 msgid "Download backup"
 msgstr "Download backup"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2956,6 +2967,12 @@ msgstr "Salva"
 msgid "Save & Apply"
 msgstr "Salva & applica"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index b0d74f97ce..0fd6c31ad0 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -642,6 +642,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "チェックサム"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -673,6 +676,11 @@ msgstr ""
 "\"バックアップ アーカイブの作成\"をクリックすると、現在の設定ファイルをtar形"
 "式のアーカイブファイルとしてダウンロードします。"
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "クライアント"
 
@@ -1034,6 +1042,9 @@ msgstr "パッケージのダウンロードとインストール"
 msgid "Download backup"
 msgstr "バックアップ アーカイブのダウンロード"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2998,6 +3009,12 @@ msgstr "保存"
 msgid "Save & Apply"
 msgstr "保存 & 適用"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "スキャン"
 
diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index 92a36e67f2..30ab1f79c5 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -624,6 +624,9 @@ msgstr ""
 msgid "Checksum"
 msgstr ""
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -655,6 +658,11 @@ msgstr ""
 "현재 설정 파일에 대한 tar 아카이브 다운로드를 원한다면 \"아카이브 생성\" 버튼"
 "을 클릭하세요."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr ""
 
@@ -1002,6 +1010,9 @@ msgstr "패키지 다운로드 후 설치"
 msgid "Download backup"
 msgstr "백업 다운로드"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2903,6 +2914,12 @@ msgstr "저장"
 msgid "Save & Apply"
 msgstr "저장 & 적용"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan 하기"
 
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index b17c961bda..609af43c9a 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -614,6 +614,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Jumlah disemak "
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -637,6 +640,11 @@ msgid ""
 "configuration files."
 msgstr ""
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 #, fuzzy
 msgid "Client"
 msgstr "Pelanggan"
@@ -978,6 +986,9 @@ msgstr "Turun dan memasang pakej"
 msgid "Download backup"
 msgstr ""
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2880,6 +2891,12 @@ msgstr "Simpan"
 msgid "Save & Apply"
 msgstr "Simpan & Melaksanakan"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index d7e128a8b9..d30f4075da 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -626,6 +626,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Kontrollsum"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -657,6 +660,11 @@ msgstr ""
 "Klikk \"Opprett arkiv\" for å laste ned et tar arkiv av de gjeldende "
 "konfigurasjons filer."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Klient"
 
@@ -1008,6 +1016,9 @@ msgstr "Last ned og installer pakken"
 msgid "Download backup"
 msgstr "Last ned sikkerhetskopi"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2932,6 +2943,12 @@ msgstr "Lagre"
 msgid "Save & Apply"
 msgstr "Lagre & Aktiver"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Skann"
 
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 5295b3d90a..66c0c7c569 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -651,6 +651,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Suma kontrolna"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -682,6 +685,11 @@ msgstr ""
 "Kliknij \"Twórz archiwum\" aby pobrać archiwum tar zawierające bieżące pliki "
 "konfiguracyjne."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Klient"
 
@@ -1044,6 +1052,9 @@ msgstr "Pobierz i zainstaluj pakiet"
 msgid "Download backup"
 msgstr "Pobierz kopię zapasową"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -3005,6 +3016,12 @@ msgstr "Zapisz"
 msgid "Save & Apply"
 msgstr "Zapisz i zastosuj"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Skanuj"
 
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index bf5ca103a6..b45234cc23 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -672,6 +672,9 @@ msgstr "Marque esta opção para remover as redes existentes neste rádio."
 msgid "Checksum"
 msgstr "Soma de verificação"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -703,6 +706,11 @@ msgstr ""
 "Clique em \"Gerar arquivo\" para baixar um arquivo tar com os arquivos de "
 "configuração atuais."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Cliente"
 
@@ -1062,6 +1070,9 @@ msgstr "Baixe e instale o pacote"
 msgid "Download backup"
 msgstr "Baixar a cópia de segurança"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -3077,6 +3088,12 @@ msgstr "Salvar"
 msgid "Save & Apply"
 msgstr "Salvar & Aplicar"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Procurar"
 
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index cf23162aaf..10c6846e47 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -639,6 +639,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Checksum"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -670,6 +673,11 @@ msgstr ""
 "Clique em \"Gerar arquivo\" para descarregar o ficheiro tar com os actuais "
 "ficheiros de configuração."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Cliente"
 
@@ -1023,6 +1031,9 @@ msgstr "Descarregar e instalar pacote"
 msgid "Download backup"
 msgstr "Descarregar backup"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2953,6 +2964,12 @@ msgstr "Salvar"
 msgid "Save & Apply"
 msgstr "Salvar & Aplicar"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Procurar"
 
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index bbd60abb69..3e8381d30b 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -622,6 +622,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Suma de verificare"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -648,6 +651,11 @@ msgid ""
 "configuration files."
 msgstr ""
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr ""
 
@@ -985,6 +993,9 @@ msgstr "Descarca si instaleaza pachetul"
 msgid "Download backup"
 msgstr "Descarca backup"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2873,6 +2884,12 @@ msgstr "Salveaza"
 msgid "Save & Apply"
 msgstr "Salveaza si aplica"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index d84167a520..7b56612c5a 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -665,6 +665,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Контрольная сумма"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -697,6 +700,11 @@ msgstr ""
 "Нажмите 'Создать архив', чтобы загрузить tar-архив текущих config файлов "
 "прошивки устройства, таким образом вы сохраните его настройки."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Клиент"
 
@@ -1060,6 +1068,9 @@ msgstr "Загрузить и установить пакет"
 msgid "Download backup"
 msgstr "Загрузить резервную копию"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr "SNR offset внутренней сети"
 
@@ -3058,6 +3069,12 @@ msgstr "Сохранить"
 msgid "Save & Apply"
 msgstr "Сохранить и применить"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Поиск"
 
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index a22640b9ce..7a872fed3d 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -608,6 +608,9 @@ msgstr ""
 msgid "Checksum"
 msgstr ""
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -631,6 +634,11 @@ msgid ""
 "configuration files."
 msgstr ""
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr ""
 
@@ -966,6 +974,9 @@ msgstr ""
 msgid "Download backup"
 msgstr ""
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2846,6 +2857,12 @@ msgstr ""
 msgid "Save & Apply"
 msgstr ""
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr ""
 
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index e892e04081..fb0aaaa9a8 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -622,6 +622,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Checksumma"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -645,6 +648,11 @@ msgid ""
 "configuration files."
 msgstr ""
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Klient"
 
@@ -986,6 +994,9 @@ msgstr "Ladda ner och installera paket"
 msgid "Download backup"
 msgstr "Ladda ner säkerhetskopia"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2869,6 +2880,12 @@ msgstr "Spara"
 msgid "Save & Apply"
 msgstr "Spara och Verkställ"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Skanna"
 
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index d8621c02c5..cb1008a8e0 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -601,6 +601,9 @@ msgstr ""
 msgid "Checksum"
 msgstr ""
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -624,6 +627,11 @@ msgid ""
 "configuration files."
 msgstr ""
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr ""
 
@@ -959,6 +967,9 @@ msgstr ""
 msgid "Download backup"
 msgstr ""
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2839,6 +2850,12 @@ msgstr ""
 msgid "Save & Apply"
 msgstr ""
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr ""
 
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index f8d89b4b17..cd3688ba56 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -622,6 +622,9 @@ msgstr ""
 msgid "Checksum"
 msgstr ""
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -647,6 +650,11 @@ msgstr ""
 "Mevcut yapılandırma dosyalarının yeni bir arşivini indirmek için \"Arşiv "
 "Oluştur\"'u tıklayın."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr ""
 
@@ -984,6 +992,9 @@ msgstr ""
 msgid "Download backup"
 msgstr ""
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2864,6 +2875,12 @@ msgstr "Kaydet"
 msgid "Save & Apply"
 msgstr "Kaydet & Uygula"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Tara"
 
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 950d894b1d..f74307888e 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -671,6 +671,9 @@ msgstr "Позначте цей параметр, щоб видалити існ
 msgid "Checksum"
 msgstr "Контрольна сума"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -702,6 +705,11 @@ msgstr ""
 "Натисніть кнопку \"Створити архів\", щоб завантажити tar-архів поточних "
 "файлів конфігурації."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Клієнт"
 
@@ -1072,6 +1080,9 @@ msgstr "Завантажити та інсталювати пакети"
 msgid "Download backup"
 msgstr "Завантажити резервну копію"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr "Низхідний зсув SNR"
 
@@ -3075,6 +3086,12 @@ msgstr "Зберегти"
 msgid "Save & Apply"
 msgstr "Зберегти і застосувати"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Сканувати"
 
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index cdf3d6be46..217ca98fbd 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -615,6 +615,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "Checksum"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -638,6 +641,11 @@ msgid ""
 "configuration files."
 msgstr ""
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "Client"
 
@@ -981,6 +989,9 @@ msgstr "Tải và cài đặt gói"
 msgid "Download backup"
 msgstr ""
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2886,6 +2897,12 @@ msgstr "Lưu"
 msgid "Save & Apply"
 msgstr "Lưu & áp dụng "
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index 57e2b07ec7..2c7bdcc195 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -624,6 +624,9 @@ msgstr "选中此选项以从无线中删除现有网络。"
 msgid "Checksum"
 msgstr "校验值"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -649,6 +652,11 @@ msgid ""
 "configuration files."
 msgstr "点击“生成备份”下载当前配置文件的 tar 存档。"
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "客户端 Client"
 
@@ -998,6 +1006,9 @@ msgstr "下载并安装软件包"
 msgid "Download backup"
 msgstr "下载备份"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr "下游 SNR 偏移"
 
@@ -2920,6 +2931,12 @@ msgstr "保存"
 msgid "Save & Apply"
 msgstr "保存并应用"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "扫描"
 
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index 97e79922d0..f3354e1924 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -620,6 +620,9 @@ msgstr ""
 msgid "Checksum"
 msgstr "效驗碼"
 
+msgid "Choose mtdblock"
+msgstr ""
+
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -647,6 +650,11 @@ msgid ""
 "configuration files."
 msgstr "按下\"壓縮檔製作\"就能下載目前設定檔的tar格式的壓縮."
 
+msgid ""
+"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
+"FEATURE IS FOR PROFESSIONALS! )"
+msgstr ""
+
 msgid "Client"
 msgstr "用戶端"
 
@@ -992,6 +1000,9 @@ msgstr "下載並安裝軟體包"
 msgid "Download backup"
 msgstr "下載備份檔"
 
+msgid "Download mtdblock"
+msgstr ""
+
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -2889,6 +2900,12 @@ msgstr "保存"
 msgid "Save & Apply"
 msgstr "保存並啟用"
 
+msgid "Save mtdblock"
+msgstr ""
+
+msgid "Save mtdblock contents"
+msgstr ""
+
 msgid "Scan"
 msgstr "掃描"
 
diff --git a/modules/luci-mod-admin-full/Makefile b/modules/luci-mod-admin-full/Makefile
index 36ddf13f16..b376b35e55 100644
--- a/modules/luci-mod-admin-full/Makefile
+++ b/modules/luci-mod-admin-full/Makefile
@@ -7,9 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Administration - full-featured for full control
-LUCI_DEPENDS:=+luci-base
+LUCI_DEPENDS:=+luci-base +luci-mod-status +luci-mod-system +luci-mod-network
 
-PKG_BUILD_DEPENDS:=iwinfo
 PKG_LICENSE:=Apache-2.0
 
 include ../../luci.mk
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/index.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/index.lua
deleted file mode 100644
index cc8c2e3ae6..0000000000
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/index.lua
+++ /dev/null
@@ -1,42 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.controller.admin.index", package.seeall)
-
-function index()
-	local root = node()
-	if not root.target then
-		root.target = alias("admin")
-		root.index = true
-	end
-
-	local page   = node("admin")
-	page.target  = firstchild()
-	page.title   = _("Administration")
-	page.order   = 10
-	page.sysauth = "root"
-	page.sysauth_authenticator = "htmlauth"
-	page.ucidata = true
-	page.index = true
-
-	-- Empty services menu to be populated by addons
-	entry({"admin", "services"}, firstchild(), _("Services"), 40).index = true
-
-	entry({"admin", "logout"}, call("action_logout"), _("Logout"), 90)
-end
-
-function action_logout()
-	local dsp = require "luci.dispatcher"
-	local utl = require "luci.util"
-	local sid = dsp.context.authsession
-
-	if sid then
-		utl.ubus("session", "destroy", { ubus_rpc_session = sid })
-
-		luci.http.header("Set-Cookie", "sysauth=%s; expires=%s; path=%s/" %{
-			sid, 'Thu, 01 Jan 1970 01:00:00 GMT', dsp.build_url()
-		})
-	end
-
-	luci.http.redirect(dsp.build_url())
-end
diff --git a/modules/luci-mod-network/Makefile b/modules/luci-mod-network/Makefile
new file mode 100644
index 0000000000..5958765da7
--- /dev/null
+++ b/modules/luci-mod-network/Makefile
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Network Administration
+LUCI_DEPENDS:=+luci-base +libiwinfo-lua
+
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-network/luasrc/controller/admin/network.lua
index c45605a983..a587b7e513 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-network/luasrc/controller/admin/network.lua
@@ -8,12 +8,6 @@ function index()
 	local uci = require("luci.model.uci").cursor()
 	local page
 
-	page = node("admin", "network")
-	page.target = firstchild()
-	page.title  = _("Network")
-	page.order  = 50
-	page.index  = true
-
 --	if page.inreq then
 		local has_switch = false
 
@@ -43,9 +37,6 @@ function index()
 			end)
 
 		if has_wifi then
-			page = entry({"admin", "network", "wireless_assoclist"}, call("wifi_assoclist"), nil)
-			page.leaf = true
-
 			page = entry({"admin", "network", "wireless_join"}, post("wifi_join"), nil)
 			page.leaf = true
 
@@ -116,9 +107,6 @@ function index()
 			page.title  = _("DHCP and DNS")
 			page.order  = 30
 
-			page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
-			page.leaf = true
-
 			page = node("admin", "network", "hosts")
 			page.target = cbi("admin_network/hosts")
 			page.title  = _("Hostnames")
@@ -308,14 +296,6 @@ function wifi_reconnect(radio)
 	end
 end
 
-function wifi_assoclist()
-	local s = require "luci.tools.status"
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(s.wifi_assoclist())
-end
-
-
 local function _wifi_get_scan_results(cache_key)
 	local results = luci.util.ubus("session", "get", {
 		ubus_rpc_session = luci.model.uci:get_session_id(),
@@ -387,17 +367,6 @@ function wifi_scan_results(radio)
 	end
 end
 
-function lease_status()
-	local s = require "luci.tools.status"
-
-	luci.http.prepare_content("application/json")
-	luci.http.write('[')
-	luci.http.write_json(s.dhcp_leases())
-	luci.http.write(',')
-	luci.http.write_json(s.dhcp6_leases())
-	luci.http.write(']')
-end
-
 function switch_status(switches)
 	local s = require "luci.tools.status"
 
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua
index ae8a95f9ce..3ac49d635d 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua
@@ -266,7 +266,7 @@ o = s:taboption("general", DynamicList, "notinterface",
 o.optional = true
 o:depends("nonwildcard", true)
 
-m:section(SimpleSection).template = "admin_network/lease_status"
+m:section(SimpleSection).template = "lease_status"
 
 s = m:section(TypedSection, "host", translate("Static Leases"),
 	translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " ..
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/hosts.lua
index 46945af58b..46945af58b 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/hosts.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua
index ca66e9f365..ca66e9f365 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
index 8be354b448..8be354b448 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua
index 799386d29c..799386d29c 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/proto_ahcp.lua
index 0818199a93..0818199a93 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/proto_ahcp.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/routes.lua
index 1970f36a28..1970f36a28 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/routes.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua
index d79b3c4704..d79b3c4704 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
index 743efaa1e8..743efaa1e8 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua
index e8a3058826..e8a3058826 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
index ad20f09187..3bffb3502c 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
@@ -216,7 +216,7 @@ s = m:section(NamedSection, "__assoclist__")
 function s.render(self, sid)
 	tpl.render_string([[
 		<h2><%:Associated Stations%></h2>
-		<%+admin_network/wifi_assoclist%>
+		<%+wifi_assoclist%>
 	]])
 end
 
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm
index 03dd5aab29..03dd5aab29 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm
index 7427154a04..7427154a04 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm
index 34be35dd20..34be35dd20 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm
index 68f0bbc9d4..68f0bbc9d4 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm
index 987123642f..987123642f 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm
index 9730bc2c92..9730bc2c92 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm
index bfad3d0804..bfad3d0804 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm
diff --git a/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full b/modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full
index 372eb15122..372eb15122 100755
--- a/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full
+++ b/modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full
diff --git a/modules/luci-mod-status/Makefile b/modules/luci-mod-status/Makefile
new file mode 100644
index 0000000000..cf8c8ddf83
--- /dev/null
+++ b/modules/luci-mod-status/Makefile
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Status Pages
+LUCI_DEPENDS:=+luci-base +libiwinfo +libiwinfo-lua
+
+PKG_BUILD_DEPENDS:=iwinfo
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg b/modules/luci-mod-status/htdocs/luci-static/resources/bandwidth.svg
index 5a121b85c6..5a121b85c6 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/bandwidth.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg b/modules/luci-mod-status/htdocs/luci-static/resources/connections.svg
index 5794e79426..5794e79426 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/connections.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg b/modules/luci-mod-status/htdocs/luci-static/resources/load.svg
index 716d37617f..716d37617f 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/load.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg b/modules/luci-mod-status/htdocs/luci-static/resources/wifirate.svg
index e75ea614c9..e75ea614c9 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/wifirate.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg b/modules/luci-mod-status/htdocs/luci-static/resources/wireless.svg
index 00cc2a12f1..00cc2a12f1 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/wireless.svg
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua b/modules/luci-mod-status/luasrc/controller/admin/status.lua
index ff95f3d915..4f04cce545 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
+++ b/modules/luci-mod-status/luasrc/controller/admin/status.lua
@@ -5,7 +5,6 @@
 module("luci.controller.admin.status", package.seeall)
 
 function index()
-	entry({"admin", "status"}, alias("admin", "status", "overview"), _("Status"), 20).index = true
 	entry({"admin", "status", "overview"}, template("admin_status/index"), _("Overview"), 1)
 
 	entry({"admin", "status", "iptables"}, template("admin_status/iptables"), _("Firewall"), 2).leaf = true
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua b/modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua
index 0a6e48fd8e..0a6e48fd8e 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua
+++ b/modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm
index 3bb55f9054..3bb55f9054 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm b/modules/luci-mod-status/luasrc/view/admin_status/connections.htm
index 0a0db3be78..0a0db3be78 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/connections.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm
index 1a8770ef88..1a8770ef88 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-status/luasrc/view/admin_status/index.htm
index 29a03f2554..3edfd92047 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/index.htm
@@ -35,8 +35,8 @@
 
 	if luci.http.formvalue("status") == "1" then
 		local ntm = require "luci.model.network".init()
-		local wan = ntm:get_wannet()
-		local wan6 = ntm:get_wan6net()
+		local wan_nets = ntm:get_wan_networks()
+		local wan6_nets = ntm:get_wan6_networks()
 
 		local conn_count = tonumber(
 			fs.readfile("/proc/sys/net/netfilter/nf_conntrack_count") or "") or 0
@@ -56,45 +56,62 @@
 			wifinets   = stat.wifi_networks()
 		}
 
-		if wan then
-			local dev = wan:get_interface()
-			local link = dev and ipc.link(dev:name())
-			rv.wan = {
-				ipaddr  = wan:ipaddr(),
-				gwaddr  = wan:gwaddr(),
-				netmask = wan:netmask(),
-				dns     = wan:dnsaddrs(),
-				expires = wan:expires(),
-				uptime  = wan:uptime(),
-				proto   = wan:proto(),
-				i18n    = wan:get_i18n(),
-				ifname  = wan:ifname(),
-				link    = wan:adminlink(),
-				mac     = dev and dev:mac(),
-				type    = dev and dev:type(),
-				name    = dev and dev:get_i18n(),
-				ether   = link and link.type == 1
-			}
+		if #wan_nets > 0 then
+			local k, v
+
+			rv.wan = { }
+
+			for k, v in pairs(wan_nets) do
+				local dev = v:get_interface()
+				local link = dev and ipc.link(dev:name())
+
+				local wan_info = {
+					ipaddr  = v:ipaddr(),
+					gwaddr  = v:gwaddr(),
+					netmask = v:netmask(),
+					dns     = v:dnsaddrs(),
+					expires = v:expires(),
+					uptime  = v:uptime(),
+					proto   = v:proto(),
+					i18n    = v:get_i18n(),
+					ifname  = v:ifname(),
+					link    = v:adminlink(),
+					mac     = dev and dev:mac(),
+					type    = dev and dev:type(),
+					name    = dev and dev:get_i18n(),
+					ether   = link and link.type == 1
+				}
+
+				rv.wan[#rv.wan+1] = wan_info
+			end
 		end
 
-		if wan6 then
-			local dev = wan6:get_interface()
-			local link = dev and ipc.link(dev:name())
-			rv.wan6 = {
-				ip6addr   = wan6:ip6addr(),
-				gw6addr   = wan6:gw6addr(),
-				dns       = wan6:dns6addrs(),
-				ip6prefix = wan6:ip6prefix(),
-				uptime    = wan6:uptime(),
-				proto     = wan6:proto(),
-				i18n      = wan6:get_i18n(),
-				ifname    = wan6:ifname(),
-				link      = wan6:adminlink(),
-				mac       = dev and dev:mac(),
-				type      = dev and dev:type(),
-				name      = dev and dev:get_i18n(),
-				ether     = link and link.type == 1
-			}
+		if #wan6_nets > 0 then
+			local k, v
+
+			rv.wan6 = { }
+
+			for k, v in pairs(wan6_nets) do
+				local dev = v:get_interface()
+				local link = dev and ipc.link(dev:name())
+				local wan6_info = {
+					ip6addr   = v:ip6addr(),
+					gw6addr   = v:gw6addr(),
+					dns       = v:dns6addrs(),
+					ip6prefix = v:ip6prefix(),
+					uptime    = v:uptime(),
+					proto     = v:proto(),
+					i18n      = v:get_i18n(),
+					ifname    = v:ifname(),
+					link      = v:adminlink(),
+					mac       = dev and dev:mac(),
+					type      = dev and dev:type(),
+					name      = dev and dev:get_i18n(),
+					ether     = link and link.type == 1
+				}
+
+				rv.wan6[#rv.wan6+1] = wan6_info
+			end
 		end
 
 		if has_dsl then
@@ -177,47 +194,55 @@
 			while (us.lastElementChild)
 				us.removeChild(us.lastElementChild);
 
-			var ifc = info.wan || {};
+			var wan_list = info.wan || [];
+
+			for (var i = 0; i < wan_list.length; i++) {
+				var ifc = wan_list[i];
 
-			us.appendChild(renderBox(
-				'<%:IPv4 Upstream%>',
-				(ifc.ifname && ifc.proto != 'none'),
-				[ E('div', {}, renderBadge(
-					'<%=resource%>/icons/%s.png'.format((ifc && ifc.type) ? ifc.type : 'ethernet_disabled'), null,
+				us.appendChild(renderBox(
+					'<%:IPv4 Upstream%>',
+					(ifc.ifname && ifc.proto != 'none'),
+					[ E('div', {}, renderBadge(
+					'<%=resource%>' + '/icons/%s.png'.format((ifc && ifc.type) ? ifc.type : 'ethernet_disabled'), null,
 					'<%:Device%>', ifc ? (ifc.name || ifc.ifname || '-') : '-',
 					'<%:MAC-Address%>', (ifc && ifc.ether) ? ifc.mac : null)) ],
-				'<%:Protocol%>', ifc.i18n || E('em', '<%:Not connected%>'),
-				'<%:Address%>', (ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0',
-				'<%:Netmask%>', (ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255',
-				'<%:Gateway%>', (ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0',
-				'<%:DNS%> 1', (ifc.dns) ? ifc.dns[0] : null,
-				'<%:DNS%> 2', (ifc.dns) ? ifc.dns[1] : null,
-				'<%:DNS%> 3', (ifc.dns) ? ifc.dns[2] : null,
-				'<%:DNS%> 4', (ifc.dns) ? ifc.dns[3] : null,
-				'<%:DNS%> 5', (ifc.dns) ? ifc.dns[4] : null,
-				'<%:Expires%>', (ifc.expires > -1) ? '%t'.format(ifc.expires) : null,
-				'<%:Connected%>', (ifc.uptime > 0) ? '%t'.format(ifc.uptime) : null));
+					'<%:Protocol%>', ifc.i18n || E('em', '<%:Not connected%>'),
+					'<%:Address%>', (ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0',
+					'<%:Netmask%>', (ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255',
+					'<%:Gateway%>', (ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0',
+					'<%:DNS%> 1', (ifc.dns) ? ifc.dns[0] : null,
+					'<%:DNS%> 2', (ifc.dns) ? ifc.dns[1] : null,
+					'<%:DNS%> 3', (ifc.dns) ? ifc.dns[2] : null,
+					'<%:DNS%> 4', (ifc.dns) ? ifc.dns[3] : null,
+					'<%:DNS%> 5', (ifc.dns) ? ifc.dns[4] : null,
+					'<%:Expires%>', (ifc.expires > -1) ? '%t'.format(ifc.expires) : null,
+					'<%:Connected%>', (ifc.uptime > 0) ? '%t'.format(ifc.uptime) : null));
+			}
 
 			<% if has_ipv6 then %>
-			var ifc6 = info.wan6 || {};
-
-			us.appendChild(renderBox(
-				'<%:IPv6 Upstream%>',
-				(ifc6.ifname && ifc6.proto != 'none'),
-				[ E('div', {}, renderBadge(
-					'<%=resource%>/icons/%s.png'.format(ifc6.type || 'ethernet_disabled'), null,
-					'<%:Device%>', ifc6 ? (ifc6.name || ifc6.ifname || '-') : '-',
-					'<%:MAC-Address%>', (ifc6 && ifc6.ether) ? ifc6.mac : null)) ],
-				'<%:Protocol%>', ifc6.i18n ? (ifc6.i18n + (ifc6.proto === 'dhcp' && ifc6.ip6prefix ? '-PD' : '')) : E('em', '<%:Not connected%>'),
-				'<%:Prefix Delegated%>', ifc6.ip6prefix,
-				'<%:Address%>', (ifc6.ip6prefix) ? (ifc6.ip6addr || null) : (ifc6.ipaddr || '::'),
-				'<%:Gateway%>', (ifc6.gw6addr) ? ifc6.gw6addr : '::',
-				'<%:DNS%> 1', (ifc6.dns) ? ifc6.dns[0] : null,
-				'<%:DNS%> 2', (ifc6.dns) ? ifc6.dns[1] : null,
-				'<%:DNS%> 3', (ifc6.dns) ? ifc6.dns[2] : null,
-				'<%:DNS%> 4', (ifc6.dns) ? ifc6.dns[3] : null,
-				'<%:DNS%> 5', (ifc6.dns) ? ifc6.dns[4] : null,
-				'<%:Connected%>', (ifc6.uptime > 0) ? '%t'.format(ifc6.uptime) : null));
+			var wan6_list = info.wan6 || [];
+
+			for (var i = 0; i < wan6_list.length; i++) {
+				var ifc6 = wan6_list[i];
+
+				us.appendChild(renderBox(
+					'<%:IPv6 Upstream%>',
+					(ifc6.ifname && ifc6.proto != 'none'),
+					[ E('div', {}, renderBadge(
+						'<%=resource%>/icons/%s.png'.format(ifc6.type || 'ethernet_disabled'), null,
+						'<%:Device%>', ifc6 ? (ifc6.name || ifc6.ifname || '-') : '-',
+						'<%:MAC-Address%>', (ifc6 && ifc6.ether) ? ifc6.mac : null)) ],
+					'<%:Protocol%>', ifc6.i18n ? (ifc6.i18n + (ifc6.proto === 'dhcp' && ifc6.ip6prefix ? '-PD' : '')) : E('em', '<%:Not connected%>'),
+					'<%:Prefix Delegated%>', ifc6.ip6prefix,
+					'<%:Address%>', (ifc6.ip6prefix) ? (ifc6.ip6addr || null) : (ifc6.ipaddr || '::'),
+					'<%:Gateway%>', (ifc6.gw6addr) ? ifc6.gw6addr : '::',
+					'<%:DNS%> 1', (ifc6.dns) ? ifc6.dns[0] : null,
+					'<%:DNS%> 2', (ifc6.dns) ? ifc6.dns[1] : null,
+					'<%:DNS%> 3', (ifc6.dns) ? ifc6.dns[2] : null,
+					'<%:DNS%> 4', (ifc6.dns) ? ifc6.dns[3] : null,
+					'<%:DNS%> 5', (ifc6.dns) ? ifc6.dns[4] : null,
+					'<%:Connected%>', (ifc6.uptime > 0) ? '%t'.format(ifc6.uptime) : null));
+			}
 			<% end %>
 
 			<% if has_dsl then %>
@@ -417,7 +442,7 @@
 
 <%
 	if has_dhcp then
-		include("admin_network/lease_status")
+		include("lease_status")
 	end
 %>
 
@@ -443,7 +468,7 @@
 <div class="cbi-section">
 	<h3><%:Associated Stations%></h3>
 
-	<%+admin_network/wifi_assoclist%>
+	<%+wifi_assoclist%>
 </div>
 <% end %>
 
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm
index 51e428e40e..51e428e40e 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm b/modules/luci-mod-status/luasrc/view/admin_status/load.htm
index bced06fa22..bced06fa22 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/load.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm b/modules/luci-mod-status/luasrc/view/admin_status/routes.htm
index 74779f6ad8..74779f6ad8 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/routes.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm
index fb734a76d9..fb734a76d9 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm
index 8ec43cb0e6..8ec43cb0e6 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm
diff --git a/modules/luci-mod-admin-full/src/Makefile b/modules/luci-mod-status/src/Makefile
index d6ed8c6e46..d6ed8c6e46 100644
--- a/modules/luci-mod-admin-full/src/Makefile
+++ b/modules/luci-mod-status/src/Makefile
diff --git a/modules/luci-mod-admin-full/src/luci-bwc.c b/modules/luci-mod-status/src/luci-bwc.c
index 8ddd91727a..8ddd91727a 100644
--- a/modules/luci-mod-admin-full/src/luci-bwc.c
+++ b/modules/luci-mod-status/src/luci-bwc.c
diff --git a/modules/luci-mod-system/Makefile b/modules/luci-mod-system/Makefile
new file mode 100644
index 0000000000..a6d5a7a456
--- /dev/null
+++ b/modules/luci-mod-system/Makefile
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Administration - Global System Settings
+LUCI_DEPENDS:=+luci-base
+
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-system/luasrc/controller/admin/system.lua
index 46d2e36c32..4e83769ee0 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-system/luasrc/controller/admin/system.lua
@@ -7,7 +7,6 @@ module("luci.controller.admin.system", package.seeall)
 function index()
 	local fs = require "nixio.fs"
 
-	entry({"admin", "system"}, alias("admin", "system", "system"), _("System"), 30).index = true
 	entry({"admin", "system", "system"}, cbi("admin_system/system"), _("System"), 1)
 	entry({"admin", "system", "clock_status"}, post_on({ set = true }, "action_clock_status"))
 
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/admin.lua
index 6c1c1235c5..6c1c1235c5 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/admin.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua
index ee2401e93d..ee2401e93d 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua
index 016a6199aa..016a6199aa 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua
index 3ce5351bf0..3ce5351bf0 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua
index a85872afad..a85872afad 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua
index 82468d5fcc..82468d5fcc 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/ipkg.lua
index 7c6d7e1c66..7c6d7e1c66 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/ipkg.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua
index 2ea044e16a..2ea044e16a 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua
index 9e19ac50a2..9e19ac50a2 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua
index c7fdfcddba..c7fdfcddba 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm
index e235bd4679..e235bd4679 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm b/modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm
index c1f3361ae2..c1f3361ae2 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm b/modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm
index 37d8ae0e85..37d8ae0e85 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-system/luasrc/view/admin_system/flashops.htm
index 8204d38e34..8204d38e34 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/flashops.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm b/modules/luci-mod-system/luasrc/view/admin_system/ipkg.htm
index a7ff4e50bd..a7ff4e50bd 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/ipkg.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm b/modules/luci-mod-system/luasrc/view/admin_system/packages.htm
index 280eabb8ea..280eabb8ea 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/packages.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm b/modules/luci-mod-system/luasrc/view/admin_system/reboot.htm
index d23664adac..d23664adac 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/reboot.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm
index 597ddfd6bf..597ddfd6bf 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm