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

luci-0.10: merge r7924

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-11-12 14:32:48 +00:00
parent 4c15e9d73f
commit d883578e1e
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/admin-full/luasrc/view/admin_uci/changelog.htm
View file

@ -35,7 +35,16 @@ $Id$
ret[#ret+1] = "<ins>%s.%s=<strong>%s</strong>" %{ r, s, os['.type'] }
for o, v in util.kspairs(os) do
if o:sub(1,1) ~= "." then
ret[#ret+1] = "<br />%s.%s.%s=<strong>%s</strong>" %{ r, s, o, util.pcdata(v) }
if type(v) == "table" then
local i
for i = 1, #v do
ret[#ret+1] = "<br />%s.%s.%s+=<strong>%s</strong>"
%{ r, s, o, util.pcdata(v[i]) }
end
else
ret[#ret+1] = "<br />%s.%s.%s=<strong>%s</strong>"
%{ r, s, o, util.pcdata(v) }
end
end
end
ret[#ret+1] = "</ins><br />"
@ -49,8 +58,20 @@ $Id$
ret[#ret+1] = "<var>%s.%s<br />" %{ r, s }
for o, v in util.kspairs(os) do
if o:sub(1,1) ~= "." then
if v and v ~= "" then
ret[#ret+1] = "<ins>%s.%s.%s=<strong>%s</strong><br /></ins>" %{ r, s, o, util.pcdata(v) }
if v and #v > 0 then
ret[#ret+1] = "<ins>"
if type(v) == "table" then
local i
for i = 1, #v do
ret[#ret+1] = "%s.%s.%s+=<strong>%s</strong><br />"
%{ r, s, o, util.pcdata(v[i]) }
end
else
ret[#ret+1] = "%s.%s.%s=<strong>%s</strong><br />"
%{ r, s, o, util.pcdata(v) }
end
ret[#ret+1] = "</ins>"
else
ret[#ret+1] = "<del>%s.%s.<strong>%s</strong><br /></del>" %{ r, s, o }
end