Change htmlviewfunctions.displayheader to .displaysectionstart and added .displaysectionend function

10 files changed, 86 insertions, 44 deletions

diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index cdb589d..91a2ea2 100644
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -5,12 +5,12 @@
 <% htmlviewfunctions.displaycommandresults({"newuser", "edituser", "deleteuser"}, session) %>
 
 <%
-local header_level = htmlviewfunctions.displayheader(form, page_info)
-header_level = htmlviewfunctions.incrementheader(header_level)
+local header_level = htmlviewfunctions.displaysectionstart(form, page_info)
+local header_level2 = htmlviewfunctions.incrementheader(header_level)
 local redir = cfe({ type="hidden", value=page_info.orig_action })
-htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Account", option="Create", action="newuser" }), header_level, page_info)
+htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Account", option="Create", action="newuser" }), header_level2, page_info)
 
-htmlviewfunctions.displayheader(cfe({label="Existing Accounts"}), page_info, header_level)
+htmlviewfunctions.displaysectionstart(cfe({label="Existing Accounts"}), page_info, header_level2)
 for i,user in ipairs(form.value) do
 	local name = html.html_escape(user.value.userid.value)
 	htmlviewfunctions.displayitemstart() %>
@@ -36,5 +36,9 @@ for i,user in ipairs(form.value) do
 			</td>
 		</tr>
 	</tbody></table>
-	<% htmlviewfunctions.displayitemend() %>
-<% end %>
+<%
+	htmlviewfunctions.displayitemend()
+end
+htmlviewfunctions.displaysectionend(header_level2)
+htmlviewfunctions.displaysectionend(header_level)
+%>
diff --git a/app/acf-util/roles-read-html.lsp b/app/acf-util/roles-read-html.lsp
index 2f4851d..87772b7 100644
--- a/app/acf-util/roles-read-html.lsp
+++ b/app/acf-util/roles-read-html.lsp
@@ -21,21 +21,23 @@
 </script>
 
 <%
-local header_level = htmlviewfunctions.displayheader(view, page_info)
+local header_level = htmlviewfunctions.displaysectionstart(view, page_info)
+local header_level2 = htmlviewfunctions.incrementheader(header_level)
 %>
 
 <% if view.value.roles then
-	htmlviewfunctions.displayheader(cfe({label=view.value.userid.value.." is valid in these roles"}), page_info, htmlviewfunctions.incrementheader(header_level))
+	htmlviewfunctions.displaysectionstart(cfe({label=view.value.userid.value.." is valid in these roles"}), page_info, header_level2)
 	for a,b in pairs(view.value.roles.value) do
 		print("<p>",html.html_escape(b),"</p>")
 	end
+	htmlviewfunctions.displaysectionend(header_level2)
 end %>
 
 <% if view.value.permissions then
 	if view.value.userid then
-		htmlviewfunctions.displayheader(cfe({label=view.value.userid.value.."'s full permissions are"}), page_info, htmlviewfunctions.incrementheader(header_level))
+		htmlviewfunctions.displaysectionstart(cfe({label=view.value.userid.value.."'s full permissions are"}), page_info, header_level2)
 	elseif view.value.role then
-		htmlviewfunctions.displayheader(cfe({label=view.value.role.value.."'s full permissions are"}), page_info, htmlviewfunctions.incrementheader(header_level))
+		htmlviewfunctions.displaysectionstart(cfe({label=view.value.role.value.."'s full permissions are"}), page_info, header_level2)
 	end
 %>
 	<table id="permissions" class="tablesorter"><thead>
@@ -70,4 +72,10 @@ end %>
 		end
 		%>
 	</tbody></table>
-<% end %>
+<%	
+	if view.value.userid or view.value.role then
+		htmlviewfunctions.displaysectionend(header_level2)
+	end
+end
+htmlviewfunctions.displaysectionend(header_level)
+%>
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index 32593a4..b9b917e 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -23,12 +23,12 @@
 <% htmlviewfunctions.displaycommandresults({"newrole", "editrole", "deleterole"}, session) %>
 
 <%
-local header_level = htmlviewfunctions.displayheader(view, page_info)
-header_level = htmlviewfunctions.incrementheader(header_level)
+local header_level = htmlviewfunctions.displaysectionstart(view, page_info)
+local header_level2 = htmlviewfunctions.incrementheader(header_level)
 local redir = cfe({ type="hidden", value=page_info.orig_action })
-htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Role", option="Create", action="newrole" }), header_level, page_info)
+htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Role", option="Create", action="newrole" }), header_level2, page_info)
 
-htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, header_level)
+htmlviewfunctions.displaysectionstart(cfe({label="Existing Roles"}), page_info, header_level2)
 %>
 <table id="list" class="tablesorter"><thead>
 	<tr><th>Role</th><th>Action</th></tr>
@@ -59,3 +59,7 @@ htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, header
 	<% end %>
 <% end %>
 </tbody></table>
+<%
+htmlviewfunctions.displaysectionend(header_level2)
+htmlviewfunctions.displaysectionend(header_level)
+%>
diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp
index 8c3a96d..b83bc7e 100644
--- a/app/acf-util/welcome-html.lsp
+++ b/app/acf-util/welcome-html.lsp
@@ -1,7 +1,7 @@
 <% local view, viewlibrary, page_info, session = ... %>
 <% htmlviewfunctions = require("htmlviewfunctions") %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Alpine Configuration Framework"}), page_info) %>
+<% local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Alpine Configuration Framework"}), page_info) %>
 <p>Welcome.</p>
 
 <% --[[
@@ -9,3 +9,4 @@
 	io.write(htmlviewfunctions.cfe_unpack(FORM))
 	io.write(htmlviewfunctions.cfe_unpack(ENV))
 --]] %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/app/debug-html.lsp b/app/debug-html.lsp
index 32f82d2..b1e5493 100644
--- a/app/debug-html.lsp
+++ b/app/debug-html.lsp
@@ -2,15 +2,20 @@
 <% htmlviewfunctions = require("htmlviewfunctions") %>
 
 <%
-local header_level = htmlviewfunctions.displayheader(cfe({label="Debugging"}), page_info)
-header_level = htmlviewfunctions.incrementheader(header_level)
+local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Debugging"}), page_info)
+local header_level2 = htmlviewfunctions.incrementheader(header_level)
 
-htmlviewfunctions.displayheader(cfe({label="View Data:"}), page_info, header_level)
+htmlviewfunctions.displaysectionstart(cfe({label="View Data:"}), page_info, header_level2)
 io.write(htmlviewfunctions.cfe_unpack(data))
+htmlviewfunctions.displaysectionend(header_level2)
 
-htmlviewfunctions.displayheader(cfe({label="Session:"}), page_info, header_level)
+htmlviewfunctions.displaysectionstart(cfe({label="Session:"}), page_info, header_level2)
 io.write(htmlviewfunctions.cfe_unpack(session))
+htmlviewfunctions.displaysectionend(header_level2)
 
-htmlviewfunctions.displayheader(cfe({label="Page Info:"}), page_info, header_level)
+htmlviewfunctions.displaysectionstart(cfe({label="Page Info:"}), page_info, header_level2)
 io.write(htmlviewfunctions.cfe_unpack(page_info))
+htmlviewfunctions.displaysectionend(header_level2)
+
+htmlviewfunctions.displaysectionend(header_level)
 %>
diff --git a/app/dispatcherror-html.lsp b/app/dispatcherror-html.lsp
index fc8d4c5..208a467 100644
--- a/app/dispatcherror-html.lsp
+++ b/app/dispatcherror-html.lsp
@@ -29,6 +29,7 @@
 	});
 </script>
 
-<% htmlviewfunctions.displayheader(cfe({label="Alpine Configuration Framework"}), page_info) %>
+<% local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Alpine Configuration Framework"}), page_info) %>
 <p class="errordetail">Dispatch error occured</p>
 <p class="hiddendetail">'<%= html.html_escape(view.controller) %>' does not have a '<%= html.html_escape(view.action) %>' action.</p>
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/app/exception-html.lsp b/app/exception-html.lsp
index 887cef2..5a00ed1 100644
--- a/app/exception-html.lsp
+++ b/app/exception-html.lsp
@@ -29,6 +29,7 @@
 	});
 </script>
 
-<% htmlviewfunctions.displayheader(cfe({label="Alpine Configuration Framework"}), page_info) %>
+<% local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Alpine Configuration Framework"}), page_info) %>
 <p class="errordetail">Application error occured</p>
 <p class="hiddendetail"><%= html.html_escape(view.message) %></p>
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/app/filedetails-html.lsp b/app/filedetails-html.lsp
index fd0d8dd..0883a58 100644
--- a/app/filedetails-html.lsp
+++ b/app/filedetails-html.lsp
@@ -3,27 +3,25 @@
 <% html = require("acf.html") %>
 
 <%
-local header_level
+local header_level0, header_level, header_level2
 if form.type == "form" then
-	header_level = htmlviewfunctions.displayheader(cfe({label="Configuration"}), page_info)
-	header_level = htmlviewfunctions.displayheader(cfe({label="Expert Configuration"}), page_info, htmlviewfunctions.incrementheader(header_level))
+	header_level0 = htmlviewfunctions.displaysectionstart(cfe({label="Configuration"}), page_info)
+	header_level = htmlviewfunctions.displaysectionstart(cfe({label="Expert Configuration"}), page_info, htmlviewfunctions.incrementheader(header_level0))
 else
-	header_level = htmlviewfunctions.displayheader(cfe({label="View File"}), page_info)
+	header_level = htmlviewfunctions.displaysectionstart(cfe({label="View File"}), page_info)
 end
-header_level = htmlviewfunctions.displayheader(cfe({label="File Details"}), page_info, htmlviewfunctions.incrementheader(header_level))
-%>
+header_level2 = htmlviewfunctions.displaysectionstart(cfe({label="File Details"}), page_info, htmlviewfunctions.incrementheader(header_level))
 
-<% 
 htmlviewfunctions.displayitem(form.value.filename)
 htmlviewfunctions.displayitem(form.value.filesize)
 htmlviewfunctions.displayitem(form.value.mtime)
 if form.value.grep and form.value.grep.value and form.value.grep.value ~= "" then
 	htmlviewfunctions.displayitem(form.value.grep)
 end
-%>
 
-<%
-htmlviewfunctions.displayheader(cfe({label="File Content"}), page_info, header_level)
+htmlviewfunctions.displaysectionend(header_level2)
+
+htmlviewfunctions.displaysectionstart(cfe({label="File Content"}), page_info, header_level2)
 if form.type == "form" then
 	htmlviewfunctions.displayformstart(form, page_info)
 	form.value.filename.type = "hidden"
@@ -33,8 +31,16 @@ end
 <textarea name="filecontent">
 <%= html.html_escape(form.value.filecontent.value) %>
 </textarea>
-<% htmlviewfunctions.displayinfo(form.value.filecontent) %>
+<%
+htmlviewfunctions.displayinfo(form.value.filecontent)
 
-<% if form.type == "form" then %>
-<% htmlviewfunctions.displayformend(form) %>
-<% end %>
+if form.type == "form" then
+	htmlviewfunctions.displayformend(form)
+end
+htmlviewfunctions.displaysectionend(header_level2)
+
+htmlviewfunctions.displaysectionend(header_level)
+if form.type == "form" then
+	htmlviewfunctions.displaysectionend(header_level0)
+end
+%>
diff --git a/app/status-html.lsp b/app/status-html.lsp
index 6846dea..093d71c 100644
--- a/app/status-html.lsp
+++ b/app/status-html.lsp
@@ -7,7 +7,7 @@ html = require("acf.html")
 <% htmlviewfunctions.displaycommandresults({"startstop"}, session) %>
 
 <%
-htmlviewfunctions.displayheader(data, page_info)
+local header_level = htmlviewfunctions.displaysectionstart(data, page_info)
 htmlviewfunctions.displayitem(data.value.status)
 
 htmlviewfunctions.displayitem(data.value.version)
@@ -23,7 +23,9 @@ if not (data.value.version and data.value.version.errtxt) and data.value.autosta
 	autostart.value.servicename = cfe({ type="hidden", value=data.value.autostart.name })
 	autostart.value.redir = cfe({ type="hidden", value=page_info.orig_action })
 	htmlviewfunctions.displayitem(autostart, 0, page_info)	-- header_level 0 means display inline without header
-end %>
+end
+htmlviewfunctions.displaysectionend(header_level)
+%>
 
 <% if viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("startstop") then
 	viewlibrary.dispatch_component("startstop")
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("<h"..tostring(header_level)..">"..html.html_escape(myitem.label).."</h"..tostring(header_level)..">")
+		print("<div class='section"..tostring(header_level).."'>")
+		print("<h"..tostring(header_level)..">"..html.html_escape(myitem.label).."</h"..tostring(header_level)..">")
 	end
 	return header_level
 end
 
+function mymodule.displaysectionend(header_level)
+	if 0 < header_level then
+		print("</div> <!-- .section"..tostring(header_level).." -->")
+	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"