Small bugfixes and improvements

5 files changed, 44 insertions, 38 deletions

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/index.lua b/modules/admin-mini/luasrc/model/cbi/mini/index.lua
index 352008e30..71b5dafa3 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/index.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/index.lua
@@ -11,38 +11,4 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-require("luci.sys")
-require("luci.tools.webadmin")
-
-w = Template("mini/index")
-
-f = SimpleForm("main", translate("system"))
-f.reset = false
-f.submit = false
-
-local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
-local uptime = luci.sys.uptime()
-f:field(DummyValue, "_system", translate("system")).value = system
-f:field(DummyValue, "_cpu", translate("m_i_processor")).value = model
-
-local load1, load5, load15 = luci.sys.loadavg()
-f:field(DummyValue, "_la", translate("load")).value = 
- string.format("%.2f, %.2f, %.2f", load1, load5, load15)
- 
-f:field(DummyValue, "_memtotal", translate("m_i_memory")).value = 
- string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
-  tonumber(memtotal) / 1024,
-  100 * memcached / memtotal,
-  translate("mem_cached") or "",
-  100 * membuffers / memtotal,
-  translate("mem_buffered") or "",
-  100 * memfree / memtotal,
-  translate("mem_free") or "")
-
-f:field(DummyValue, "_systime", translate("m_i_systemtime")).value =
- os.date("%c")
- 
-f:field(DummyValue, "_uptime", translate("m_i_uptime")).value = 
- luci.tools.webadmin.date_format(tonumber(uptime))
-
-return w, f
\ No newline at end of file
+return Template("mini/index")
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
index aeaf8a7c1..dfabbe433 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
@@ -12,6 +12,9 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+require("luci.tools.webadmin")
+require("luci.sys")
+
 m0 = Map("network", translate("network"))
 m0.stateful = true
 local netstat = luci.sys.net.deviceinfo()
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
index 298c794f5..c9e8c7f6f 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/system.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
@@ -12,12 +12,47 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 require("luci.http.protocol.date")
+require("luci.sys")
+require("luci.tools.webadmin")
+
 
 m = Map("system", translate("system"), translate("a_s_desc"))
 
 s = m:section(TypedSection, "system", "")
 s.anonymous = true
 
+
+
+local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
+local uptime = luci.sys.uptime()
+
+s:option(DummyValue, "_system", translate("system")).value = system
+s:option(DummyValue, "_cpu", translate("m_i_processor")).value = model
+
+local load1, load5, load15 = luci.sys.loadavg()
+s:option(DummyValue, "_la", translate("load")).value = 
+ string.format("%.2f, %.2f, %.2f", load1, load5, load15)
+ 
+s:option(DummyValue, "_memtotal", translate("m_i_memory")).value = 
+ string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
+  tonumber(memtotal) / 1024,
+  100 * memcached / memtotal,
+  translate("mem_cached") or "",
+  100 * membuffers / memtotal,
+  translate("mem_buffered") or "",
+  100 * memfree / memtotal,
+  translate("mem_free") or "")
+
+s:option(DummyValue, "_systime", translate("m_i_systemtime")).value =
+ os.date("%c")
+ 
+s:option(DummyValue, "_uptime", translate("m_i_uptime")).value = 
+ luci.tools.webadmin.date_format(tonumber(uptime))
+ 
+ 
+ 
+ 
+
 s:option(Value, "hostname", translate("hostname"))
 
 tz = s:option(ListValue, "timezone", translate("timezone"))
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 3abceba59..c293175b6 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -60,7 +60,8 @@ end
 
 protocol = s:option(DummyValue, "_mode", translate("protocol"))
 function protocol.cfgvalue(self, section)
-	return "802." .. wireless[self.map:get(section, "device")].mode
+	local mode = wireless[self.map:get(section, "device")].mode
+	return mode and "802." .. mode
 end
 
 mode = s:option(DummyValue, "mode", translate("mode"))
diff --git a/modules/admin-mini/luasrc/view/mini/index.htm b/modules/admin-mini/luasrc/view/mini/index.htm
index e88324a8c..c0b208054 100644
--- a/modules/admin-mini/luasrc/view/mini/index.htm
+++ b/modules/admin-mini/luasrc/view/mini/index.htm
@@ -16,6 +16,7 @@ $Id$
 <p><%:a_i_i_admin1%></p>
 <p><%:a_i_i_admin2%><br />
 <%:a_i_i_admin3%></p>
+<p><%:a_i_i_admin4%></p>
+<p><%:a_i_i_admin5%></p>
 <p><%:a_i_i_admin6%></p>
-<p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team%></a></strong></em></p>
-<br />
\ No newline at end of file
+<p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team%></a></strong></em></p> 
\ No newline at end of file