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

4 files changed, 110 insertions, 74 deletions

diff --git a/apk-available-html.lsp b/apk-available-html.lsp
index 928b1f9..985ad8e 100644
--- a/apk-available-html.lsp
+++ b/apk-available-html.lsp
@@ -2,34 +2,50 @@
 <% 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({"upgrade", "install"}, session) %>
 
-<H1><%= form.label %></H1>
-<DL>
-<TABLE>
-	<TR style="background:#eee;font-weight:bold;">
+<h1><%= form.label %></h1>
+<table id="list" class="tablesorter"><thead>
+	<tr>
 	<% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %>
-		<TD style="padding-right:20px;white-space:nowrap;" class="header">Action</TD>
+		<th>Action</th>
 	<% end %>
-		<TD style="padding-right:20px;white-space:nowrap;" class="header">Package Name</TD>
-		<TD style="white-space:nowrap;" WIDTH="90%" class="header">Version</TD>
-	</TR>
-
+		<th>Package Name</th>
+		<th>Version</th>
+	</tr>
+</thead><tbody>
 <% for i,packagetable in pairs(form.value) do %>
-	<TR>
+	<tr>
 	<% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %>
-		<TD style="padding-right:20px;white-space:nowrap;">
+		<td>
 	<% if viewlibrary.check_permission("install") and not packagetable.upgrade then %>
 		<%= html.link{value = "install?submit=true&package=" .. packagetable.name, label="Install "} %>
 	<% end %>
 	<% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %>
 		<%= html.link{value = "upgrade?submit=true&package=" .. packagetable.name, label="Upgrade "} %>
 	<% end %>
-		</TD>
+		</td>
 	<% end %>
-		<TD><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></TD>
-		<TD><%= html.html_escape(packagetable.version) %></TD>
-	</TR>
+		<td><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></td>
+		<td><%= html.html_escape(packagetable.version) %></td>
+	</tr>
 <% end %>
-</TABLE>
-</DL>
+</tbody></table>
diff --git a/apk-details-html.lsp b/apk-details-html.lsp
index d88f170..6fdb6f2 100644
--- a/apk-details-html.lsp
+++ b/apk-details-html.lsp
@@ -4,8 +4,7 @@ htmlviewfunctions = require("htmlviewfunctions")
 
 <% htmlviewfunctions.displaycommandresults({"install", "upgrade"}, session) %>
 
-<H1><%= data.label %></H1>
-<DL>
+<h1><%= data.label %></h1>
 <%
 htmlviewfunctions.displayitem(data.value.package)
 htmlviewfunctions.displayitem(data.value.installed)
@@ -17,13 +16,17 @@ htmlviewfunctions.displayitem(data.value.upgrade)
 %>
 
 <% if viewlibrary.check_permission("install") and data.value.installed.value == "" then %>
-<DT>Install</DT>
-<DD><form action="install" method="POST">
+<div class='item'><p class='left'>Install</p>
+<div class='right'>
+<form action="install" method="post">
 <input class="hidden" type="hidden" name="package" value=<%= data.value.package.value %>>
-<input class="submit" type="submit" name="submit" value="Install"></form></DD>
+<input class="submit" type="submit" name="submit" value="Install"></form>
+</div></div><!-- end .item -->
 <% elseif viewlibrary.check_permission("upgrade") and data.value.upgrade.value ~= "" then %>
-<DT>Upgrade</DT>
-<DD><form action="upgrade" method="POST">
+<div class='item'><p class='left'>Upgrade</p>
+<div class='right'>
+<form action="upgrade" method="post">
 <input class="hidden" type="hidden" name="package" value=<%= data.value.package.value %>>
-<input class="submit" type="submit" name="submit" value="Upgrade"></form></DD>
-<% end %></DL>
+<input class="submit" type="submit" name="submit" value="Upgrade"></form>
+</div></div><!-- end .item -->
+<% end %>
diff --git a/apk-expert-html.lsp b/apk-expert-html.lsp
index 2256432..6dde79f 100644
--- a/apk-expert-html.lsp
+++ b/apk-expert-html.lsp
@@ -11,21 +11,23 @@ func(form, viewlibrary, page_info, session)
 %>
 
 <% if viewlibrary.check_permission("updateall") or viewlibrary.check_permission("upgradeall") then %>
-<H2>Update / Upgrade</H2>
-<DL>
+<h2>Update / Upgrade</h2>
 <% if viewlibrary.check_permission("updateall") then %>
-	<DT>Update Index</DT>
-	<DD><form action="updateall" method="POST">
+	<div class='item'><p class='left'>Update Index</p>
+	<div class='right'>
+	<form action="updateall" method="POST">
 		<input class="hidden" type="hidden" name="redir"  value="<%= html.html_escape(page_info.orig_action) %>" >
 		<input class="submit" type="submit" name="submit" value="Update">
-	</form></DD>
+	</form>
+	</div></div><!-- end .item -->
 <% end %>
 <% if viewlibrary.check_permission("upgradeall") then %>
-	<DT>Upgrade All</DT>
-	<DD><form action="upgradeall" method="POST">
+	<div class='item'><p class='left'>Upgrade All</p>
+	<div class='right'>
+	<form action="upgradeall" method="POST">
 		<input class="hidden" type="hidden" name="redir"  value="<%= html.html_escape(page_info.orig_action) %>" >
 		<input class="submit" type="submit" name="submit" value="Upgrade">
-	</form></DD>
+	</form>
+	</div></div><!-- end .item -->
 <% end %>
-</DL>
 <% end %>
diff --git a/apk-loaded-html.lsp b/apk-loaded-html.lsp
index 60e7321..e0b6ff6 100644
--- a/apk-loaded-html.lsp
+++ b/apk-loaded-html.lsp
@@ -2,67 +2,82 @@
 <% 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() {
+		$("#toplevellist").tablesorter({widgets: ['zebra']});
+		$("#dependentlist").tablesorter({widgets: ['zebra']});
+	});
+</script>
+
 <% htmlviewfunctions.displaycommandresults({"delete", "install", "upgrade"}, session) %>
 
-<H1><%= html.html_escape(form.label) %></H1>
-<H2><%= html.html_escape(form.value.toplevel.label) %></H2>
-<DL>
-<TABLE>
-	<TR style="background:#eee;font-weight:bold;">
+<h1><%= html.html_escape(form.label) %></h1>
+<h2><%= html.html_escape(form.value.toplevel.label) %></h2>
+<table id="toplevellist" class="tablesorter"><thead>
+	<tr>
 	<% if viewlibrary.check_permission("delete") or viewlibrary.check_permission("upgrade") then %>
-		<TD style="padding-right:20px;white-space:nowrap;" class="header">Action</TD>
+		<th>Action</th>
 	<% end %>
-		<TD style="padding-right:20px;white-space:nowrap;" class="header">Package Name</TD>
-		<TD style="padding-right:20px;white-space:nowrap;" class="header">Version</TD>
-		<TD style="white-space:nowrap;" class="header">Description</TD>
-	</TR>
-
+		<th>Package Name</th>
+		<th>Version</th>
+		<th>Description</th>
+	</tr>
+</thead><tbody>
 <% for i,packagetable in pairs(form.value.toplevel.value) do %>
-	<TR>
+	<tr>
 	<% if viewlibrary.check_permission("delete") then %>
-		<TD style="padding-right:20px;white-space:nowrap;">
+		<td>
 		<%= html.link{value = "delete?submit=true&package=" .. packagetable.name, label="Delete "} %>
 	<% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %>
 		<%= html.link{value = "upgrade?submit=true&package=" .. packagetable.name, label="Upgrade "} %>
 	<% end %>
-		</TD>
+		</td>
 	<% end %>
-		<TD><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></TD>
-		<TD><%= html.html_escape(packagetable.version) %></TD>
-		<TD><%= html.html_escape(packagetable.description) %></TD>
-	</TR>
+		<td><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></td>
+		<td><%= html.html_escape(packagetable.version) %></td>
+		<td><%= html.html_escape(packagetable.description) %></td>
+	</tr>
 <% end %>
-</TABLE>
-</DL>
+</tbody></table>
 
-<H2><%= html.html_escape(form.value.dependent.label) %></H2>
-<DL>
-<TABLE>
-	<TR style="background:#eee;font-weight:bold;">
+<h2><%= html.html_escape(form.value.dependent.label) %></h2>
+<table id="dependentlist" class="tablesorter"><thead>
+	<tr>
 	<% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %>
-		<TD style="padding-right:20px;white-space:nowrap;" class="header">Action</TD>
+		<th>Action</th>
 	<% end %>
-		<TD style="padding-right:20px;white-space:nowrap;" class="header">Package Name</TD>
-		<TD style="padding-right:20px;white-space:nowrap;" class="header">Version</TD>
-		<TD style="white-space:nowrap;" class="header">Description</TD>
-	</TR>
-
+		<th>Package Name</th>
+		<th>Version</th>
+		<th>Description</th>
+	</tr>
+</thead><tbody>
 <% for i,packagetable in pairs(form.value.dependent.value) do %>
-	<TR>
+	<tr>
 	<% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %>
-		<TD style="padding-right:20px;white-space:nowrap;">
+		<td>
 	<% if viewlibrary.check_permission("install") then %>
 		<%= html.link{value = "install?submit=true&package=" .. packagetable.name, label="Promote "} %>
 	<% end %>
 	<% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %>
 		<%= html.link{value = "upgrade?submit=true&package=" .. packagetable.name, label="Upgrade "} %>
 	<% end %>
-		</TD>
+		</td>
 	<% end %>
-		<TD><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></TD>
-		<TD><%= html.html_escape(packagetable.version) %></TD>
-		<TD><%= html.html_escape(packagetable.description) %></TD>
-	</TR>
+		<td><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></td>
+		<td><%= html.html_escape(packagetable.version) %></td>
+		<td><%= html.html_escape(packagetable.description) %></td>
+	</tr>
 <% end %>
-</TABLE>
-</DL>
+</tbody></table>