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

2 files changed, 26 insertions, 19 deletions

diff --git a/dansguardian-general-html.lsp b/dansguardian-general-html.lsp
index 717f1f0..f73473b 100644
--- a/dansguardian-general-html.lsp
+++ b/dansguardian-general-html.lsp
@@ -15,10 +15,8 @@ end %>
 		val.name = field
 	end
 %>
-</DL>
 
 <h2>General</h2>
-<dl>
 <p>
 These parameters define the interface and port that Dansguardian uses to accept connections.
 </p>
@@ -27,10 +25,8 @@ These parameters define the interface and port that Dansguardian uses to accept
 	htmlviewfunctions.displayformitem(form.value.filterip)
 	htmlviewfunctions.displayformitem(form.value.filterport)
 %>
-</dl>
 
 <h2>Proxy service</h2>
-<dl>
 <p>
 These parameters define the ip address and port that Dansguardian should forward requests on to.
 </p>
@@ -39,10 +35,8 @@ These parameters define the ip address and port that Dansguardian should forward
 	htmlviewfunctions.displayformitem(form.value.proxyip)
 	htmlviewfunctions.displayformitem(form.value.proxyport)
 %>
-</dl>
 
 <h2>Filter Actions</h2>
-<dl>
 <p>
 These parameters define how sensitive the filter is, and where to redirect requests if the content filter 
 determines that the content is inappropriate. The "naughtynesslimit" is more sensitive the lower it is set. 
@@ -53,9 +47,6 @@ The author recommends 50 for "young children", 100 for "older children" and 160
 	htmlviewfunctions.displayformitem(form.value.accessdeniedaddress)
 	htmlviewfunctions.displayformitem(form.value.naughtynesslimit)
 %>
-</dl>
 
 <h2>Save Changes</h2>
-<DL>
 <% htmlviewfunctions.displayformend(form) %>
-</DL>
diff --git a/dansguardian-listfiles-html.lsp b/dansguardian-listfiles-html.lsp
index aea8ecc..5339110 100644
--- a/dansguardian-listfiles-html.lsp
+++ b/dansguardian-listfiles-html.lsp
@@ -3,6 +3,24 @@ htmlviewfunctions = require("htmlviewfunctions")
 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() {
+		$("#list").tablesorter({widgets: ['zebra']});
+	});
+</script>
+
 <% htmlviewfunctions.displaycommandresults({"edit"}, session) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then 
@@ -10,18 +28,16 @@ html = require("acf.html")
 end %>
 
 <h1>Configuration</h1>
-<DL>
-<TABLE>
-	<TR style="background:#eee;font-weight:bold;">
-		<TD style="padding-right:20px;white-space:nowrap;text-align:left;" class="header">File</TD>
-		<TD style="padding-right:20px;white-space:nowrap;text-align:left;" class="header">Size</TD>
-		<TD style="white-space:nowrap;text-align:left;" class="header">Last Modified</TD>
-	</TR>		
-
+<table id="list" class="tablesorter"><thead>
+	<tr>
+		<th>File</th>
+		<th>Size</th>
+		<th>Last Modified</th>
+	</tr>		
+</thead><tbody>
 <%
    for k,v in ipairs( view.value ) do
       io.write( "<tr><td><a href=\"" .. html.html_escape(page_info.script .. page_info.prefix .. page_info.controller) .. "/edit?filename=" .. html.html_escape(v.filename) .. "&redir=" .. html.html_escape(page_info.orig_action) .. "\">" .. html.html_escape(v.filename) .. "</a></td><td>" .. html.html_escape(v.size) .."</td><td>" .. html.html_escape(v.mtime) .."</td></tr>\n" )
    end
 %>
-</TABLE>
-</DL>
+</tbody></table>