1 files changed, 42 insertions, 25 deletions
diff --git a/syslog-status-html.lsp b/syslog-status-html.lsp
index c5b1c0d..d6f5ced 100644
--- a/syslog-status-html.lsp
+++ b/syslog-status-html.lsp
@@ -1,35 +1,52 @@
-<? local view = ... ?>
-
-<h1>SYSTEM INFO</h1>
+<? 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>")
+--]]
+?>
 
+<H1>SYSTEM INFO</H1>
 <DL>
-	<dt><?= view.status.status.name ?></dt>
-		<dd><?= view.status.status.value ?><p class='error'><?= view.status.status.errtxt ?></p></dd>
+<? 
+local myform = form.status 
+local tags = { "status", "version", }
+
+for k,v in pairs(tags) do 
+	local val = myform[v] 
+	io.write("\t<DT")
+	if (#val.errtxt > 0) then io.write(" class='error'") end
+	io.write(">" .. val.label .. "</DT>\n")
+
+	io.write("\t\t<DD>" .. val.value .. "\n")
+	if (val.descr) and (#val.descr > 0) then io.write("\t\t<P CLASS='descr'>" .. val.descr .. "</P>\n") end
+	if (#val.errtxt > 0) then io.write("\t\t<P CLASS='error'>" .. val.errtxt .. "</P>\n") end
+	io.write("\t\t</DD>\n")
 
-	<dt><?= view.status.version.name ?></dt>
-		<dd><?= view.status.version.value ?><p class='error'><?= view.status.version.errtxt ?></p></dd>
+end ?>
 </DL>
 
 <H2>PROGRAM SPECIFIC OPTIONS/INFORMATION</H2>
 <DL>
-	<? if (view.status.logfile) then ?>
-	<dt><?= view.status.logfile.name ?></dt>
-		<dd><?= view.status.logfile.value ?><p class='error'><?= view.status.logfile.errtxt ?></p></dd>
-	<? end ?>
-
-	<? if (view.status.remote) then ?>
-	<dt><?= view.status.remote.name ?></dt>
-		<dd><?= view.status.remote.value ?><p class='error'><?= view.status.remote.errtxt ?></p></dd>
-	<? end ?>
+<? 
+local myform = form.status 
+local tags = { "logfile", "remotelogging", }
+
+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")
+
+		io.write("\t\t<DD>" .. val.value .. "\n")
+		if (val.descr) and (#val.descr > 0) then io.write("\t\t<P CLASS='descr'>" .. val.descr .. "</P>\n") end
+		if (#val.errtxt > 0) then io.write("\t\t<P CLASS='error'>" .. val.errtxt .. "</P>\n") end
+		io.write("\t\t</DD>\n")
+	end
+end ?>
 </DL>
 
-<H1>DEBUGGING</H1>
-<H2>CFE debugging</H2>
-<?= html.cfe_unpack(view) ?>
 
-<?
----[[ DEBUG INFORMATION
-require("debugs")
-io.write(debugs.variables(view))
---]]
-?>
+