From 0f1a9c1d7a56b03579091d4b57acdebf8d4f48b1 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Thu, 10 Apr 2014 05:50:59 +0000
Subject: Changes to use new htmlviewfunctions functions

---
 dansguardian-general-html.lsp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'dansguardian-general-html.lsp')

diff --git a/dansguardian-general-html.lsp b/dansguardian-general-html.lsp
index f73473b..6cbaddc 100644
--- a/dansguardian-general-html.lsp
+++ b/dansguardian-general-html.lsp
@@ -1,22 +1,20 @@
-<% 
+<% local form, viewlibrary, page_info, session = ... 
 htmlviewfunctions = require("htmlviewfunctions")
-   local form, viewlibrary, page_info, session = ... 
 %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then 
 	viewlibrary.dispatch_component("status")
 end %>
 
-<h1>Configuration</h1>
+<% local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Configuration"}), page_info) %>
 <%
-	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
-	htmlviewfunctions.displayformstart(form)
+	htmlviewfunctions.displayformstart(form, page_info)
 	for field,val in pairs(form.value) do
 		val.name = field
 	end
 %>
 
-<h2>General</h2>
+<% local header_level2 = htmlviewfunctions.displaysectionstart(cfe({label="General"}), page_info, htmlviewfunctions.incrementheader(header_level)) %>
 <p>
 These parameters define the interface and port that Dansguardian uses to accept connections.
 </p>
@@ -26,7 +24,8 @@ These parameters define the interface and port that Dansguardian uses to accept
 	htmlviewfunctions.displayformitem(form.value.filterport)
 %>
 
-<h2>Proxy service</h2>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Proxy service"}), page_info, header_level2) %>
 <p>
 These parameters define the ip address and port that Dansguardian should forward requests on to.
 </p>
@@ -36,7 +35,8 @@ These parameters define the ip address and port that Dansguardian should forward
 	htmlviewfunctions.displayformitem(form.value.proxyport)
 %>
 
-<h2>Filter Actions</h2>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Filter Actions"}), page_info, header_level2) %>
 <p>
 These parameters define how sensitive the filter is, and where to redirect requests if the content filter 
 determines that the content is inappropriate. The "naughtynesslimit" is more sensitive the lower it is set. 
@@ -48,5 +48,6 @@ The author recommends 50 for "young children", 100 for "older children" and 160
 	htmlviewfunctions.displayformitem(form.value.naughtynesslimit)
 %>
 
-<h2>Save Changes</h2>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 <% htmlviewfunctions.displayformend(form) %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
-- 
cgit v1.2.3