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

---
 awall-listpolicies-html.lsp | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/awall-listpolicies-html.lsp b/awall-listpolicies-html.lsp
index 568fd9f..022a1f3 100644
--- a/awall-listpolicies-html.lsp
+++ b/awall-listpolicies-html.lsp
@@ -25,8 +25,8 @@ html = require("acf.html")
 <% htmlviewfunctions.displaycommandresults({"deletepolicy", "editpolicy", "viewpolicy", "enablepolicy", "disablepolicy", "startstop"}, session) %>
 <% htmlviewfunctions.displaycommandresults({"createpolicy"}, session, true) %>
 
-<h1>Policies</h1>
-<% if form.errtxt then %><p class='error'><%= string.gsub(html.html_escape(form.errtxt), "\n", "<br/>") %></p><% end %>
+<% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %>
+<% htmlviewfunctions.displayinfo(form) %>
 <table id="list" class="tablesorter"><thead>
 	<tr>
 		<th>Action</th>
@@ -35,15 +35,30 @@ html = require("acf.html")
 		<th>Description</th>
 	</tr>
 </thead><tbody>
+<% local filename = cfe({ type="hidden", value="" }) %>
+<% local name = cfe({ type="hidden", value="" }) %>
+<% local redir = cfe({ type="hidden", value=page_info.orig_action }) %>
 <% for i,pol in ipairs(form.value) do %>
 	<tr>
 		<td>
 			<%
-			if viewlibrary.check_permission("deletepolicy") and pol.editable and pol.status ~= "enabled" and pol.status ~= "required" then io.write(html.link{value = "deletepolicy?submit=true&filename=" .. pol.filename, label="Delete ", class="deletepolicy" }) end
-			if viewlibrary.check_permission("editpolicy") and pol.editable then io.write(html.link{value = "editpolicy?filename=" .. pol.filename.."&redir="..page_info.orig_action, label="Edit " }) end
-			if viewlibrary.check_permission("viewpolicy") and not pol.editable and pol.filename then io.write(html.link{value = "viewpolicy?filename=" .. pol.filename.."&redir="..page_info.orig_action, label="View " }) end
-			if viewlibrary.check_permission("enablepolicy") and (pol.status == "disabled" or pol.status == "required") then io.write(html.link{value = "enablepolicy?submit=true&name=" .. pol.name, label="Enable " }) end
-			if viewlibrary.check_permission("disablepolicy") and pol.status == "enabled" then io.write(html.link{value = "disablepolicy?submit=true&name=" .. pol.name, label="Disable " }) end
+			filename.value = pol.filename
+			name.value = pol.name
+			if viewlibrary.check_permission("deletepolicy") and pol.editable and pol.status ~= "enabled" and pol.status ~= "required" then
+				htmlviewfunctions.displayitem(cfe({type="form", value={filename=filename}, label="", option="Delete", action="deletepolicy"}), page_info, -1)
+			end
+			if viewlibrary.check_permission("editpolicy") and pol.editable then
+				htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="Edit", action="editpolicy"}), page_info, -1)
+			end
+			if viewlibrary.check_permission("viewpolicy") and not pol.editable and pol.filename then
+				htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="View", action="viewpolicy"}), page_info, -1)
+			end
+			if viewlibrary.check_permission("enablepolicy") and (pol.status == "disabled" or pol.status == "required") then
+				htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="Enable", action="enablepolicy"}), page_info, -1)
+			end
+			if viewlibrary.check_permission("disablepolicy") and pol.status == "enabled" then
+				htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="Disable", action="disablepolicy"}), page_info, -1)
+			end
 			%>
 		</td>
 		<td><%= html.html_escape(string.gsub(pol.status or "", "^%l", string.upper)) %></td>
@@ -52,6 +67,7 @@ html = require("acf.html")
 	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("createpolicy") then
 	viewlibrary.dispatch_component("createpolicy")
-- 
cgit v1.2.3