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

14 files changed, 78 insertions, 42 deletions

diff --git a/cron-listjobs-html.lsp b/cron-listjobs-html.lsp
index bc7564e..11b0669 100644
--- a/cron-listjobs-html.lsp
+++ b/cron-listjobs-html.lsp
@@ -32,8 +32,8 @@
 end %>
 
 <%
-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})
 local period = cfe({type="select", option={}})
 for i,tabl in ipairs(view.value) do
@@ -41,7 +41,7 @@ for i,tabl in ipairs(view.value) do
 end
 %>
 <% for i,tabl in ipairs(view.value) do %>
-<% htmlviewfunctions.displayheader(cfe({label=tabl.period}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label=tabl.period}), page_info, header_level2) %>
 	<% if #tabl.jobs == 0 then %>
 <p>No jobs</p>
 	<% else %>
@@ -61,13 +61,16 @@ end
 			<% htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="Delete", action="deletejob" }), -1, page_info) %>
 		</td><td>
 			<% period.value = tabl.period %>
+			<% period.id = string.gsub(job, "^.*/", "").."period" %>
 			<% htmlviewfunctions.displayitem(cfe({type="form", value={name=name, period=period}, label="", option="Move", action="movejob" }), -1, page_info) %>
 		</td>
 	</tr>
 		<% end %>
 </tbody></table>
 	<% end %>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 <% end %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
 
 <% if viewlibrary.check_permission("createjob") then
 	viewlibrary.dispatch_component("createjob")
diff --git a/health-network-html.lsp b/health-network-html.lsp
index fb9799c..57fa00f 100644
--- a/health-network-html.lsp
+++ b/health-network-html.lsp
@@ -3,17 +3,22 @@
 <% html = require("acf.html") %>
 
 <%
-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)
 %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Interface status"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Interface status"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.interfaces.value) %></pre>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Routes"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Routes"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.routes.value) %></pre>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
 <% if view.value.tunnel.value ~= "" then %>
-<% htmlviewfunctions.displayheader(cfe({label="Tunnels"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Tunnels"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.tunnel.value) %></pre>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 <% end %>
+
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/health-networkstats-html.lsp b/health-networkstats-html.lsp
index d04163a..16956d3 100644
--- a/health-networkstats-html.lsp
+++ b/health-networkstats-html.lsp
@@ -142,7 +142,7 @@
 	});
 </script>
 
-<% htmlviewfunctions.displayheader(view, page_info) %>
+<% local header_level = htmlviewfunctions.displaysectionstart(view, page_info) %>
 <p>Network traffic in bytes/second</p>
 <div id="chart" style="width:680px; height:300px;"></div>
 
@@ -177,3 +177,5 @@ Start / Stop
 <% end %>
 </table>
 <% --]] %>
+
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/health-proc-html.lsp b/health-proc-html.lsp
index dbf2bf4..b2c47ce 100644
--- a/health-proc-html.lsp
+++ b/health-proc-html.lsp
@@ -3,12 +3,16 @@
 <% html = require("acf.html") %>
 
 <%
-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)
 %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Processor"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Processor"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.processor.value) %></pre>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Memory"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Memory"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.memory.value) %></pre>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
+
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/health-storage-html.lsp b/health-storage-html.lsp
index 2335132..7608f2f 100644
--- a/health-storage-html.lsp
+++ b/health-storage-html.lsp
@@ -32,11 +32,11 @@ io.write("</table>\n")
 end %>
 
 <%
-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)
 %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Floppy capacity"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Floppy capacity"}), page_info, header_level2) %>
 <% if (view.value.floppy) then
 for name,floppy in pairs(view.value.floppy.value) do
 	displaydisk(floppy, name)
@@ -44,8 +44,9 @@ end
 else %>
 <p>No Floppy mounted</p>
 <% end %>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Harddrive capacity"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Harddrive capacity"}), page_info, header_level2) %>
 <% if (view.value.hd) then 
 for name,hd in pairs(view.value.hd.value) do
 	displaydisk(hd, name)
@@ -53,8 +54,9 @@ end
 else %>
 <p>No Harddrive mounted</p>
 <% end %>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
-<% htmlviewfunctions.displayheader(cfe({label="RAM Disk capacity"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="RAM Disk capacity"}), page_info, header_level2) %>
 <% if (view.value.ramdisk) then 
 for name,ramdisk in pairs(view.value.ramdisk.value) do
 	displaydisk(ramdisk, name)
@@ -62,9 +64,12 @@ end
 else %>
 <p>No RAM Disk mounted</p>
 <% end %>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
 <% if view.value.partitions then %>
-<% htmlviewfunctions.displayheader(cfe({label="Disk partitions"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Disk partitions"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.partitions.value) %></pre>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 <% end %>
 
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/health-system-html.lsp b/health-system-html.lsp
index 8688771..804cb1d 100644
--- a/health-system-html.lsp
+++ b/health-system-html.lsp
@@ -3,22 +3,25 @@
 <% html = require("acf.html") %>
 
 <%
-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)
 %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Versions and names"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Versions and names"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.version.value) %></pre>
 <pre><%= html.html_escape(view.value.uname.value) %></pre>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Uptime"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Uptime"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.uptime.value) %></pre>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Time/TimeZone"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Time/TimeZone"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.date.value) %></pre>
 <pre><%= html.html_escape(view.value.timezone.value) %></pre>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
-<% htmlviewfunctions.displayheader(cfe({label="Memory"}), page_info, header_level) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Memory"}), page_info, header_level2) %>
 <pre><%= html.html_escape(view.value.memory.value) %></pre>
 
 <%
@@ -59,3 +62,7 @@ end
 		<td><b>=Free</b></td>
 	</tr>
 </table>
+
+<% htmlviewfunctions.displaysectionend(header_level2) %>
+
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/hostname-read-html.lsp b/hostname-read-html.lsp
index 233d664..e4d9c7d 100644
--- a/hostname-read-html.lsp
+++ b/hostname-read-html.lsp
@@ -1,5 +1,6 @@
 <% local view, viewlibrary, page_info, session = ... %>
 <% htmlviewfunctions = require("htmlviewfunctions") %>
 
-<% htmlviewfunctions.displayheader(view, page_info) %>
+<% local header_level = htmlviewfunctions.displaysectionstart(view, page_info) %>
 <% htmlviewfunctions.displayitem(view) %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/interfaces-read-html.lsp b/interfaces-read-html.lsp
index a9150e6..e3e60d2 100644
--- a/interfaces-read-html.lsp
+++ b/interfaces-read-html.lsp
@@ -20,7 +20,7 @@ html = require("acf.html")
 end %>
 
 <% local redir = cfe({type="hidden", value=page_info.orig_action}) %>
-<% htmlviewfunctions.displayheader(view, page_info) %>
+<% local header_level = htmlviewfunctions.displaysectionstart(view, page_info) %>
 <% for i,entry in ipairs(view.value) do
 	local interface = entry.value
 	htmlviewfunctions.displayitemstart()
@@ -58,6 +58,7 @@ end %>
 	</table>
 	<% htmlviewfunctions.displayitemend() %>
 <% end %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("restart")
diff --git a/interfaces-status-html.lsp b/interfaces-status-html.lsp
index 18ce7f2..81fc5aa 100644
--- a/interfaces-status-html.lsp
+++ b/interfaces-status-html.lsp
@@ -2,11 +2,12 @@
 <% htmlviewfunctions = require("htmlviewfunctions") %>
 
 <% 
-htmlviewfunctions.displayheader(view, page_info)
+local header_level = htmlviewfunctions.displaysectionstart(view, page_info)
 htmlviewfunctions.displayitem(view.value.filename)
 htmlviewfunctions.displayitem(view.value.ipaddr)
 htmlviewfunctions.displayitem(view.value.iproute)
 if view.value.iptunnel.value ~= "" then
 	htmlviewfunctions.displayitem(view.value.iptunnel)
 end
+htmlviewfunctions.displaysectionend(header_level)
 %>
diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp
index 6d56009..0345d8e 100644
--- a/logfiles-status-html.lsp
+++ b/logfiles-status-html.lsp
@@ -40,7 +40,7 @@ end
 	
 <% htmlviewfunctions.displaycommandresults({"delete"}, session) %>
 
-<% htmlviewfunctions.displayheader(view, page_info) %>
+<% local header_level = htmlviewfunctions.displaysectionstart(view, page_info) %>
 <table id="list" class="tablesorter"><thead>
 	<tr>
 	<% if viewlibrary.check_permission("delete") then %>
@@ -77,3 +77,4 @@ end
 	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/logfiles-tail-html.lsp b/logfiles-tail-html.lsp
index c8e663b..c147f8a 100644
--- a/logfiles-tail-html.lsp
+++ b/logfiles-tail-html.lsp
@@ -67,7 +67,7 @@
 </script>
 
 <% 
-htmlviewfunctions.displayheader(form, page_info)
+local header_level = htmlviewfunctions.displaysectionstart(form, page_info)
 htmlviewfunctions.displayitem(form.value.filename)
 htmlviewfunctions.displayitem(form.value.filesize)
 if form.value.grep.value ~= "" then
@@ -83,3 +83,4 @@ Start / Stop tailing file
 <input type="button" id="Start" value="Start" onClick='$("#errtxt").empty(); started=true; Update(); $("#Start").attr("disabled","disabled");$("#Stop").removeAttr("disabled");'>
 <input type="button" id="Stop" value="Stop" onClick='started=false; window.clearTimeout(ID); $("#Stop").attr("disabled","disabled");$("#Start").removeAttr("disabled");'>
 <% htmlviewfunctions.displayitemend() %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/modules-status-html.lsp b/modules-status-html.lsp
index e70dee1..871202e 100644
--- a/modules-status-html.lsp
+++ b/modules-status-html.lsp
@@ -3,7 +3,11 @@
 <% html = require("acf.html") %>
 
 <%
-local header_level = htmlviewfunctions.displayheader(cfe({label="Modules"}), page_info)
-htmlviewfunctions.displayheader(cfe({label="Installed modules"}), page_info, htmlviewfunctions.incrementheader(header_level))
+local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Modules"}), page_info)
+local header_level2 = htmlviewfunctions.displaysectionstart(cfe({label="Installed modules"}), page_info, htmlviewfunctions.incrementheader(header_level))
 %>
 <pre><%= html.html_escape(view.value) %></pre>
+<%
+htmlviewfunctions.displaysectionend(header_level2)
+htmlviewfunctions.displaysectionend(header_level)
+%>
diff --git a/rc-status-html.lsp b/rc-status-html.lsp
index c787234..a586700 100644
--- a/rc-status-html.lsp
+++ b/rc-status-html.lsp
@@ -22,7 +22,7 @@
 
 <% htmlviewfunctions.displaycommandresults({"edit", "startstop"}, session) %>
 
-<% htmlviewfunctions.displayheader(view, page_info) %>
+<% local header_level = htmlviewfunctions.displaysectionstart(view, page_info) %>
 <table id="list" class="tablesorter"><thead>
 <tr>
 <% if viewlibrary.check_permission("edit") then %>
@@ -58,3 +58,4 @@ for i,item in ipairs(view.value) do %>
 	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/syslog-config-html.lsp b/syslog-config-html.lsp
index f89af21..7ad6e78 100644
--- a/syslog-config-html.lsp
+++ b/syslog-config-html.lsp
@@ -6,24 +6,24 @@
 end %>
 
 <%
-local header_level = htmlviewfunctions.displayheader(form, page_info)
-header_level = htmlviewfunctions.incrementheader(header_level)
-
-htmlviewfunctions.displayheader(cfe({label="Advanced Configuration"}), page_info, header_level)
-header_level = htmlviewfunctions.incrementheader(header_level)
+local header_level = htmlviewfunctions.displaysectionstart(form, page_info)
+local header_level2 = htmlviewfunctions.incrementheader(header_level)
 
 form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
 htmlviewfunctions.displayformstart(form)
-htmlviewfunctions.displayheader(cfe({label="General"}), page_info, header_level)
+htmlviewfunctions.displaysectionstart(cfe({label="General"}), page_info, header_level2)
 	htmlviewfunctions.displayformitem(form.value.logfile, "logfile")
 	htmlviewfunctions.displayformitem(form.value.loglevel, "loglevel")
 	htmlviewfunctions.displayformitem(form.value.smallerlogs, "smallerlogs")
-htmlviewfunctions.displayheader(cfe({label="Log Rotate"}), page_info, header_level)
+htmlviewfunctions.displaysectionend(header_level2)
+htmlviewfunctions.displaysectionstart(cfe({label="Log Rotate"}), page_info, header_level2)
 	htmlviewfunctions.displayformitem(form.value.maxsize, "maxsize")
 	htmlviewfunctions.displayformitem(form.value.numrotate, "numrotate")
-htmlviewfunctions.displayheader(cfe({label="Remote Logging"}), page_info, header_level)
+htmlviewfunctions.displaysectionend(header_level2)
+htmlviewfunctions.displaysectionstart(cfe({label="Remote Logging"}), page_info, header_level2)
 	htmlviewfunctions.displayformitem(form.value.localandnetworklog, "localandnetworklog")
 	htmlviewfunctions.displayformitem(form.value.remotelogging, "remotelogging")
-htmlviewfunctions.displayheader(cfe({label="Save and Apply Above Settings"}), page_info, header_level)
+htmlviewfunctions.displaysectionend(header_level2)
 htmlviewfunctions.displayformend(form)
+htmlviewfunctions.displaysectionend(header_level)
 %>