modules/admin-full: prepare uci changelog template for revised libuci-lua changelog...

[project/luci.git] / modules / admin-full / luasrc / view / admin_uci / changelog.htm

diff --git a/modules/admin-full/luasrc/view/admin_uci/changelog.htm b/modules/admin-full/luasrc/view/admin_uci/changelog.htm
index 13bbdff..e195bef 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_uci/changelog.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/changelog.htm
@@ -16,10 +16,10 @@ $Id$
 <fieldset class="cbi-section">
        <strong><%:Legend:%></strong>
        <div class="uci-change-legend">
-               <div class="uci-change-legend-label"><ins>&nbsp;</ins> <%:Section added%></div>
-               <div class="uci-change-legend-label"><del>&nbsp;</del> <%:Section removed%></div>
-               <div class="uci-change-legend-label"><var><ins>&nbsp;</ins></var> <%:Option changed%></div>
-               <div class="uci-change-legend-label"><var><del>&nbsp;</del></var> <%:Option removed%></div>
+               <div class="uci-change-legend-label"><ins>&#160;</ins> <%:Section added%></div>
+               <div class="uci-change-legend-label"><del>&#160;</del> <%:Section removed%></div>
+               <div class="uci-change-legend-label"><var><ins>&#160;</ins></var> <%:Option changed%></div>
+               <div class="uci-change-legend-label"><var><del>&#160;</del></var> <%:Option removed%></div>
                <br style="clear:both" />
        </div>
        <br />
@@ -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