From a15984cf2eacb65eed22a39cacc9641a7b39032a Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Fri, 25 Apr 2014 07:00:06 +0000
Subject: Changes to use new htmlviewfunctions functions

---
 tinydns-listfiles-html.lsp | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'tinydns-listfiles-html.lsp')

diff --git a/tinydns-listfiles-html.lsp b/tinydns-listfiles-html.lsp
index 151a1e7..098b97a 100644
--- a/tinydns-listfiles-html.lsp
+++ b/tinydns-listfiles-html.lsp
@@ -38,8 +38,10 @@ end
 <% htmlviewfunctions.displaycommandresults({"delete", "edit", "editfile"}, session) %>
 <% htmlviewfunctions.displaycommandresults({"newfile", "startstop"}, session, true) %>
 
-<h1>Configuration</h1>
-<h2>Edit/View Existing Domains</h2>
+<%
+local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Configuration"}), page_info)
+local header_level2 = htmlviewfunctions.displaysectionstart(cfe({label="Edit/View Existing Domains"}), page_info, htmlviewfunctions.incrementheader(header_level))
+%>
 <table id="list" class="tablesorter"><thead>
 	<tr>
 		<th>Action</th>
@@ -48,17 +50,26 @@ end
 		<th>File</th>
 	</tr>
 </thead><tbody>
+<% local filename = cfe({ type="hidden", value="" }) %>
+<% local redir = cfe({ type="hidden", value=page_info.orig_action }) %>
 <% for i,file in ipairs(form.value) do %>
 	<tr>
 		<td>
 			<%
-			if viewlibrary.check_permission("delete") then io.write(html.link{value = "delete?submit=true&filename=" .. file.value.filename.value, label="Delete " }) end
-			io.write(html.link{value = "view?filename=" .. file.value.filename.value, label="View " })
-			if viewlibrary.check_permission("edit") then io.write(html.link{value = "edit?filename=" .. file.value.filename.value.."&redir="..page_info.orig_action, label="Edit " }) end
-			if viewlibrary.check_permission("editfile") then io.write(html.link{value = "editfile?filename=" .. file.value.filename.value.."&redir="..page_info.orig_action, label="Expert " }) end
+			filename.value = file.value.filename.value
+			htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename}, label="", option="View", action="view"}), page_info, -1)
+			if viewlibrary.check_permission("edit") then
+				htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="Edit", action="edit"}), page_info, -1)
+			end
+			if viewlibrary.check_permission("editfile") then
+				htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="Expert", action="editfile"}), page_info, -1)
+			end
+			if viewlibrary.check_permission("delete") then
+				htmlviewfunctions.displayitem(cfe({type="form", value={filename=filename}, label="", option="Delete", action="delete"}), page_info, -1)
+			end
 			%>
 		</td>
-		<td><span style="display:none"><%= convertsize(file.value.filesize.value) %>b</span><%= html.html_escape(file.value.filesize.value) %></td>
+		<td><span class="hide"><%= convertsize(file.value.filesize.value) %>b</span><%= html.html_escape(file.value.filesize.value) %></td>
 		<td><%= html.html_escape(file.value.mtime.value) %></td>
 		<td><%= html.html_escape(string.gsub(file.value.filename.value, "^.*/", "")) %></td>
 	</tr>
@@ -67,13 +78,14 @@ end
 <% if #form.value == 0 then %>
 	No domains defined
 <% end %>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("newfile") then
-	local newfileform = viewlibrary.dispatch_component("newfile", nil, true) %>
-<h2>Create New Domain</h2>
-<%
+	local newfileform = viewlibrary.dispatch_component("newfile", nil, true)
 	newfileform.action = page_info.script .. page_info.prefix .. page_info.controller .. "/newfile"
-	htmlviewfunctions.displayform(newfileform)
+	newfileform.label = "Create New Domain"
+	htmlviewfunctions.displayitem(newfileform, page_info, header_level2)
 end %>
 
 <% if viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("startstop") then
-- 
cgit v1.2.3