diff options
| -rw-r--r-- | app/debug-html.lsp | 11 | ||||
| -rw-r--r-- | app/filedetails-html.lsp | 37 | ||||
| -rw-r--r-- | app/form-html.lsp | 2 | ||||
| -rw-r--r-- | lib/htmlviewfunctions.lua | 10 |
4 files changed, 30 insertions, 30 deletions
diff --git a/app/debug-html.lsp b/app/debug-html.lsp index ee49434..b768057 100644 --- a/app/debug-html.lsp +++ b/app/debug-html.lsp @@ -1,9 +1,12 @@ <% local data, viewlibrary, page_info, session = ... %> <% require("htmlviewfunctions") %> -<H1>Debugging</H1> -<H2>View Data:</H2> + +<h1>Debugging</h1> +<h2>View Data:</h2> <%= htmlviewfunctions.cfe_unpack(data) %> -<H2>Session:</H2> + +<h2>Session:</h2> <%= htmlviewfunctions.cfe_unpack(session) %> -<H2>Page Info:</H2> + +<h2>Page Info:</h2> <%= htmlviewfunctions.cfe_unpack(page_info) %> diff --git a/app/filedetails-html.lsp b/app/filedetails-html.lsp index 101861d..dff6eee 100644 --- a/app/filedetails-html.lsp +++ b/app/filedetails-html.lsp @@ -2,36 +2,37 @@ <% require("htmlviewfunctions") %> <% if form.type == "form" then %> -<H1>Configuration</H1> -<H2>Expert Configuration</H2> + <h1>Configuration</h1> + <h2>Expert Configuration</h2> <% else %> -<H1>View File</H1> + <h1>View File</h1> <% end %> -<H3>File Details</H3> -<DL> + +<h3>File Details</h3> <% htmlviewfunctions.displayitem(form.value.filename) htmlviewfunctions.displayitem(form.value.filesize) htmlviewfunctions.displayitem(form.value.mtime) %> -</DL> -<H3>File Content</H3> +<h3>File Content</h3> <% if form.type == "form" then %> -<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %> -<% htmlviewfunctions.displayformstart(form) %> -<input type="hidden" name="filename" value="<%= html.html_escape(form.value.filename.value) %>"> -<% else %> -<DL> + <% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %> + <% htmlviewfunctions.displayformstart(form) %> + <input type="hidden" name="filename" value="<%= html.html_escape(form.value.filename.value) %>"> <% end %> + <textarea name="filecontent"> -<%= html.html_escape(form.value.filecontent.value) %> + <%= html.html_escape(form.value.filecontent.value) %> </textarea> -<% if form.value.filecontent.errtxt then %><P CLASS='error'><%= string.gsub(html.html_escape(form.value.filecontent.errtxt), "\n", "<BR>") %></P><% end %> -<% if form.value.filecontent.descr then %><P CLASS='descr'><%= string.gsub(html.html_escape(form.value.filecontent.descr), "\n", "<BR>") %></P><% end %> + +<% if form.value.filecontent.errtxt then %> + <p class='error'><%= string.gsub(html.html_escape(form.value.filecontent.errtxt), "\n", "<br/>") %></p> +<% end %> +<% if form.value.filecontent.descr then %> + <p><%= string.gsub(html.html_escape(form.value.filecontent.descr), "\n", "<br/>") %></p> +<% end %> <% if form.type == "form" then %> -<% htmlviewfunctions.displayformend(form) %> -<% else %> -</DL> + <% htmlviewfunctions.displayformend(form) %> <% end %> diff --git a/app/form-html.lsp b/app/form-html.lsp index 26389b9..5d1b85d 100644 --- a/app/form-html.lsp +++ b/app/form-html.lsp @@ -2,7 +2,7 @@ require("htmlviewfunctions") %> -<H1><%= html.html_escape(form.label) %></H1> +<h1><%= html.html_escape(form.label) %></h1> <% htmlviewfunctions.displayform(form, nil, nil, page_info, 2) %> diff --git a/lib/htmlviewfunctions.lua b/lib/htmlviewfunctions.lua index 4e8d4b8..22385b6 100644 --- a/lib/htmlviewfunctions.lua +++ b/lib/htmlviewfunctions.lua @@ -161,9 +161,8 @@ function displayformstart(myform, page_info) if not myform.action and page_info then myform.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action end - io.write('<DL>\n') - if myform.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(myform.descr), "\n", "<BR>") .. "</P>\n") end - if myform.errtxt then io.write('<P CLASS="error">' .. string.gsub(html.html_escape(myform.errtxt), "\n", "<BR>") .. "</P>\n") end + if myform.descr then io.write('<p>' .. string.gsub(html.html_escape(myform.descr), "\n", "<br/>") .. "</p>\n") end + if myform.errtxt then io.write('<p class="error">' .. string.gsub(html.html_escape(myform.errtxt), "\n", "<br/>") .. "</p>\n") end io.write('<form action="' .. html.html_escape(myform.action) .. '" ') if myform.enctype and myform.enctype ~= "" then io.write('enctype="'..html.html_escape(myform.enctype)..'" ') @@ -226,7 +225,6 @@ end function displayformend(myform) if not myform then return end local option = myform.submit or myform.option - io.write('<DT></DT><DD>') if type(option) == "table" then for i,v in ipairs(option) do io.write('<input class="submit" type="submit" name="submit" value="' .. html.html_escape(v) .. '">\n') @@ -234,9 +232,7 @@ function displayformend(myform) else io.write('<input class="submit" type="submit" name="submit" value="' .. html.html_escape(myform.submit or myform.option) .. '">\n') end - io.write('</DD>\n') - io.write('</FORM>') - io.write('</DL>\n') + io.write('</form>') end function displayform(myform, order, finishingorder, page_info, header_level) |