Cleanup HTML including removing DL/DT/DD, use tablesorter where possible, and use lowercase tags

1 files changed, 56 insertions, 34 deletions

diff --git a/openvpn-viewconfig-html.lsp b/openvpn-viewconfig-html.lsp
index 5b76598..cbb4ae0 100644
--- a/openvpn-viewconfig-html.lsp
+++ b/openvpn-viewconfig-html.lsp
@@ -6,72 +6,94 @@
 <h1><%= html.html_escape(format.cap_begin_word(view.value.type)) %> Config</h1>
 
 <h2><%= html.html_escape(format.cap_begin_word(view.value.type)) %> settings</h2>
-<dl>
-<dt>Mode</dt>
-<dd><%= html.html_escape(view.value.type) %></dd>
+<div class='item'><p class='left'>Mode</p>
+<div class='right'>
+<%= html.html_escape(view.value.type) %>
+</div></div><!-- end .item -->
 
-<dt>User device</dt>
-<dd><%= html.html_escape(view.value.dev) %></dd>
+<div class='item'><p class='left'>User device</p>
+<div class='right'>
+<%= html.html_escape(view.value.dev) %>
+</div></div><!-- end .item -->
 
 <% if view.value.type == "server" then %>
-<dt>Listens on</dt>
-<dd><%= html.html_escape(view.value["local"]) %>:<%= html.html_escape(view.value.port) %> (<%= html.html_escape(view.value.proto) %>)</dd>
+<div class='item'><p class='left'>Listens on</p>
+<div class='right'>
+<%= html.html_escape(view.value["local"]) %>:<%= html.html_escape(view.value.port) %> (<%= html.html_escape(view.value.proto) %>)
+</div></div><!-- end .item -->
 <% end %>
 
 <% if view.value.type == "client" then %>
-<dt>Remote server</dt>
-<dd><% if string.find(view.value.remote, "%s") then io.write(html.html_escape(string.gsub(view.value.remote, "%s+", ":"))) else io.write(html.html_escape(view.value.remote .. (view.value.rport or view.value.port or "1194"))) end %> (<%= html.html_escape(view.value.proto) %>)</dd>
+<div class='item'><p class='left'>Remote server</p>
+<div class='right'>
+<% if string.find(view.value.remote, "%s") then io.write(html.html_escape(string.gsub(view.value.remote, "%s+", ":"))) else io.write(html.html_escape(view.value.remote .. (view.value.rport or view.value.port or "1194"))) end %> (<%= html.html_escape(view.value.proto) %>)
+</div></div><!-- end .item -->
 <% end %>
 
-<dt>Logfile</dt>
-<dd><% if ( view.value.log ) then %><%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/logfile?name=" .. view.value.name, label=view.value.log } %><% else %>Syslog<% end %> (Verbosity level: <%= html.html_escape(view.value.verb) %>)</dd>
-</dl>
+<div class='item'><p class='left'>Logfile</p>
+<div class='right'>
+<% if ( view.value.log ) then %><%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/logfile?name=" .. view.value.name, label=view.value.log } %><% else %>Syslog<% end %> (Verbosity level: <%= html.html_escape(view.value.verb) %>)
+</div></div><!-- end .item -->
 
 <% if view.value.type == "server" then %>
 <h3>Connected clients status</h3>
-<dl>
-<dt>Last status was recorded</dt>
-<dd><%= html.html_escape(view.value.client_lastupdate) %> (This was <b><%= html.html_escape(view.value.client_lastdatechangediff) %></b> ago)</dd>
+<div class='item'><p class='left'>Last status was recorded</p>
+<div class='right'>
+<%= html.html_escape(view.value.client_lastupdate) %> (This was <b><%= html.html_escape(view.value.client_lastdatechangediff) %></b> ago)
+</div></div><!-- end .item -->
 
-<dt>Maximum clients</dt>
-<dd><%= html.html_escape(view.value["max-clients"]) %></dd>
+<div class='item'><p class='left'>Maximum clients</p>
+<div class='right'>
+<%= html.html_escape(view.value["max-clients"]) %>
+</div></div><!-- end .item -->
 
-<dt>Connected clients</dt>
-<dd><%= html.html_escape(view.value.client_count) %></dd>
-</dl>
+<div class='item'><p class='left'>Connected clients</p>
+<div class='right'>
+<%= html.html_escape(view.value.client_count) %>
+</div></div><!-- end .item -->
 <% end %>
 
 <% if view.value.dh or view.value.ca or view.value.cert or view.value.key or view.value.tls or view.value.crl then %>
 <h2>Certificate files</h2>
-<dl>
 <% if (view.value.dh) then %>
-<dt>DH</dt>
-<dd><%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/viewcert?cert=" .. view.value.dh, label=view.value.dh } %></dd>
+<div class='item'><p class='left'>DH</p>
+<div class='right'>
+<%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/viewcert?cert=" .. view.value.dh, label=view.value.dh } %>
+</div></div><!-- end .item -->
 <% end %>
 
 <% if (view.value.ca) then %>
-<dt>CA Certificate</dt>
-<dd><%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/viewcert?cert=" .. view.value.ca, label=view.value.ca } %></dd>
+<div class='item'><p class='left'>CA Certificate</p>
+<div class='right'>
+<%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/viewcert?cert=" .. view.value.ca, label=view.value.ca } %>
+</div></div><!-- end .item -->
 <% end %>
 
 <% if (view.value.cert) then %>
-<dt>Certificate</dt>
-<dd><%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/viewcert?cert=" .. view.value.cert, label=view.value.cert } %></dd>
+<div class='item'><p class='left'>Certificate</p>
+<div class='right'>
+<%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/viewcert?cert=" .. view.value.cert, label=view.value.cert } %>
+</div></div><!-- end .item -->
 <% end %>
 
 <% if (view.value.key) then %>
-<dt>Private Key</dt>
-<dd><%= html.html_escape(view.value.key) %></dd>
+<div class='item'><p class='left'>Private Key</p>
+<div class='right'>
+<%= html.html_escape(view.value.key) %>
+</div></div><!-- end .item -->
 <% end %>
 
 <% if (view.value.tls) then %>
-<dt>TLS Authentication</dt>
-<dd><%= html.html_escape(view.value.tls) %><% -- html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/pem_info?name=" .. view.value.tls  , label=view.value.tls } %></dd>
+<div class='item'><p class='left'>TLS Authentication</p>
+<div class='right'>
+<%= html.html_escape(view.value.tls) %><% -- html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/pem_info?name=" .. view.value.tls  , label=view.value.tls } %>
+</div></div><!-- end .item -->
 <% end %>
 
 <% if (view.value.crl) then %>
-<dt>CRL Verify File</dt>
-<dd><%= html.html_escape(view.value.crl) %><% -- html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/pem_info?name=" .. view.value.crl  , label=view.value.crl } %></dd>
+<div class='item'><p class='left'>CRL Verify File</p>
+<div class='right'>
+<%= html.html_escape(view.value.crl) %><% -- html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/pem_info?name=" .. view.value.crl  , label=view.value.crl } %>
+</div></div><!-- end .item -->
 <% end %>
-</dl>
 <% end %>