Convert listfiles HTML view back to older style to match acf-core-0.17

1 files changed, 10 insertions, 27 deletions

diff --git a/freeradius3-listfiles-html.lsp b/freeradius3-listfiles-html.lsp
index 8fb4f33..118ab04 100644
--- a/freeradius3-listfiles-html.lsp
+++ b/freeradius3-listfiles-html.lsp
@@ -3,20 +3,6 @@ htmlviewfunctions = require("htmlviewfunctions")
 html = require("acf.html")
 %>
 
-<%
-function convertsize(size)
-	if string.find(size, "k$") then
-		return tonumber(string.match(size, "[%d.]*")) * 1024.0
-	elseif string.find(size, "M$") then
-		return tonumber(string.match(size, "[%d.]*")) * 1024.0 * 1024.0
-	elseif string.find(size, "G$") then
-		return tonumber(string.match(size, "[%d.]*")) + 1024.0 * 1024.0 * 1024.0
-	else
-		return tonumber(string.match(size, "[%d.]*"))
-	end
-end
-%>
-
 <script type="text/javascript">
 	if (typeof jQuery == 'undefined') {
 		document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>');
@@ -32,7 +18,6 @@ end
 <script type="text/javascript">
 	$(document).ready(function() {
 		$("#list").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']});
-		$(".deletefile").click(function(){ return confirm("Are you sure you want to delete this file?")});
 	});
 </script>
 
@@ -43,8 +28,8 @@ end
 	viewlibrary.dispatch_component("status")
 end %>
 
-<% local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Configuration"}), page_info) %>
-<table id="list" class="tablesorter"><thead>
+<h1>Configuration</h1>
+<dl><table id="list" class="tablesorter"><thead>
 	<tr>
 		<th>Action</th>
 		<th>File</th>
@@ -52,29 +37,27 @@ end %>
 		<th>Last Modified</th>
 	</tr>
 </thead><tbody>
-<% local filename = cfe({ type="hidden", value="" }) %>
-<% local redir = cfe({ type="hidden", value=page_info.orig_action }) %>
 <% for k,v in ipairs( view.value ) do %>
 	<tr>
 		<td>
-		<% filename.value = v.filename %>
 		<% if viewlibrary.check_permission("editfile") then %>
-			<% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="", option="Edit", action="editfile"}), page_info, -1) %>
+			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/editfile?filename="..v.filename.."&redir="..page_info.orig_action, label="Edit "} %>
 		<% end %>
 		<% if viewlibrary.check_permission("deletefile") then %>
-			<% htmlviewfunctions.displayitem(cfe({type="form", value={filename=filename}, label="", option="Delete", action="deletefile", class="deletefile"}), page_info, -1) %>
+			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deletefile?submit=true&filename="..v.filename, label="Delete "} %>
 		<% end %>
 		</td>
                 <td><%= html.html_escape(v.filename) %></td>
-                <td><span class="hide"><%= convertsize(v.size) %>b</span><%= html.html_escape(v.size) %></td>
+                <td><span class="hide"><%= html.html_escape(v.orig_size) %>b</span><%= html.html_escape(v.size) %></td>
                 <td><%= html.html_escape(v.mtime) %></td>
 	</tr>
 <% end %>
-</tbody></table>
+</tbody></table></dl>
 
 <% if viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("createfile") then
-        local createform = viewlibrary.dispatch_component("createfile", nil, true)
+        local createform = viewlibrary.dispatch_component("createfile", nil, true) %>
+<H2><%= html.html_escape(createform.label) %></H2>
+<%
         createform.action = page_info.script .. page_info.prefix .. page_info.controller .. "/createfile"
-	htmlviewfunctions.displayitem(createform, page_info, htmlviewfunctions.incrementheader(header_level))
+	htmlviewfunctions.displayform(createform)
 end %>
-<% htmlviewfunctions.displaysectionend(header_level) %>