summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dansguardian-general-html.lsp13
-rw-r--r--dansguardian-html.lsp6
2 files changed, 8 insertions, 11 deletions
diff --git a/dansguardian-general-html.lsp b/dansguardian-general-html.lsp
index e7bd1af..0873344 100644
--- a/dansguardian-general-html.lsp
+++ b/dansguardian-general-html.lsp
@@ -1,6 +1,6 @@
<%
require("viewfunctions")
- local form, viewlibrary = ...
+ local form, viewlibrary, page_info = ...
%>
<%
@@ -15,11 +15,10 @@ io.write("</span>")
viewlibrary.dispatch_component("status")
end %>
-<form action="" method="POST">
<h1>Configuration</h1>
<%
- if form.descr then io.write('<P CLASS="descr">' .. string.gsub(form.descr, "\n", "<BR>") .. "</P>\n") end
- if form.errtxt then io.write('<P CLASS="error">' .. string.gsub(form.errtxt, "\n", "<BR>") .. "</P>\n") end
+ form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
+ displayformstart(form)
for field,val in pairs(form.value) do
val.name = field
end
@@ -63,11 +62,7 @@ The author recommends 50 for "young children", 100 for "older children" and 160
</dl>
<h2>Save Changes</h2>
-<dl>
-<DT></DT><DD><input class="submit" type="submit" name="<%= form.option %>" value="<%= (form.submit or form.option) %>"></DD>
-</dl>
-
-</form>
+<% displayformend(form) %>
<% if viewlibrary and viewlibrary.dispatch_component then
viewlibrary.dispatch_component("startstop")
diff --git a/dansguardian-html.lsp b/dansguardian-html.lsp
index 83b17eb..824ba19 100644
--- a/dansguardian-html.lsp
+++ b/dansguardian-html.lsp
@@ -1,4 +1,4 @@
-<% local view, viewlibrary, page_info = ...
+<% local view, viewlibrary, page_info, session = ...
require("viewfunctions")
%>
@@ -10,6 +10,8 @@ io.write("</span>")
--]]
%>
+<% displaycommandresults({"edit"}, session) %>
+
<% if viewlibrary and viewlibrary.dispatch_component then
viewlibrary.dispatch_component("status")
end %>
@@ -24,7 +26,7 @@ end %>
<%
for k,v in ipairs( view.value ) do
- io.write( "<tr><td><a href=\"" .. page_info.script .. page_info.prefix .. page_info.controller .. "/edit?filename=" .. v.filename .. "\">" .. v.filename .. "</a></td><td>" .. v.size .."</td><td>" .. v.mtime .."</td></tr>\n" )
+ io.write( "<tr><td><a href=\"" .. page_info.script .. page_info.prefix .. page_info.controller .. "/edit?filename=" .. v.filename .. "&redir=" .. page_info.orig_action .. "\">" .. v.filename .. "</a></td><td>" .. v.size .."</td><td>" .. v.mtime .."</td></tr>\n" )
end
%>
</TABLE>