X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_system%2Fsystem.lua;h=f30443768a7843761dd01c171cae6401d4b2e0f4;hp=b3c2a4e86c4f9aacc757588606b5488f4f29585c;hb=9be4231a10d6482282ed7f290b9b30ec49558d1a;hpb=438180ead424ad61d2ad47c5f9d4b5da7ec4e1de

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index b3c2a4e86..f30443768 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -15,39 +15,53 @@ $Id$
 require("luci.sys")
 require("luci.sys.zoneinfo")
 require("luci.tools.webadmin")
+require("luci.fs")
+
+m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
+
+function m.on_parse()
+	local has_rdate = false
+
+	m.uci:foreach("system", "rdate",
+		function()
+			has_rdate = true
+			return false
+		end)
+end
 
-m = Map("system", translate("system"), translate("a_s_desc"))
 
 s = m:section(TypedSection, "system", "")
 s.anonymous = true
+s.addremove = false
 
 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
+s:option(DummyValue, "_system", translate("System")).value = system
+s:option(DummyValue, "_cpu", translate("Processor")).value = model
 
 local load1, load5, load15 = luci.sys.loadavg()
-s:option(DummyValue, "_la", translate("load")).value =
+s:option(DummyValue, "_la", translate("Load")).value =
  string.format("%.2f, %.2f, %.2f", load1, load5, load15)
 
-s:option(DummyValue, "_memtotal", translate("m_i_memory")).value =
+s:option(DummyValue, "_memtotal", translate("Memory")).value =
  string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
   tonumber(memtotal) / 1024,
   100 * memcached / memtotal,
-  translate("mem_cached") or "",
+  tostring(translate("cached")),
   100 * membuffers / memtotal,
-  translate("mem_buffered") or "",
+  tostring(translate("buffered")),
   100 * memfree / memtotal,
-  translate("mem_free") or "")
+  tostring(translate("free"))
+)
 
-s:option(DummyValue, "_systime", translate("m_i_systemtime")).value =
+s:option(DummyValue, "_systime", translate("Local Time")).value =
  os.date("%c")
 
-s:option(DummyValue, "_uptime", translate("m_i_uptime")).value =
+s:option(DummyValue, "_uptime", translate("Uptime")).value =
  luci.tools.webadmin.date_format(tonumber(uptime))
 
-hn = s:option(Value, "hostname", translate("hostname"))
+hn = s:option(Value, "hostname", translate("Hostname"))
 
 function hn.write(self, section, value)
 	Value.write(self, section, value)
@@ -55,7 +69,7 @@ function hn.write(self, section, value)
 end
 
 
-tz = s:option(ListValue, "zonename", translate("timezone"))
+tz = s:option(ListValue, "zonename", translate("Timezone"))
 tz:value("UTC")
 
 for i, zone in ipairs(luci.sys.zoneinfo.TZ) do
@@ -70,11 +84,23 @@ function tz.write(self, section, value)
 	end
 
 	AbstractValue.write(self, section, value)
-	self.map.uci:set("system", section, "timezone", lookup_zone(value) or "GMT0")
+	local timezone = lookup_zone(value) or "GMT0"
+	self.map.uci:set("system", section, "timezone", timezone)
+	luci.fs.writefile("/etc/TZ", timezone .. "\n")
+end
+
+s:option(Value, "log_size", translate("System log buffer size"), "kiB").optional = true
+s:option(Value, "log_ip", translate("External system log server")).optional = true
+s:option(Value, "log_port", translate("External system log server port")).optional = true
+s:option(Value, "conloglevel", translate("Log output level")).optional = true
+s:option(Value, "cronloglevel", translate("Cron Log Level")).optional = true
+
+if has_rdate then
+	s2 = m:section(TypedSection, "rdate", translate("Time Server (rdate)"))
+	s2.anonymous = true
+	s2.addremove = false
+
+	s2:option(DynamicList, "server", translate("Server"))
 end
 
-s:option(Value, "log_size", nil, "kiB").optional = true
-s:option(Value, "log_ip").optional = true
-s:option(Value, "conloglevel").optional = true
-s:option(Value, "cronloglevel").optional = true
 return m