diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2008-07-14 15:54:53 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2008-07-14 15:54:53 +0000 |
| commit | 426f12416dd59cd24524fb577bdea8b2e4c440f9 (patch) | |
| tree | 5ccf85da15170b26f2b8cec395cb5bd863bbae41 /modules | |
| parent | bd3d20708134c3a7622269f71d13ccb70ac0dece (diff) | |
* luci: add memory status patches from soma
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/freifunk/luasrc/controller/freifunk/freifunk.lua | 3 | ||||
| -rw-r--r-- | modules/freifunk/luasrc/i18n/freifunk.de.lua | 4 | ||||
| -rw-r--r-- | modules/freifunk/luasrc/view/public_status/index.htm | 14 |
3 files changed, 16 insertions, 5 deletions
diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua index 78cb92f2a..351a09448 100644 --- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua @@ -67,7 +67,8 @@ end function action_status() local data = {} - data.s, data.m, data.r = luci.sys.sysinfo() + data.system, data.model, data.memtotal, data.memcached, data.membuffers, data.memfree, data.perc_memfree, data.perc_membuffers, data.perc_memcached = luci.sys.sysinfo() + data.wifi = luci.sys.wifi.getiwconfig() diff --git a/modules/freifunk/luasrc/i18n/freifunk.de.lua b/modules/freifunk/luasrc/i18n/freifunk.de.lua index e54e9b027..e662163a4 100644 --- a/modules/freifunk/luasrc/i18n/freifunk.de.lua +++ b/modules/freifunk/luasrc/i18n/freifunk.de.lua @@ -14,4 +14,8 @@ node = [[Knoten]] note = [[Notiz]] phone = [[Telefon]] ram = [[Hauptspeicher]] +free = [[Frei]] +buffers = [[Buffers]] +cached = [[Cached]] +total = [[Gesamt]] geocoord = [[Geokoordinaten]]
\ No newline at end of file diff --git a/modules/freifunk/luasrc/view/public_status/index.htm b/modules/freifunk/luasrc/view/public_status/index.htm index 5789e3ad9..a10f22f43 100644 --- a/modules/freifunk/luasrc/view/public_status/index.htm +++ b/modules/freifunk/luasrc/view/public_status/index.htm @@ -20,15 +20,21 @@ $Id$ <table cellspacing="0" cellpadding="6" class="smalltext"> <tr> <th><%:system_type%>:</th> -<td><%=s%></td> +<td><%=system%></td> </tr> <tr> <th><%:cpu%>:</th> -<td><%=m%></td> +<td><%=model%></td> </tr> <tr> -<th><%:ram%>:</th> -<td><%=r%></td> +<th><%:ram%>:<br /><small><%:total%>/<%:cached%>/<%:buffers%>/<%:free%></small></th> +<td><%=memtotal%> / <%=memcached%> / <%=membuffers%> / <%=memfree%> KB<br /> +<div id="memorybar"> + <div id="memfree" style="width:<%=perc_memfree%>%"></div> + <div id="membuffers" style="width:<%=perc_membuffers%>%"></div> + <div id="memcached" style="width:<%=perc_memcached%>%"></div> +</div> +</td> </tr> </table> <br /><br /> |