Started changes to use new htmlviewfunctions functions

Still work to do to remove styling and long messy links

1 files changed, 8 insertions, 4 deletions

diff --git a/weblog-viewweblog-html.lsp b/weblog-viewweblog-html.lsp
index 061d8b0..0310f46 100644
--- a/weblog-viewweblog-html.lsp
+++ b/weblog-viewweblog-html.lsp
@@ -117,15 +117,17 @@ end
 }
 </style>
 
-<h1>Search Parameters</h1>
 <% -- Display the form, but skip log, window, and focus fields
+local label = data.label
+data.label = "Search Parameters"
 local log = data.value.log
 data.value.log = nil
 local window = data.value.window
 data.value.window = nil
 local focus = data.value.focus
 data.value.focus = nil
-htmlviewfunctions.displayform(data, nil, nil, page_info, 2)
+htmlviewfunctions.displayitem(data, page_info)
+data.label = label
 data.value.log = log
 data.value.window = window
 data.value.focus = focus
@@ -141,8 +143,8 @@ if data.value.clientip.value ~= "" then
 end
 %>
 
+<% local header_level = htmlviewfunctions.displaysectionstart(data, page_info) %>
 <% htmlviewfunctions.displaypagination(pagedata, page_info) %>
-<h1><%= html.html_escape(data.label) %></h1>
 <table id="loglist" class="tablesorter">
 <thead>
 <tr>
@@ -217,6 +219,7 @@ end %>
 </tbody>
 </table>
 <% htmlviewfunctions.displaypagination(pagedata, page_info) %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
 
 <% if data.errtxt then %>
 <p class="error"><%= html.html_escape(data.errtxt) %></p>
@@ -226,6 +229,7 @@ end %>
 <% end %>
 
 <% if viewlibrary.check_permission("downloadweblog") then
+data.label = "Download Results"
 data.action = "downloadweblog"
 data.option = "Download"
 data.value.log = nil
@@ -236,5 +240,5 @@ for n,v in pairs(data.value) do
 	v.type = "hidden"
 	v.checked = nil
 end
-htmlviewfunctions.displayform(data, nil, nil, page_info, 2)
+htmlviewfunctions.displayitem(data, page_info, 0)
 end %>