Added a expert-tab and updated Makefilev0.2

git-svn-id: svn://svn.alpinelinux.org/acf/opennhrp/trunk@876 ab2d0c66-481e-0410-8bed-d214d4d58bed

2 files changed, 115 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 13a61c3..135daf9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 APP_NAME=opennhrp
 PACKAGE=acf-$(APP_NAME)
-VERSION=0.1.1
+VERSION=0.2
 
 APP_DIST=\
 	opennhrp-controller.lua	\
 	opennhrp-model.lua		\
 	opennhrp-status-html.lsp	\
+	opennhrp-expert-html.lsp	\
 	opennhrp.menu		\
 
 
diff --git a/opennhrp-expert-html.lsp b/opennhrp-expert-html.lsp
new file mode 100644
index 0000000..cf70091
--- /dev/null
+++ b/opennhrp-expert-html.lsp
@@ -0,0 +1,113 @@
+<? 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 displayinfo(myform,tags,viewtype)
+	for k,v in pairs(tags) do 
+		if (myform[v]) and (myform[v]["value"]) then
+			local val = myform[v] 
+			io.write("\n\t<DT")
+			if (#val.errtxt > 0) then 
+				val.class = "error"
+				io.write(" class='error'")
+			end
+			io.write(">" .. val.label .. "</DT>")
+			io.write("\n\t\t<DD>")
+			if (viewtype == "viewonly") then
+				io.write(val.value)
+			elseif (val.type == "radio") and (type(val.option) == "table") and (#val.option > 0) then
+				io.write("<span style='display:inline' class='" .. ( val.class or "") .. "'>")
+				for k1,v1 in pairs(val.option) do
+					io.write(tostring(v1.label) .. ":")
+					io.write("<input style='margin-right:20px;margin-left:5px;' type='radio' class='" .. ( val.class or "") .. "' name='" .. val.name .. "'")
+					if (tostring(val.value) == tostring(v1.value)) then io.write(" checked='yes'") end
+					io.write(" value='" .. v1.value .. "'>")
+				end
+				io.write("</input></span>")
+			else
+				io.write(html.form[val.type](val))
+			end
+			if (val.descr) and (#val.descr > 0) then io.write("\n\t\t<P CLASS='descr'>" .. string.gsub(val.descr, "\n", "<BR>") .. "</P>") end
+			if (#val.errtxt > 0) then io.write("\n\t\t<P CLASS='error'>" .. string.gsub(val.errtxt, "\n", "<BR>") .. "</P>") end
+			io.write("\n\t\t</DD>\n")
+		end
+	end
+end
+?>
+
+<H1>SYSTEM INFO</H1>
+<DL>
+<? 
+local myform = form.status 
+local tags = { "status", "version", "autostart", }
+displayinfo(myform,tags,"viewonly")
+?>
+</DL>
+
+
+<form name="myform" action="" method="POST">
+<h1>CONFIGURATION</h1>
+<H2>Expert config</H2>
+<h3>File details</h3>
+<DL>
+<? 
+local myform = form.file 
+local tags = { "filename", "filesize", "mtime", "sumerrors", }
+displayinfo(myform,tags,"viewonly")
+?>
+</DL>
+
+<H3>FILE CONTENT</H3>
+<? 
+local myform = form.file
+io.write(html.form[myform.filecontent.type](myform.filecontent))
+?>
+
+<H2>SAVE AND APPLY ABOVE SETTINGS</H2>
+<DL>
+<? 
+local tags = { "cmdsave", }
+displayinfo(myform,tags)
+?>
+</DL>
+
+</form>
+
+<? -- MANAGEMENT BUTTONS
+local cmdform = form.management
+local cmdresult = form.cmdmanagement
+local tags = { "start", "stop", "restart" }
+if (cmdform) and (cmdform[tags[1]]) then
+
+	io.write('<form name="management" action="" method="POST">')
+	io.write('<H1>MANAGEMENT</H1>')
+	io.write('<dl>')
+	io.write('<dt>' .. cmdform[tags[1]]["label"] .. '</dt>')
+	io.write('<dd>')
+	for k,v in pairs(tags) do
+		if (cmdform[v]) then
+			io.write(html.form[cmdform[v].type](cmdform[v]))
+		end
+	end
+	io.write('</dd>')
+
+	if (cmdresult) and (cmdresult.action) and (#cmdresult.action.descr > 0) then
+		io.write('<dt>' .. cmdresult.label .. '</dt>')
+		io.write('<dd><pre>' .. cmdresult.action.descr .. '</pre></dd>')
+	end
+	io.write('</dl></form>')
+end ?>
+
+<?
+--[[ 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>")
+--]]
+?>
+