Changes to use new htmlviewfunctions functions

4 files changed, 45 insertions, 52 deletions

diff --git a/apk-available-html.lsp b/apk-available-html.lsp
index 985ad8e..3d7c8bc 100644
--- a/apk-available-html.lsp
+++ b/apk-available-html.lsp
@@ -16,13 +16,13 @@
 	
 <script type="text/javascript">
 	$(document).ready(function() {
-		$("#list").tablesorter({widgets: ['zebra']});
+		$("#list").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']});
 	});
 </script>
 
 <% htmlviewfunctions.displaycommandresults({"upgrade", "install"}, session) %>
 
-<h1><%= form.label %></h1>
+<% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %>
 <table id="list" class="tablesorter"><thead>
 	<tr>
 	<% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %>
@@ -32,16 +32,18 @@
 		<th>Version</th>
 	</tr>
 </thead><tbody>
+<% local packagecfe = cfe({ type="hidden", value="" }) %>
 <% for i,packagetable in pairs(form.value) do %>
 	<tr>
 	<% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %>
+		<% packagecfe.value = packagetable.name %>
 		<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 %>
+		<% if viewlibrary.check_permission("install") and not packagetable.upgrade then %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Install", action="install" }), page_info, -1) %>
+		<% end %>
+		<% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Upgrade", action="upgrade" }), page_info, -1) %>
+		<% end %>
 		</td>
 	<% end %>
 		<td><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></td>
@@ -49,3 +51,4 @@
 	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/apk-details-html.lsp b/apk-details-html.lsp
index 6fdb6f2..814234a 100644
--- a/apk-details-html.lsp
+++ b/apk-details-html.lsp
@@ -4,7 +4,7 @@ htmlviewfunctions = require("htmlviewfunctions")
 
 <% htmlviewfunctions.displaycommandresults({"install", "upgrade"}, session) %>
 
-<h1><%= data.label %></h1>
+<% local header_level = htmlviewfunctions.displaysectionstart(data, page_info) %>
 <%
 htmlviewfunctions.displayitem(data.value.package)
 htmlviewfunctions.displayitem(data.value.installed)
@@ -15,18 +15,11 @@ htmlviewfunctions.displayitem(data.value.size)
 htmlviewfunctions.displayitem(data.value.upgrade)
 %>
 
+<% local packagecfe = cfe({ type="hidden", value=data.value.package.value }) %>
 <% if viewlibrary.check_permission("install") and data.value.installed.value == "" then %>
-<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>
-</div></div><!-- end .item -->
+	<% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="Install", option="Install", action="install" }), page_info, 0) %>
 <% elseif viewlibrary.check_permission("upgrade") and data.value.upgrade.value ~= "" then %>
-<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>
-</div></div><!-- end .item -->
+	<% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="Upgrade", option="Upgrade", action="upgrade" }), page_info, 0) %>
 <% end %>
+
+<% htmlviewfunctions.displaysectionend(header_level) %>
diff --git a/apk-expert-html.lsp b/apk-expert-html.lsp
index 6dde79f..a46318e 100644
--- a/apk-expert-html.lsp
+++ b/apk-expert-html.lsp
@@ -11,23 +11,12 @@ func(form, viewlibrary, page_info, session)
 %>
 
 <% if viewlibrary.check_permission("updateall") or viewlibrary.check_permission("upgradeall") then %>
-<h2>Update / Upgrade</h2>
+<% local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Update / Upgrade"}), page_info) %>
 <% if viewlibrary.check_permission("updateall") then %>
-	<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>
-	</div></div><!-- end .item -->
+	<% htmlviewfunctions.displayitem(cfe({type="form", value={}, label="Update Index", option="Update", action="updateall" }), page_info, 0) %>
 <% end %>
 <% if viewlibrary.check_permission("upgradeall") then %>
-	<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>
-	</div></div><!-- end .item -->
+	<% htmlviewfunctions.displayitem(cfe({type="form", value={}, label="Upgrade All", option="Upgrade", action="upgradeall" }), page_info, 0) %>
 <% end %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
 <% end %>
diff --git a/apk-loaded-html.lsp b/apk-loaded-html.lsp
index e0b6ff6..4113e80 100644
--- a/apk-loaded-html.lsp
+++ b/apk-loaded-html.lsp
@@ -16,15 +16,15 @@
 	
 <script type="text/javascript">
 	$(document).ready(function() {
-		$("#toplevellist").tablesorter({widgets: ['zebra']});
-		$("#dependentlist").tablesorter({widgets: ['zebra']});
+		$("#toplevellist").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']});
+		$("#dependentlist").tablesorter({headers: {0:{sorter: false}}, 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>
+<% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %>
+<% local header_level2 = htmlviewfunctions.displaysectionstart(form.value.toplevel, page_info, htmlviewfunctions.incrementheader(header_level)) %>
 <table id="toplevellist" class="tablesorter"><thead>
 	<tr>
 	<% if viewlibrary.check_permission("delete") or viewlibrary.check_permission("upgrade") then %>
@@ -35,14 +35,18 @@
 		<th>Description</th>
 	</tr>
 </thead><tbody>
+<% local packagecfe = cfe({ type="hidden", value="" }) %>
 <% for i,packagetable in pairs(form.value.toplevel.value) do %>
 	<tr>
-	<% if viewlibrary.check_permission("delete") then %>
+	<% if viewlibrary.check_permission("delete") or viewlibrary.check_permission("upgrade") then %>
+		<% packagecfe.value = packagetable.name %>
 		<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 %>
+		<% if viewlibrary.check_permission("delete") then %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Delete", action="delete" }), page_info, -1) %>
+		<% end %>
+		<% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Upgrade", action="upgrade" }), page_info, -1) %>
+		<% end %>
 		</td>
 	<% end %>
 		<td><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></td>
@@ -51,8 +55,9 @@
 	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
-<h2><%= html.html_escape(form.value.dependent.label) %></h2>
+<% htmlviewfunctions.displaysectionstart(form.value.dependent, page_info, header_level2) %>
 <table id="dependentlist" class="tablesorter"><thead>
 	<tr>
 	<% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %>
@@ -66,13 +71,14 @@
 <% for i,packagetable in pairs(form.value.dependent.value) do %>
 	<tr>
 	<% if viewlibrary.check_permission("install") or viewlibrary.check_permission("upgrade") then %>
+		<% packagecfe.value = packagetable.name %>
 		<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 %>
+		<% if viewlibrary.check_permission("install") then %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Promote", action="install" }), page_info, -1) %>
+		<% end %>
+		<% if viewlibrary.check_permission("upgrade") and packagetable.upgrade then %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={package=packagecfe}, label="", option="Upgrade", action="upgrade" }), page_info, -1) %>
+		<% end %>
 		</td>
 	<% end %>
 		<td><%= html.link{value = "details?package="..packagetable.name, label=packagetable.name} %></td>
@@ -81,3 +87,5 @@
 	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
+<% htmlviewfunctions.displaysectionend(header_level) %>