From 93c77ea98511b60546ae7af451597c97da9aef97 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 3 Mar 2014 16:58:54 +0000 Subject: Add incrementheader function to htmlviewfunctions --- lib/htmlviewfunctions.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/htmlviewfunctions.lua b/lib/htmlviewfunctions.lua index d0d7945..c6863cb 100644 --- a/lib/htmlviewfunctions.lua +++ b/lib/htmlviewfunctions.lua @@ -30,6 +30,14 @@ function mymodule.displayheader(myitem, page_info, header_level) return header_level end +function mymodule.incrementheader(header_level) + if 0 == header_level then + return header_level + else + return tonumber(header_level)+1 + end +end + function mymodule.displayinfo(myitem) if myitem.descr then io.write("

" .. string.gsub(html.html_escape(myitem.descr), "\n", "
") .. "

\n") end if myitem.default then io.write('

Default:' .. string.gsub(html.html_escape(getlabel(myitem, myitem.default)), "\n", "
") .. "

\n") end @@ -60,11 +68,7 @@ function mymodule.displayitem(myitem, header_level, page_info) end for x,name in ipairs(order) do if myitem.value[name] then - if 0 == header_level then - mymodule.displayitem(myitem.value[name], header_level) - else - mymodule.displayitem(myitem.value[name], tonumber(header_level)+1) - end + mymodule.displayitem(myitem.value[name], mymodule.incrementheader(header_level)) end end elseif myitem.type ~= "hidden" then @@ -101,11 +105,7 @@ function mymodule.displayformitem(myitem, name, viewtype, header_level, group) if myitem.type == "group" then header_level = mymodule.displayheader(myitem, page_info, header_level) mymodule.displayinfo(myitem) - if 0 == header_level then - mymodule.displayformcontents(myitem, nil, nil, header_level, myitem.name) - else - mymodule.displayformcontents(myitem, nil, nil, tonumber(header_level)+1, myitem.name) - end + mymodule.displayformcontents(myitem, nil, nil, mymodule.incrementheader(header_level), myitem.name) elseif myitem.type == "multi" then myitem.type = "select" myitem.multiple = "true" -- cgit v1.2.3