From 0c5f445ce36bb8951ddb3ed3dffac0ae23b984d8 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 17 Mar 2014 16:20:12 +0000 Subject: Change htmlviewfunctions.displayheader to .displaysectionstart and added .displaysectionend function --- lib/htmlviewfunctions.lua | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'lib/htmlviewfunctions.lua') diff --git a/lib/htmlviewfunctions.lua b/lib/htmlviewfunctions.lua index 812eb95..f29210b 100644 --- a/lib/htmlviewfunctions.lua +++ b/lib/htmlviewfunctions.lua @@ -22,15 +22,22 @@ local function getlabel(myitem, value) return tostring(value) end -function mymodule.displayheader(myitem, page_info, header_level) +function mymodule.displaysectionstart(myitem, page_info, header_level) page_info = page_info or {} header_level = header_level or page_info.header_level or 1 if 0 < header_level then - io.write(""..html.html_escape(myitem.label).."") + print("
") + print(""..html.html_escape(myitem.label).."") end return header_level end +function mymodule.displaysectionend(header_level) + if 0 < header_level then + print("
") + end +end + function mymodule.incrementheader(header_level) if 0 >= header_level then return header_level @@ -86,10 +93,11 @@ function mymodule.displayitem(myitem, header_level, page_info) if not myitem then return end page_info = page_info or {} if myitem.type == "form" or myitem.type == "link" then - header_level = mymodule.displayheader(myitem, page_info, header_level) + header_level = mymodule.displaysectionstart(myitem, page_info, header_level) mymodule.displayform(myitem, nil, nil, page_info, header_level) + mymodule.displaysectionend(header_level) elseif myitem.type == "group" then - header_level = mymodule.displayheader(myitem, page_info, header_level) + header_level = mymodule.displaysectionstart(myitem, page_info, header_level) mymodule.displayinfo(myitem) local seqorder = {} local order = {} @@ -110,6 +118,7 @@ function mymodule.displayitem(myitem, header_level, page_info) mymodule.displayitem(myitem.value[name], mymodule.incrementheader(header_level)) end end + mymodule.displaysectionend(header_level) elseif myitem.type ~= "hidden" then if myitem.errtxt then myitem.class = "error" @@ -144,9 +153,10 @@ function mymodule.displayformitem(myitem, name, viewtype, header_level, group) myitem.disabled = "true" end if myitem.type == "group" then - header_level = mymodule.displayheader(myitem, nil, header_level) + header_level = mymodule.displaysectionstart(myitem, nil, header_level) mymodule.displayinfo(myitem) mymodule.displayformcontents(myitem, nil, nil, mymodule.incrementheader(header_level), myitem.name) + mymodule.displaysectionend(header_level) elseif myitem.type == "multi" then myitem.type = "select" myitem.multiple = "true" -- cgit v1.2.3