From 593eb28947e4aa7060d1570d43271d83e589fab3 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Mon, 3 Feb 2014 21:28:07 +0000
Subject: Cleanup HTML including removing DL/DT/DD, use tablesorter where
 possible, and use lowercase tags

---
 fetchmail-config-html.lsp      | 13 ++++-----
 fetchmail-listentries-html.lsp | 63 +++++++++++++++++++++++++++---------------
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/fetchmail-config-html.lsp b/fetchmail-config-html.lsp
index fc725c7..d23df93 100644
--- a/fetchmail-config-html.lsp
+++ b/fetchmail-config-html.lsp
@@ -8,15 +8,14 @@
 	viewlibrary.dispatch_component("status")
 end %>
 
-<H1>Global Settings</H1>
-
-<DL>
-<dt>Edit global settings</dt>
-<dd><form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/editconfig") %>" method="POST">
+<h1>Global Settings</h1>
+<div class='item'><p class='left'>Edit global settings</p>
+<div class='right'>
+<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/editconfig") %>" method="post">
 <input class="hidden" type="hidden"  name="redir"  value="<%= html.html_escape(page_info.orig_action) %>" >
 <input type=submit value="Edit" class="submit">
-</form></dd>
-</DL>
+</form>
+</div></div><!-- end .item -->
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("listentries")
diff --git a/fetchmail-listentries-html.lsp b/fetchmail-listentries-html.lsp
index b19f2ca..0e7e9c1 100644
--- a/fetchmail-listentries-html.lsp
+++ b/fetchmail-listentries-html.lsp
@@ -3,35 +3,54 @@ 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({headers: {0:{sorter: false}}, widgets: ['zebra']});
+	});
+</script>
+
 <% htmlviewfunctions.displaycommandresults({"editentry", "deleteentry", "createentry"}, session) %>
 
 <h1>Edit/View Fetchmail Entries</h1>
-<DL>
-<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:left;" class="header">Remote Host</TD>
-		<TD style="padding-right:20px;white-space:nowrap;text-align:left;" class="header">Enabled</TD>
-		<TD style="padding-right:20px;white-space:nowrap;text-align:left;" class="header">Method</TD>
-		<TD style="white-space:nowrap;text-align:left;" class="header">Remote Mailbox / Domain</TD>
-	</TR>		
+<table id="list" class="tablesorter"><thead>
+	<tr>
+		<th>Action</th>
+		<th>Remote Host</th>
+		<th>Enabled</th>
+		<th>Method</th>
+		<th>Remote Mailbox / Domain</th>
+	</tr>
+</thead><tbody>
 <% for i,entry in ipairs(data.value) do %>
-	<TR>
-		<TD style="padding-right:20px;white-space:nowrap;">
+	<tr>
+		<td>
 			<% io.write(html.link{value = "editentry?remotehost=" .. entry.remotehost.."&method="..entry.method.."&remotemailbox="..entry.remotemailbox.."&localdomain="..entry.localdomain.."&redir="..page_info.orig_action, label="Edit " }) %>
 			<% io.write(html.link{value = "deleteentry?submit=true&remotehost=" .. entry.remotehost.."&method="..entry.method.."&remotemailbox="..entry.remotemailbox.."&localdomain="..entry.localdomain, label="Delete " }) %>
-		</TD>
-		<TD style="padding-right:20px;white-space:nowrap;"><%= html.html_escape(entry.remotehost) %></TD>
-		<TD style="padding-right:20px;white-space:nowrap;"><%= html.html_escape(tostring(entry.enabled)) %></TD>
-		<TD style="padding-right:20px;white-space:nowrap;"><%= html.html_escape(entry.method) %></TD>
-		<TD style="white-space:nowrap;" width="90%"><% if entry.localdomain and entry.localdomain ~= "" then io.write(html.html_escape(entry.localdomain)) else io.write(html.html_escape(entry.remotemailbox)) end %></TD>
-	</TR>
+		</td>
+		<td><%= html.html_escape(entry.remotehost) %></td>
+		<td><%= html.html_escape(tostring(entry.enabled)) %></td>
+		<td><%= html.html_escape(entry.method) %></td>
+		<td><% if entry.localdomain and entry.localdomain ~= "" then io.write(html.html_escape(entry.localdomain)) else io.write(html.html_escape(entry.remotemailbox)) end %></td>
+	</tr>
 <% end %>
-</TABLE>
+</tbody></table>
 
-<DT>Add new entry</DT>
-<DD><form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/createentry") %>" method="POST">
+<div class='item'><p class='left'>Add new entry</p>
+<div class='right'>
+<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/createentry") %>" method="post">
 <input class="hidden" type="hidden"  name="redir"  value="<%= html.html_escape(page_info.orig_action) %>" >
 <input type=submit value="New" class="submit">
-</form></DD>
-</DL>
+</form>
+</div></div><!-- end .item -->
-- 
cgit v1.2.3