From d051bf48fb53481082b12a6778e7c7863f1979ca Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 23 Apr 2014 16:12:07 +0000
Subject: Changes to use new htmlviewfunctions functions

---
 provisioning-listdevices-html.lsp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'provisioning-listdevices-html.lsp')

diff --git a/provisioning-listdevices-html.lsp b/provisioning-listdevices-html.lsp
index 84206aa..c511d1e 100644
--- a/provisioning-listdevices-html.lsp
+++ b/provisioning-listdevices-html.lsp
@@ -52,7 +52,7 @@ end
 table.sort(display)
 %>
 
-<h1>Devices</h1>
+<% local header_level = htmlviewfunctions.displaysectionstart(view, page_info) %>
 <table id="list" class="tablesorter"><thead>
 	<tr>
 		<th>Action</th>
@@ -62,22 +62,25 @@ table.sort(display)
 	<% end %>
 	</tr>		
 </thead><tbody>
+<% local device_id = cfe({ type="hidden", value="" }) %>
+<% local redir = cfe({ type="hidden", value=page_info.orig_action }) %>
 <% for k,v in ipairs( view.value ) do %>
 	<tr>
 		<td>
-		<% if viewlibrary.check_permission("deletedevice") then %>
-			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deletedevice?submit=true&device_id="..v.device_id, label="Delete ", class="deletedevice"} %>
-		<% end %>
+		<% device_id.value = v.device_id %>
 		<% if viewlibrary.check_permission("editdevice") then %>
-			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/editdevice?device_id="..v.device_id.."&redir="..page_info.orig_action, label="Edit "} %>
+			<% htmlviewfunctions.displayitem(cfe({type="link", value={device_id=device_id, redir=redir}, label="", option="Edit", action="editdevice"}), page_info, -1) %>
 		<% end %>
 		<% if viewlibrary.check_permission("overridedeviceparams") then %>
-			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/overridedeviceparams?device_id="..v.device_id.."&redir="..page_info.orig_action, label="Params "} %>
+			<% htmlviewfunctions.displayitem(cfe({type="link", value={device_id=device_id, redir=redir}, label="", option="Params", action="overridedeviceparams"}), page_info, -1) %>
 		<% elseif viewlibrary.check_permission("editdeviceparams") then %>
-			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/editdeviceparams?device_id="..v.device_id.."&redir="..page_info.orig_action, label="Params "} %>
+			<% htmlviewfunctions.displayitem(cfe({type="link", value={device_id=device_id, redir=redir}, label="", option="Params", action="editdeviceparams"}), page_info, -1) %>
 		<% end %>
 		<% if viewlibrary.check_permission("getdevicevalues") then %>
-			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/getdevicevalues?submit=true&id=device_id&value="..v.device_id.."&viewtype=templated", label="View "} %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={value=device_id, id=cfe({type="hidden", value="device_id"}), viewtype=cfe({type="hidden", value="templated"})}, label="", option="View", action="getdevicevalues"}), page_info, -1) %>
+		<% end %>
+		<% if viewlibrary.check_permission("deletedevice") then %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={device_id=device_id}, label="", option="Delete", action="deletedevice", class="deletedevice"}), page_info, -1) %>
 		<% end %>
 		</td>
 		<td><%= html.html_escape(v.device_id) %></td>
@@ -95,6 +98,7 @@ table.sort(display)
 <% if #view.value == 0 then %>
 <p>No devices found</p>
 <% end %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
 
 <% if page_info.action == "listdevices" and viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("createdevice") then
         viewlibrary.dispatch_component("createdevice")
-- 
cgit v1.2.3