Many changes (mostly to use cfe's when sending/receiving things from model/controller/view).

git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@676 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 94 insertions, 43 deletions

diff --git a/syslog-expert-html.lsp b/syslog-expert-html.lsp
index 527ce22..5907a7a 100644
--- a/syslog-expert-html.lsp
+++ b/syslog-expert-html.lsp
@@ -1,62 +1,113 @@
-<? local view = ... ?>
+<? local form = ... ?>
+<?
+--[[ DEBUG INFORMATION
+io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
+io.write(html.cfe_unpack(form))
+io.write("</span>")
+--]]
+?>
+<?
+function informationform(myform,tags)
+	io.write("<DL>")
+	for k,v in pairs(tags) do 
+		if (myform[v]) then
+			local val = myform[v] 
+			io.write("\t<DT")
+			if (#val.errtxt > 0) then io.write(" class='error'") end
+			io.write(">" .. val.label .. "</DT>\n")
 
-<h1>SYSTEM INFO</h1>
+			io.write("\t\t<DD>" .. val.value .. "\n")
+			if (val.descr) and (#val.descr > 0) then io.write("\t\t<P CLASS='descr'>" .. string.gsub(val.descr, "\n", "<BR>") .. "</P>\n") end
+			if (#val.errtxt > 0) then io.write("\t\t<P CLASS='error'>" .. string.gsub(val.errtxt, "\n", "<BR>") .. "</P>\n") end
+			io.write("\t\t</DD>\n")
+		end
+	end
+	io.write("</DL>")
+end
+?>
+<?
+function configform(myform,tags)
+	io.write("<DL>")
+	for k,v in pairs(tags) do 
+		if (myform[v]) then
+			local val = myform[v] 
+			io.write("\t<DT")
+			if (#val.errtxt > 0) then io.write(" class='error'") end
+			io.write(">" .. val.label .. "</DT>\n")
 
-<DL>
-	<dt><?= view.status.status.label ?></dt>
-		<dd><?= view.status.status.value ?><p class='error'><?= view.status.status.errtxt ?></p></dd>
+			io.write("\t\t<DD>" .. html.form[val.type](val) .. "\n")
+			if (val.descr) and (#val.descr > 0) then io.write("\t\t<P CLASS='descr'>" .. string.gsub(val.descr, "\n", "<BR>") .. "</P>\n") end
+			if (#val.errtxt > 0) then io.write("\t\t<P CLASS='error'>" .. string.gsub(val.errtxt, "\n", "<BR>") .. "</P>\n") end
+			io.write("\t\t</DD>\n")
+		end
+	end
+	io.write("</DL>")
+end
+?>
 
-	<dt><?= view.status.version.label ?></dt>
-		<dd><?= view.status.version.value ?><p class='error'><?= view.status.version.errtxt ?></p></dd>
-</DL>
 
-<h1>CONFIGURATION</h1>
-<H2>Expert config</H2>
-<h3>File details</h3>
+<H1>SYSTEM INFO</H1>
+<? 
+local myform = form.status 
+local tags = { "status", "version", }
+informationform(myform,tags)
+?>
 
-<DL>
-	<dt>File name</dt>
-		<dd><?= view.file.details.path ?></dd>
+<H1>CONFIGURATION</H1>
+<? local myform = form.config ?>
+<form action="<?= form.option.script .. "/" .. form.option.prefix ..
+		form.option.controller .. "/" .. form.option.action ?>" method="POST">
 
-	<dt>File size</dt>
-		<dd><?= view.file.details.size ?></dd>
+<H2>EXPERT CONFIGURATION</H2>
+<H3>FILE DETAILS</H3>
+<? 
+local tags = { "filename", "filesize", "mtime", "sumerrors" }
+informationform(myform,tags)
+?>
 
-	<dt>Last modified</dt>
-		<dd><?= view.file.details.mtime ?></dd>
-</DL>
+<H3>FILE CONTENT</H3>
+<? 
+io.write(html.form[form.config.filecontent.type](form.config.filecontent))
+?>
 
-<h3>File content</h3>
+<H2>SAVE AND APPLY ABOVE SETTINGS</H2>
+<? 
+local tags = { "cmdsave", }
+configform(myform,tags)
+?>
+</form>
 
-<form name="myform" action="" method="POST">
-<input name="name" type=hidden value="">
-<textarea name="modifications"><?= view.file.content ?></textarea>
 
-<H2>Save and apply above settings</H2>
-<DL>
-	<DT>Apply settings</DT>
-		<DD><input class="submit" type="submit" name="cmdsave" value="Apply"/></DD>
-</DL>
+<? 
+local cmdform = form.management
+local tags = { "start", "stop", "restart" }
+if (cmdform) and (cmdform[tags[1]]) then
+?>
+	<form name="management" action="" method="POST">
+	<H1>MANAGEMENT</H1>
+	<dl>
+		<dt><?= cmdform[tags[1]]["label"] ?></dt>
+		<dd>
+		<? for k,v in pairs(tags) do ?>
+			<? if (cmdform[v]) then ?>
+				<? io.write(html.form[cmdform[v].type](cmdform[v])) ?>
+			<? end ?>
+		<? end ?>
+		</dd>
 
-<H1>MANAGEMENT</H1>
+		<? if (form.cmdmanagement) and (#form.cmdmanagement.descr > 0) then ?>
+		<dt>Previous action result</dt>
+			<dd><pre><?= form.cmdmanagement.descr ?></pre></dd>
+		<? end ?>
+	</dl>
+	</form>
 
-<dl>
-	<dt>Program controll-panel</dt>
-		<dd><form name="cmd" action="" method="POST">
-		<input type=submit class="submit" name="cmddaemon" value="start"/>
-		<input type=submit class="submit" name="cmddaemon" value="stop"/>
-		<input type=submit class="submit" name="cmddaemon" value="restart"/>
-		</form>
-		</dd>
-	<? if (view.startstop) and (view.startstop.cmdresult) then ?>
-	<dt>Previous action result</dt>
-		<dd><pre><?= view.startstop.cmdresult?></pre></dd>
-	<? end ?>
-</dl>
+<? end ?>
 
 <?
 ---[[ DEBUG INFORMATION
 io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
-io.write(html.cfe_unpack(view))
+io.write(html.cfe_unpack(form))
 io.write("</span>")
 --]]
 ?>