From: Steven Barth Date: Fri, 18 Jul 2008 21:33:25 +0000 (+0000) Subject: modules/admin-mini: Several tweaks, initial status page X-Git-Tag: 0.8.0~620 X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=3d794abec4531bd2a2e44e2cb0e2ce13c657dcdb modules/admin-mini: Several tweaks, initial status page --- diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua index abfba409d..1c2294b79 100644 --- a/i18n/english/luasrc/i18n/admin-core.en.lua +++ b/i18n/english/luasrc/i18n/admin-core.en.lua @@ -251,4 +251,12 @@ m_w_clientmode = "Clientmode" system_system_logsize = "System log buffer size" system_system_logip = "External system log server" system_system_conloglevel = "Log output level" -system_system_conloglevel_desc = "Level of log messages on the console" \ No newline at end of file +system_system_conloglevel_desc = "Level of log messages on the console" + +m_i_processor = "Processor" +m_i_memory = "Memory" +m_i_systemtime = "Local Time" +m_i_uptime = "Uptime" + +m_n_d_firstaddress = "First leased address" +m_n_d_numleases = "Number of leasesed addresses" \ No newline at end of file diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua index 989b586c3..0597fd866 100644 --- a/i18n/german/luasrc/i18n/admin-core.de.lua +++ b/i18n/german/luasrc/i18n/admin-core.de.lua @@ -265,4 +265,12 @@ m_w_clientmode = "Verbindungsmodus" system_system_logsize = "Größe des Systemprotokollpuffers" system_system_logip = "Externer Systemprotokollserver" system_system_conloglevel = "Protokollausgabelevel" -system_system_conloglevel_desc = "Level auf der Konsole ausgegebener Meldungen" \ No newline at end of file +system_system_conloglevel_desc = "Level auf der Konsole ausgegebener Meldungen" + +m_i_processor = "Prozessor" +m_i_memory = "Hauptspeicher" +m_i_systemtime = "Lokale Zeit" +m_i_uptime = "Laufzeit" + +m_n_d_firstaddress = "Erste vergebene Adresse" +m_n_d_numleases = "Anzahl vergebener Adressen" \ No newline at end of file diff --git a/libs/core/luasrc/sys.lua b/libs/core/luasrc/sys.lua index d0195c5da..9f25b84b3 100644 --- a/libs/core/luasrc/sys.lua +++ b/libs/core/luasrc/sys.lua @@ -158,6 +158,13 @@ function uniqueid(bytes) end +-- Returns uptime stats +function uptime() + local loadavg = io.lines("/proc/uptime")() + return loadavg:match("^(.-) (.-)$") +end + + group = {} group.getgroup = posix.getgroup diff --git a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua index 5a27f1e68..05334049d 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua @@ -22,15 +22,15 @@ s.anonymous = true s:depends("interface", "lan") enable = s:option(ListValue, "ignore", "", "") -enable:value(0, "enabled") -enable:value(1, "disabled") +enable:value(0, translate("enable")) +enable:value(1, translate("disable")) -start = s:option(Value, "start", "First address") +start = s:option(Value, "start", translate("m_n_d_firstaddress")) start.rmempty = true start:depends("ignore", "0") -limit = s:option(Value, "limit", "Number of leases", "") +limit = s:option(Value, "limit", translate("m_n_d_numleases"), "") limit:depends("ignore", "0") function limit.cfgvalue(self, section) diff --git a/modules/admin-mini/luasrc/view/mini/index.htm b/modules/admin-mini/luasrc/view/mini/index.htm index 4ea58c2b8..1b9e46aae 100644 --- a/modules/admin-mini/luasrc/view/mini/index.htm +++ b/modules/admin-mini/luasrc/view/mini/index.htm @@ -12,13 +12,126 @@ You may obtain a copy of the License at $Id$ -%> +<% +local system, model, memtotal = luci.sys.sysinfo() + +local uptime = luci.sys.uptime() +uptime = tonumber(uptime) + +local utdays = math.floor(uptime / 86400) +uptime = uptime % 86400 +local uthour = math.floor(uptime / 3600) +uptime = uptime % 3600 +local utmins = math.floor(uptime / 60) +local utsecs = uptime % 60 + +local iwconfig = luci.sys.wifi.getiwconfig() +-%> <%+header%>

<%:a_i_i_hello%>

<%:a_i_i_admin1%>

<%:a_i_i_admin2%>
<%:a_i_i_admin3%>

-

<%:a_i_i_admin4%>

-

<%:a_i_i_admin5%>

<%:a_i_i_admin6%>

-

<%:a_i_i_team%>

+

<%:a_i_i_team%>

+
+
+
+

Systemstatus

+ + + + + + + + + + + + + + + + + + + + + + + + + +
<%:hostname%>:<%=luci.sys.hostname()%>
<%:system%>:<%=system%>
<%:m_i_processor%>:<%=model%>
<%:m_i_memory%>:<%=string.format("%.2f", tonumber(memtotal) / 1024)%> MiB
<%:m_i_systemtime%>:<%=os.date("%c")%>
<%:m_i_uptime%>:<%=string.format("%dd %d:%d:%.0f", utdays, uthour, utmins, utsecs)%>
+ + +<%- if luci.model.uci.get_statevalue("network", "lan", "up") == "1" then %> +
+

<%:m_n_local%>

+ + + + + + + + + +
<%:ipaddress%>:<%=luci.model.uci.get_statevalue("network", "lan", "ipaddr")%>
<%:netmask%>:<%=luci.model.uci.get_statevalue("network", "lan", "netmask")%>
+<%- end %> + + +<%- if luci.model.uci.get_statevalue("network", "lan", "up") == "1" then %> +
+

<%:m_n_inet%>

+ + + + + + + + + +
<%:ipaddress%>:<%=luci.model.uci.get_statevalue("network", "wan", "ipaddr")%>
<%:netmask%>:<%=luci.model.uci.get_statevalue("network", "wan", "netmask")%>
+<%- end %> + +<%- if next(iwconfig) then %> +

<%:wifi%>

+
+ + + + + + + + + + + + + +<%for k, v in pairs(iwconfig) do +%> + + + + + + + + + + + + + + + + +<%end%> +
<%:name%><%:protocol%><%:frequency%><%:power%><%:bitrate%><%:rts%><%:frag%><%:link%><%:signal%><%:noise%>
<%=k%><%=v[1]%><%=v.Frequency%><%=v["Tx-Power"]%><%=v["Bit Rate"]%><%=v["RTS thr"]%><%=v["Fragment thr"]%><%=v["Link Quality"]%><%=v["Signal level"]%><%=v["Noise level"]%>
ESSID: <%=v.ESSID%>BSSID: <%=(v.Cell or v["Access Point"])%>
+<%-end%> <%+footer%> \ No newline at end of file