Cleanup HTML including removing DL/DT/DD, use tablesorter where possible, and use lowercase tags

1 files changed, 40 insertions, 22 deletions

diff --git a/rrdtool-listrrd-html.lsp b/rrdtool-listrrd-html.lsp
index 65a5ae5..c98f4a0 100644
--- a/rrdtool-listrrd-html.lsp
+++ b/rrdtool-listrrd-html.lsp
@@ -4,6 +4,24 @@ html = require("acf.html")
 %>
 
 <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>');
+	}
+</script>
+
+<script type="text/javascript">
+	if (typeof $.tablesorter == 'undefined') {
+		document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>');
+	}
+</script>
+
+<script type="text/javascript">
+	$(document).ready(function() {
+		$("#listrrd").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']});
+	});
+</script>
+
+<script type="text/javascript">
 function javascript_confirm_demo(formID,filename) {
 	var message = "Are you sure you want to remove '" + filename + "'?";
 	var return_value = confirm(message);
@@ -17,41 +35,41 @@ function javascript_confirm_demo(formID,filename) {
 
 <form id="confirmDisplay" action="#" onsubmit="return false"></form>
 
-<TABLE>
-	<TR style="background:#eee;font-weight:bold;">
-		<TD style="padding-right:20px;white-space:nowrap;text-align:left;" class="header">Action</TD>
-		<TD style="padding-right:20px;white-space:nowrap;text-align:right;" class="header">Size</TD>
-		<TD style="padding-right:20px;white-space:nowrap;text-align:left;" class="header">Last Modified</TD>
-		<TD style="white-space:nowrap;text-align:left;" class="header">File</TD>
-	</TR>		
+<table id="listrrd" class="tablesorter"><thead>
+	<tr>
+		<th>Action</th>
+		<th>Size</th>
+		<th>Last Modified</th>
+		<th>File</th>
+	</tr>
+</thead><tbody>
 <% for i,file in ipairs(form.value) do %>
-	<TR>
-		<TD style="padding-right:20px;white-space:nowrap;">
+	<tr>
+		<td>
 			<% if viewlibrary.check_permission("delete") then %>
-				<A STYLE="cursor: pointer;" onclick="javascript_confirm_demo('confirmDisplay','<% io.write(file.value.filename.value) %>')">Delete</A>
+				<a style="cursor: pointer;" onclick="javascript_confirm_demo('confirmDisplay','<% io.write(file.value.filename.value) %>')">Delete</a>
 			<% end %>
 			<%
 			io.write(html.link{value = "rrdinfo?filename=" .. file.value.filename.value, label="Info " })
 --			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
 			%>
-		</TD>
-		<TD style="padding-right:20px;white-space:nowrap;text-align:right;"><%= html.html_escape(file.value.filesize.value) %></TD>
-		<TD style="padding-right:20px;white-space:nowrap;"><%= html.html_escape(file.value.mtime.value) %></TD>
-		<TD style="white-space:nowrap;" width="90%"><%= html.html_escape(file.value.filename.value) %></TD>
-	</TR>
+		</td>
+		<td><%= html.html_escape(file.value.filesize.value) %></td>
+		<td><%= html.html_escape(file.value.mtime.value) %></td>
+		<td><%= html.html_escape(file.value.filename.value) %></td>
+	</tr>
 <% end %>
 
 	<% if viewlibrary.check_permission("createrrd") then %>
-	<TR>
-		<TD style="padding-right:20px;white-space:nowrap;">
+	<tr>
+		<td>
 			<% io.write(html.link{value = "createrrd", label="Create new DB " }) %>
-		</TD>
-		<TD>&nbsp;</TD><TD>&nbsp;</TD><TD>&nbsp;</TD>
-	</TR>
+		</td>
+		<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+	</tr>
 	<% end %>
-
-</TABLE>
+</tbody></table>
 
 <% if viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("newfile") then
 	local newfileform = viewlibrary.dispatch_component("newfile", nil, true) %>