Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small bugfixes and improvements

Browse source
This commit is contained in:
Steven Barth 2008-08-18 08:43:48 +00:00
parent ec796fc52a
commit 03a6ee9ef0
8 changed files with 48 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
i18n/english/luasrc/i18n/admin-core.en.lua
View file

@ -10,7 +10,7 @@ a_i_i_hello = [[Hello!]]
a_i_i_admin1 = [[This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.]]
a_i_i_admin2 = [[<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWRT Kamikaze.]]
a_i_i_admin3 = [[On the following pages you can adjust all important settings of your router.]]
a_i_i_admin4 = [[Notice: In <abbr title="Lua Configuration Interface">LuCI</abbr> changes have to be confirmed by clicking Changes - Apply before being applied.]]
a_i_i_admin4 = [[Notice: In <abbr title="Lua Configuration Interface">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied.]]
a_i_i_admin5 = [[As we are always want to improve this interface we are looking forward to your feedback and suggestions.]]
a_i_i_admin6 = [[And now have fun with your router!]]
a_i_i_team = [[The <abbr title="Lua Configuration Interface">LuCI</abbr> Team]]

2
i18n/german/luasrc/i18n/admin-core.de.lua
View file

@ -1,7 +1,7 @@
a_i_i_admin1 = [[Dies ist der Administrationsbereich von LuCI.]]
a_i_i_admin2 = [[LuCI ist eine freie, flexible und benutzerfreundliche grafische Oberfläche zur Konfiguration von OpenWRT Kamikaze.]]
a_i_i_admin3 = [[Auf den folgenden Seiten können alle wichtigen Einstellungen des Routers vorgenommen werden.]]
a_i_i_admin4 = [[Hinweis: In LuCI werden getätigte Änderungen erst nach einem Klick auf Änderungen - Anwenden gespeichert.]]
a_i_i_admin4 = [[Hinweis: In LuCI werden getätigte Änderungen erst nach einem Klick auf Änderungen - Speichern & Anwenden angewandt.]]
a_i_i_admin5 = [[Wir sind natürlich stets darum bemüht, diese Oberfläche
noch besser und intuitiver zu Gestalten und freuen uns über jegliche Art von Feedback oder Verbesserungsvorschlägen.]]
a_i_i_admin6 = [[Und nun wünschen wir viel Spaß mit dem Router!]]

3
modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
View file

@ -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"))

36
modules/admin-mini/luasrc/model/cbi/mini/index.lua
View file

@ -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
return Template("mini/index")

3
modules/admin-mini/luasrc/model/cbi/mini/network.lua
View file

@ -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()

35
modules/admin-mini/luasrc/model/cbi/mini/system.lua
View file

@ -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"))

3
modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
View file

@ -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"))

5
modules/admin-mini/luasrc/view/mini/index.htm
View file

@ -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 />
<p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team%></a></strong></em></p>