Changes to use new htmlviewfunctions functions

1 files changed, 14 insertions, 14 deletions

diff --git a/openvpn-listcerts-html.lsp b/openvpn-listcerts-html.lsp
index 74cc45c..ece24fb 100644
--- a/openvpn-listcerts-html.lsp
+++ b/openvpn-listcerts-html.lsp
@@ -16,43 +16,43 @@
 
 <script type="text/javascript">
 	$(document).ready(function() {
-		$("#list").tablesorter({widgets: ['zebra']});
+		$("#list").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']});
 	});
 </script>
 
 <% htmlviewfunctions.displaycommandresults({"deletecert", "generatedhparams"}, session) %>
 <% htmlviewfunctions.displaycommandresults({"uploadcert"}, session, true) %>
 
-<h1><%= html.html_escape(view.label) %></h1>
+<% local header_level = htmlviewfunctions.displaysectionstart(view, page_info) %>
 <table id="list" class="tablesorter"><thead>
 	<tr>
 		<th>Action</th>
 		<th>Certificate</th>
 	</tr>
 </thead><tbody>
-<% for i,cert in ipairs(view.value) do %>
+<% local cert = cfe({ type="hidden", value="" }) %>
+<% local redir = cfe({ type="hidden", value=page_info.orig_action }) %>
+<% for i,crt in ipairs(view.value) do %>
 	<tr>
 		<td>
-		<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deletecert?submit=true&cert="..cert.."&redir="..page_info.orig_action, label="Delete "} %>
-		<% if not string.find(cert, "%-key") then %>
-		<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/viewcert?cert="..cert.."&redir="..page_info.orig_action, label="View "} %>
+		<% cert.value = crt %>
+		<% htmlviewfunctions.displayitem(cfe({type="form", value={cert=cert}, label="", option="Delete", action="deletecert" }), page_info, -1) %>
+		<% if not string.find(crt, "%-key") then %>
+		<% htmlviewfunctions.displayitem(cfe({type="link", value={cert=cert, redir=redir}, label="", option="View", action="viewcert"}), page_info, -1) %>
 		<% end %>
 		</td>
-		<td><%= html.html_escape(cert) %></td>
+		<td><%= html.html_escape(crt) %></td>
 	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level) %>
 
 <% if viewlibrary.dispatch_component and viewlibrary.check_permission("uploadcert") then
 	viewlibrary.dispatch_component("uploadcert")
 end %>
 
 <% if viewlibrary.check_permission("generatedhparams") then %>
-<h1>Diffie Hellman Parameters</h1>
-<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/generatedhparams") %>">
-<div class='item'><p class='left'>Generate Diffie Hellman parameters</p>
-<div class='right'>
-<input class="submit" type="submit" name="submit" value="Generate">
-</div></div><!-- end .item -->
-</form>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Diffie Hellman Parameters"}), page_info, header_level) %>
+<% htmlviewfunctions.displayitem(cfe({type="form", value={}, label="Generate Diffie Hellman parameters", option="Generate", action="generatedhparams" }), page_info, 0) %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
 <% end %>