Change for new prototype for htmlviewfunctions.displayitem

6 files changed, 15 insertions, 15 deletions

diff --git a/cron-listjobs-html.lsp b/cron-listjobs-html.lsp
index 11b0669..2b7a013 100644
--- a/cron-listjobs-html.lsp
+++ b/cron-listjobs-html.lsp
@@ -57,12 +57,12 @@ end
 	<tr>
 		<td><%= html.html_escape(string.gsub(job, "^.*/", "")) %></td>
 		<td>
-			<% htmlviewfunctions.displayitem(cfe({type="link", value={name=name, redir=redir}, label="", option="Edit", action="editjob" }), -1, page_info) %>
-			<% htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="Delete", action="deletejob" }), -1, page_info) %>
+			<% htmlviewfunctions.displayitem(cfe({type="link", value={name=name, redir=redir}, label="", option="Edit", action="editjob" }), page_info, -1) %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="Delete", action="deletejob" }), page_info, -1) %>
 		</td><td>
 			<% period.value = tabl.period %>
 			<% period.id = string.gsub(job, "^.*/", "").."period" %>
-			<% htmlviewfunctions.displayitem(cfe({type="form", value={name=name, period=period}, label="", option="Move", action="movejob" }), -1, page_info) %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={name=name, period=period}, label="", option="Move", action="movejob" }), page_info, -1) %>
 		</td>
 	</tr>
 		<% end %>
diff --git a/interfaces-read-html.lsp b/interfaces-read-html.lsp
index e3e60d2..de51424 100644
--- a/interfaces-read-html.lsp
+++ b/interfaces-read-html.lsp
@@ -33,16 +33,16 @@ end %>
 		<% local name = cfe({type="hidden", value=interface.name.value}) %>
 	<tr><td colspan=2 style='border:none;'>
 	<% if viewlibrary.check_permission("update") then
-		htmlviewfunctions.displayitem(cfe({type="link", value={name=name, redir=redir}, label="", option="Edit", action="update" }), -1, page_info)
+		htmlviewfunctions.displayitem(cfe({type="link", value={name=name, redir=redir}, label="", option="Edit", action="update" }), page_info, -1)
 	end
 	if viewlibrary.check_permission("delete") then
-		htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="Delete", action="delete" }), -1, page_info)
+		htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="Delete", action="delete" }), page_info, -1)
 	end
 	if viewlibrary.check_permission("ifup") then
-		htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="ifup", action="ifup" }), -1, page_info)
+		htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="ifup", action="ifup" }), page_info, -1)
 	end
 	if viewlibrary.check_permission("ifdown") then
-		htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="ifdown", action="ifdown" }), -1, page_info)
+		htmlviewfunctions.displayitem(cfe({type="form", value={name=name}, label="", option="ifdown", action="ifdown" }), page_info, -1)
 	end %>
 	</td></tr>
 	<% end %>
diff --git a/interfaces-update-html.lsp b/interfaces-update-html.lsp
index 8d65d99..4cf2417 100644
--- a/interfaces-update-html.lsp
+++ b/interfaces-update-html.lsp
@@ -79,5 +79,5 @@ end
 
 <%
 if page_info.action == "update" then form.label = form.label.." - "..form.value.name.value end
-htmlviewfunctions.displayitem(form, nil, page_info)
+htmlviewfunctions.displayitem(form, page_info)
 %>
diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp
index 0345d8e..2e42fd4 100644
--- a/logfiles-status-html.lsp
+++ b/logfiles-status-html.lsp
@@ -64,13 +64,13 @@ end
 		<% if file.value.inuse.value then %>
 			in use
 		<% else
-			htmlviewfunctions.displayitem(cfe({type="form", value={filename=filename}, label="", option="Delete", action="delete" }), -1, page_info)
+			htmlviewfunctions.displayitem(cfe({type="form", value={filename=filename}, label="", option="Delete", action="delete" }), page_info, -1)
 		end %>
 		</td>
 	<% end %>
-		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename}, label="", option="View", action="view" }), -1, page_info) %></td>
-		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename}, label="", option="Tail", action="tail" }), -1, page_info) %></td>
-		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, viewtype=viewtype}, label="", option="Download", action="download" }), -1, page_info) %></td>
+		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename}, label="", option="View", action="view" }), page_info, -1) %></td>
+		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename}, label="", option="Tail", action="tail" }), page_info, -1) %></td>
+		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, viewtype=viewtype}, label="", option="Download", action="download" }), page_info, -1) %></td>
 		<td><span style="display:none"><%= convertsize(file.value.filesize.value) %>b</span><%= html.html_escape(file.value.filesize.value) %></td>
 		<td><%= html.html_escape(file.value.mtime.value) %></td>
 		<td><%= html.html_escape(file.value.filename.value) %></td>
diff --git a/rc-status-html.lsp b/rc-status-html.lsp
index a586700..aab9470 100644
--- a/rc-status-html.lsp
+++ b/rc-status-html.lsp
@@ -41,14 +41,14 @@ for i,item in ipairs(view.value) do %>
 	<td>
 	<% local servicename = cfe({type="hidden", value=item.servicename}) %>
 	<% if viewlibrary.check_permission("edit") then
-		htmlviewfunctions.displayitem(cfe({type="link", value={servicename=servicename, redir=redir}, label="", option="Edit", action="edit" }), -1, page_info)
+		htmlviewfunctions.displayitem(cfe({type="link", value={servicename=servicename, redir=redir}, label="", option="Edit", action="edit" }), page_info, -1)
 	end %>
 	<% if viewlibrary.check_permission("startstop") and item.actions then
 		local startstopform = cfe({type="form", value={servicename=servicename}, label="", option={}, action="startstop" })
 		for i,a in ipairs(item.actions) do
 			startstopform.option[#startstopform.option+1] = a:gsub("^%l", string.upper)
 		end
-		htmlviewfunctions.displayitem(startstopform, -1, page_info)
+		htmlviewfunctions.displayitem(startstopform, page_info, -1)
 	end %>
 	</td>
 	<td><%= html.html_escape(item.servicename) %></td>
diff --git a/syslog-loginfo-html.lsp b/syslog-loginfo-html.lsp
index dbada17..00450e0 100644
--- a/syslog-loginfo-html.lsp
+++ b/syslog-loginfo-html.lsp
@@ -6,5 +6,5 @@
 end %>
 
 <% 
-htmlviewfunctions.displayitem(view, nil, page_info)
+htmlviewfunctions.displayitem(view, page_info)
 %>