From 4c0e9b17d5bbcfb7e7a704c6a57af2cfe327c308 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Sat, 8 Mar 2014 23:49:47 +0000
Subject: Modified HTML views to use new htmlviewfunctions functions and
 replace links with forms created by displayitem

Use htmlviewfunctions.displayheader .incrementheader .displayitemstart/middle/end
---
 cron-listjobs-html.lsp | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'cron-listjobs-html.lsp')

diff --git a/cron-listjobs-html.lsp b/cron-listjobs-html.lsp
index b9759d3..bc7564e 100644
--- a/cron-listjobs-html.lsp
+++ b/cron-listjobs-html.lsp
@@ -31,26 +31,14 @@
 	viewlibrary.dispatch_component("status")
 end %>
 
-<% -- set up the form for the move action
-local formstart = '<form action="'..html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/movejob")..'" method="POST">'
-formstart = formstart .. '<input type="hidden" name="name" value="'
-local formend = '">\n<select name="period" style="width:150px">'
-for i,tabl in ipairs(view.value) do
-	if i == 1 then
-		formend = formend .. '<option selected value="'..tabl.period..'">'..tabl.period..'</option>'
-	else
-		formend = formend .. '<option value="'..tabl.period..'">'..tabl.period..'</option>'
-	end
-end
-formend = formend .. '</select>\n<input class="submit" type="submit" name="submit" value="Move"></form>'
-local function createmoveform(name)
-	io.write(formstart, name, formend)
-end
-%>
-
 <%
 local header_level = htmlviewfunctions.displayheader(view, page_info)
 header_level = htmlviewfunctions.incrementheader(header_level)
+local redir = cfe({type="hidden", value=page_info.orig_action})
+local period = cfe({type="select", option={}})
+for i,tabl in ipairs(view.value) do
+	period.option[#period.option+1] = tabl.period
+end
 %>
 <% for i,tabl in ipairs(view.value) do %>
 <% htmlviewfunctions.displayheader(cfe({label=tabl.period}), page_info, header_level) %>
@@ -65,13 +53,15 @@ header_level = htmlviewfunctions.incrementheader(header_level)
 	</tr>
 </thead><tbody>
 		<% for i,job in ipairs(tabl.jobs) do %>
+			<% local name = cfe({type="hidden", value=job}) %>
 	<tr>
 		<td><%= html.html_escape(string.gsub(job, "^.*/", "")) %></td>
 		<td>
-			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/editjob?name="..job.."&redir="..page_info.orig_action, label="Edit "} %>
-			<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deletejob?name="..job.."&submit=true", label="Delete "} %>
+			<% 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) %>
 		</td><td>
-			<% createmoveform(job, tabl.period) %>
+			<% period.value = tabl.period %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={name=name, period=period}, label="", option="Move", action="movejob" }), -1, page_info) %>
 		</td>
 	</tr>
 		<% end %>
-- 
cgit v1.2.3