diff options
| author | Manuel Munz <freifunk@somakoma.de> | 2011-04-04 11:50:09 +0000 |
|---|---|---|
| committer | Manuel Munz <freifunk@somakoma.de> | 2011-04-04 11:50:09 +0000 |
| commit | 288a63f919ccbf443254359318b6cd7628d6959d (patch) | |
| tree | 8cf7de5c7f2f723e53e7e14c1e38c58bdd951974 | |
| parent | e853a98c3e6691d82596f0f31d90bda46d7ac196 (diff) | |
modules/freifunk: Show date/time in a bit nicer format (#184)
| -rw-r--r-- | modules/freifunk/luasrc/controller/freifunk/freifunk.lua | 2 | ||||
| -rw-r--r-- | modules/freifunk/luasrc/view/freifunk/public_status.htm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua index e8cd19b656..9f7632f6c4 100644 --- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua @@ -294,7 +294,7 @@ function public_status_json() end rv[#rv+1] = { - time = os.date("%c"), + time = os.date("%a, %d %b %Y %H:%M:%S UTC"), uptime = twa.date_format(tonumber(sys.uptime())), load = string.format("%.2f, %.2f, %.2f", load1, load5, load15), mem = mem, diff --git a/modules/freifunk/luasrc/view/freifunk/public_status.htm b/modules/freifunk/luasrc/view/freifunk/public_status.htm index 1698e9c23b..fe56034e4d 100644 --- a/modules/freifunk/luasrc/view/freifunk/public_status.htm +++ b/modules/freifunk/luasrc/view/freifunk/public_status.htm @@ -6,7 +6,7 @@ local twa = require "luci.tools.webadmin" -- System local system, model, memtotal, memcached, membuffers, memfree, bogomips = sys.sysinfo() local uptime = twa.date_format(tonumber(sys.uptime())) -local_time = os.date("%c") +local_time = os.date("%a, %d %b %Y %H:%M:%S UTC") local load1, load5, load15 = sys.loadavg() local load = string.format("%.2f, %.2f, %.2f", load1, load5, load15) |