From f3924b39a0ace447a8a0ecdbfd0a1a76cb7264d8 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Thu, 10 Dec 2009 15:22:54 +0000
Subject: UI fix, bumped to 0.2.1

---
 Makefile                          |  2 +-
 openssl-checkenvironment-html.lsp | 16 ++++++++--------
 openssl-html.lsp                  |  9 ++++++++-
 openssl-status-html.lsp           |  6 +-----
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 613dfc7..a992231 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 APP_NAME=openssl
 PACKAGE=acf-$(APP_NAME)
-VERSION=0.2.0
+VERSION=0.2.1
 
 APP_DIST=\
 	openssl*.lua \
diff --git a/openssl-checkenvironment-html.lsp b/openssl-checkenvironment-html.lsp
index cddd596..0ea7a1e 100644
--- a/openssl-checkenvironment-html.lsp
+++ b/openssl-checkenvironment-html.lsp
@@ -1,16 +1,16 @@
 <% local form, viewlibrary, page_info = ... %>
 <% require("viewfunctions") %>
 
-<% --[[ DEBUG INFORMATION
-io.write(html.cfe_unpack(form))
---]] %>
-
 <H1><%= html.html_escape(form.label) %></H1>
-<DL>
-<% displayitem(form.value.status) %>
-</DL>
 <% if form.value.status.errtxt then
 	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
 	displayformstart(form)
+else %>
+	<DL>
+<% end %>
+<% displayitem(form.value.status) %>
+<% if form.value.status.errtxt then
 	displayformend(form)
-end %>
+else %>
+	</DL>
+<% end %>
diff --git a/openssl-html.lsp b/openssl-html.lsp
index bd2ed7e..110c867 100644
--- a/openssl-html.lsp
+++ b/openssl-html.lsp
@@ -19,6 +19,7 @@ io.write(html.cfe_unpack(view))
 <% displaycommandresults({"approve", "deleterequest", "deletemyrequest", "renewcert", "requestrenewcert", "revoke", "deletecert"}, session) %>
 
 <H1>Pending certificate requests<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></H1>
+<DL>
 <% if not view.value.pending or #view.value.pending.value == 0 then %>
 	No certificates pending
 <% else %>
@@ -55,6 +56,7 @@ io.write(html.cfe_unpack(view))
 </tbody>
 </table>
 <% end %>
+</DL>
 
 <% local reverserevoked = {}
 local approved = {}
@@ -75,6 +77,7 @@ else
 end %>
 	
 <H1>Approved certificate requests<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></H1>
+<DL>
 <% if #approved == 0 then %>
 	No certificates approved
 <% else %>
@@ -121,8 +124,10 @@ end %>
 <tbody>
 </table>
 <% end %>
+</DL>
 
 <H1>Revoked certificates<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></H1>
+<DL>
 <% if #revoked == 0 then %>
 	No certificates revoked
 <% else %>
@@ -159,11 +164,13 @@ end %>
 </tbody>
 </table>
 <% end %>
+</DL>
 
 <% if session.permissions.openssl.getrevoked then %>
 <H1>Get revoked list (crl)</H1>
+<DL>
 <%= html.link{value="getrevoked?crltype=PEM", label="Download PEM "} %><BR>
 <%= html.link{value="getrevoked?crltype=DER", label="Download DER "} %><BR>
 <%= html.link{value="getrevoked", label="Import to Firefox"} %><BR>
-
+</DL>
 <% end %>
diff --git a/openssl-status-html.lsp b/openssl-status-html.lsp
index 68623da..decc991 100644
--- a/openssl-status-html.lsp
+++ b/openssl-status-html.lsp
@@ -1,10 +1,6 @@
 <% local view, viewlibrary, pageinfo, session = ... %>
 <% require("viewfunctions") %>
 
-<% --[[ DEBUG INFORMATION
-io.write(html.cfe_unpack(view))
---]] %>
-
 <% displaycommandresults({"checkenvironment", "putcacert", "generatecacert"}, session, true) %>
 
 <H1>System Info</H1>
@@ -26,7 +22,7 @@ io.write(html.cfe_unpack(view))
 		end
 	elseif not view.value.cacert.errtxt and not view.value.cakey.errtxt then %>
 <H1>CA Certificate contents</H1>
-<pre><%= html.html_escape(view.value.cacertcontents.value) %></pre>
+<DL><pre><%= html.html_escape(view.value.cacertcontents.value) %></pre></DL>
 	<% elseif viewlibrary and viewlibrary.dispatch_component then
 		if session.permissions.openssl.putcacert then
 			viewlibrary.dispatch_component("putcacert")
-- 
cgit v1.2.3