diff options
| -rw-r--r-- | openssl-checkenvironment-html.lsp | 18 | ||||
| -rw-r--r-- | openssl-putcacert-html.lsp | 2 | ||||
| -rw-r--r-- | openssl-read-html.lsp | 28 | ||||
| -rw-r--r-- | openssl-status-html.lsp | 24 | ||||
| -rw-r--r-- | openssl-viewcert-html.lsp | 2 | ||||
| -rw-r--r-- | openssl-viewrequest-html.lsp | 2 |
6 files changed, 32 insertions, 44 deletions
diff --git a/openssl-checkenvironment-html.lsp b/openssl-checkenvironment-html.lsp index 2e4f9c4..3475bbc 100644 --- a/openssl-checkenvironment-html.lsp +++ b/openssl-checkenvironment-html.lsp @@ -2,16 +2,14 @@ <% htmlviewfunctions = require("htmlviewfunctions") %> <% html = require("acf.html") %> -<H1><%= html.html_escape(form.label) %></H1> -<% if form.value.status.errtxt then +<h1><%= html.html_escape(form.label) %></h1> +<% +if form.value.status.errtxt then form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action htmlviewfunctions.displayformstart(form) -else %> - <DL> -<% end %> -<% htmlviewfunctions.displayitem(form.value.status) %> -<% if form.value.status.errtxt then +end +htmlviewfunctions.displayitem(form.value.status) +if form.value.status.errtxt then htmlviewfunctions.displayformend(form) -else %> - </DL> -<% end %> +end +%> diff --git a/openssl-putcacert-html.lsp b/openssl-putcacert-html.lsp index a4a0609..1d178fe 100644 --- a/openssl-putcacert-html.lsp +++ b/openssl-putcacert-html.lsp @@ -2,7 +2,7 @@ <% htmlviewfunctions = require("htmlviewfunctions") %> <% html = require("acf.html") %> -<H1><%= html.html_escape(form.label) %></H1> +<h1><%= html.html_escape(form.label) %></h1> <% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action form.enctype = "multipart/form-data" diff --git a/openssl-read-html.lsp b/openssl-read-html.lsp index 25fa297..a3dd4b3 100644 --- a/openssl-read-html.lsp +++ b/openssl-read-html.lsp @@ -16,18 +16,17 @@ <script type="text/javascript"> $(document).ready(function() { - $("#pending").tablesorter({headers: {0:{sorter: false}}}); - $("#approved").tablesorter({headers: {0:{sorter: false}, 5:{sorter:'usLongDate'}}}); - $("#revoked").tablesorter({headers: {0:{sorter: false}, 5:{sorter:'usLongDate'}}}); + $("#pending").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']}); + $("#approved").tablesorter({headers: {0:{sorter: false}, 5:{sorter:'usLongDate'}}, widgets: ['zebra']}); + $("#revoked").tablesorter({headers: {0:{sorter: false}, 5:{sorter:'usLongDate'}}, widgets: ['zebra']}); }); </script> <% htmlviewfunctions.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> +<h1>Pending certificate requests<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></h1> <% if not view.value.pending or #view.value.pending.value == 0 then %> - No certificates pending + <p>No certificates pending</p> <% else %> <table id="pending" class="tablesorter"> <thead> @@ -62,7 +61,6 @@ </tbody> </table> <% end %> -</DL> <% local reverserevoked = {} local approved = {} @@ -82,10 +80,9 @@ else approved = view.value.approved.value end %> -<H1>Approved certificate requests<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></H1> -<DL> +<h1>Approved certificate requests<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></h1> <% if #approved == 0 then %> - No certificates approved + <p>No certificates approved</p> <% else %> <table id="approved" class="tablesorter"> <thead> @@ -130,12 +127,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> +<h1>Revoked certificates<% if view.value.user then%> for <%= html.html_escape(view.value.user.value) %><% end %></h1> <% if #revoked == 0 then %> - No certificates revoked + <p>No certificates revoked</p> <% else %> <table id="revoked" class="tablesorter"> <thead> @@ -170,12 +165,9 @@ end %> </tbody> </table> <% end %> -</DL> <% if viewlibrary.check_permission("getrevoked") then %> -<H1>Get revoked list (crl)</H1> -<DL> +<h1>Get revoked list (crl)</h1> <%= html.link{value="getrevoked?viewtype=stream&crltype=PEM", label="Download PEM "} %><BR> <%= html.link{value="getrevoked?viewtype=stream&crltype=DER", label="Download DER "} %><BR> -</DL> <% end %> diff --git a/openssl-status-html.lsp b/openssl-status-html.lsp index 2a3e44f..cb02df8 100644 --- a/openssl-status-html.lsp +++ b/openssl-status-html.lsp @@ -5,22 +5,22 @@ <% htmlviewfunctions.displaycommandresults({"checkenvironment", "putcacert", "generatecacert"}, session, true) %> <% htmlviewfunctions.displaycommandresults({"install"}, session) %> -<H1>System Info</H1> -<DL> +<h1>System Info</h1> <% htmlviewfunctions.displayitem(view.value.version) if view.value.version and view.value.version.errtxt and viewlibrary.check_permission("apk-tools/apk/install") then %> - <DT>Install package</DT> - <DD><form action="<%= html.html_escape(page_info.script .. "/apk-tools/apk/install") %>" method="POST"> + <div class='item'><p class='left'>Install package</p> + <div class='right'> + <form action="<%= html.html_escape(page_info.script .. "/apk-tools/apk/install") %>" method="post"> <input type='hidden' name='package' value='<%= html.html_escape(view.value.version.name) %>'> - <input class='submit' type='submit' name='submit' value='Install'></form></DD> + <input class='submit' type='submit' name='submit' value='Install'></form> + </div></div><!-- end .item --> <% end %> <% htmlviewfunctions.displayitem(view.value.conffile) %> <% htmlviewfunctions.displayitem(view.value.environment) %> <% htmlviewfunctions.displayitem(view.value.cacert) %> <% htmlviewfunctions.displayitem(view.value.cakey) %> -</DL> <% if not view.value.version.errtxt and not view.value.conffile.errtxt then if view.value.environment.errtxt then @@ -28,8 +28,8 @@ if view.value.version and view.value.version.errtxt and viewlibrary.check_permis viewlibrary.dispatch_component("checkenvironment") end elseif not view.value.cacert.errtxt and not view.value.cakey.errtxt then %> -<H1>CA Certificate contents</H1> -<DL><pre><%= html.html_escape(view.value.cacertcontents.value) %></pre></DL> +<h1>CA Certificate contents</h1> +<pre><%= html.html_escape(view.value.cacertcontents.value) %></pre> <% elseif viewlibrary and viewlibrary.dispatch_component then if viewlibrary.check_permission("putcacert") then viewlibrary.dispatch_component("putcacert") @@ -40,9 +40,7 @@ if view.value.version and view.value.version.errtxt and viewlibrary.check_permis end end %> <% if viewlibrary.check_permission("downloadcacert") then %> -<H1>Download CA Cert</H1> -<DL> -<%= html.link{value="downloadcacert?viewtype=stream&certtype=pem", label="Download PEM"} %><BR> -<%= html.link{value="downloadcacert?viewtype=stream&certtype=der", label="Download DER"} %><BR> -</DL> +<h1>Download CA Cert</h1> +<%= html.link{value="downloadcacert?viewtype=stream&certtype=pem", label="Download PEM"} %><br/> +<%= html.link{value="downloadcacert?viewtype=stream&certtype=der", label="Download DER"} %><br/> <% end %> diff --git a/openssl-viewcert-html.lsp b/openssl-viewcert-html.lsp index 418a1aa..dcfb7d6 100644 --- a/openssl-viewcert-html.lsp +++ b/openssl-viewcert-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary = ... %> <% html = require("acf.html") %> -<H1>Certificate Details</H1> +<h1>Certificate Details</h1> <pre><%= html.html_escape(view.value.value) %></pre> diff --git a/openssl-viewrequest-html.lsp b/openssl-viewrequest-html.lsp index cbd1c45..a4e6440 100644 --- a/openssl-viewrequest-html.lsp +++ b/openssl-viewrequest-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary = ... %> <% html = require("acf.html") %> -<H1>Request Details</H1> +<h1>Request Details</h1> <pre><%= html.html_escape(view.value.value) %></pre> |