From 0d87bb5527f504012fa877a988f1a3e7591ba584 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 3 Feb 2014 21:43:24 +0000 Subject: Cleanup HTML including removing DL/DT/DD, use tablesorter where possible, and use lowercase tags --- openssh-connectedpeers-html.lsp | 54 ++++++++++++++++++++--------------------- openssh-listauth-html.lsp | 52 ++++++++++++++++++++++++++------------- openssh-listusers-html.lsp | 10 ++++---- 3 files changed, 67 insertions(+), 49 deletions(-) diff --git a/openssh-connectedpeers-html.lsp b/openssh-connectedpeers-html.lsp index aa8b1fa..9740e72 100644 --- a/openssh-connectedpeers-html.lsp +++ b/openssh-connectedpeers-html.lsp @@ -2,47 +2,47 @@ html = require("acf.html") %> -

Connected peers

+

Connected peers

<% if #data == 0 then - io.write("No peers found\n") + io.write("

No peers found

\n") end local col1="180px" for k,v in pairs(data) do - io.write("

" .. html.html_escape(v.host)) + io.write("

" .. html.html_escape(v.host)) if v.name and v.name ~= v.host then io.write(" - "..html.html_escape(v.name)) end - io.write("

\n") - io.write("
") + io.write("\n") + io.write("
") for i=1, v.cnt do - io.write("") + io.write("") if (v.tty[i]) then - io.write("") - io.write("\n") else - io.write("") - io.write("\n") end - io.write("") + io.write("") end - io.write("
\n") - io.write("") - io.write("\n") - io.write("\n") - io.write("\n") - io.write("\n") + io.write("") + io.write("\n") + io.write("
Session user:".. html.html_escape(v.tty[i].user) .. "
Session TTY:".. html.html_escape(v.tty[i].tty) .. "
Session Started:".. html.html_escape(v.tty[i].time) .. "
Session Idle:".. html.html_escape(v.tty[i].idle) .. "
\n") + io.write("") + io.write("\n") + io.write("\n") + io.write("\n") + io.write("\n") - io.write("
Session user:".. html.html_escape(v.tty[i].user) .. "
Session TTY:".. html.html_escape(v.tty[i].tty) .. "
Session Started:".. html.html_escape(v.tty[i].time) .. "
Session Idle:".. html.html_escape(v.tty[i].idle) .. "
") - io.write("
") + io.write("		\n") - io.write("") - io.write("\n") - io.write("\n") - io.write("\n") - io.write("\n") - io.write("\n") + io.write("") + io.write("\n") + io.write("
Session user:No records
Session TTY:No records
Session Started:No records
Session Idle:No records
Other:This could be a sshfs session
\n") + io.write("") + io.write("\n") + io.write("\n") + io.write("\n") + io.write("\n") + io.write("\n") - io.write("
Session user:No records
Session TTY:No records
Session Started:No records
Session Idle:No records
Other:This could be a sshfs session
") - io.write("
") + io.write("
") + io.write("") end %> diff --git a/openssh-listauth-html.lsp b/openssh-listauth-html.lsp index de89648..8d8ebad 100644 --- a/openssh-listauth-html.lsp +++ b/openssh-listauth-html.lsp @@ -2,31 +2,49 @@ <% htmlviewfunctions = require("htmlviewfunctions") %> <% html = require("acf.html") %> + + + + + + <% htmlviewfunctions.displaycommandresults({"deleteauth"}, session) %> <% htmlviewfunctions.displaycommandresults({"addauth"}, session, true) %> -

Authorized Keys for <%= html.html_escape(view.value.user.value) %>

-
- - - - - +

Authorized Keys for <%= html.html_escape(view.value.user.value) %>

+
ActionIDKey
+ + + + + + <% for i,auth in ipairs(view.value.auth.value) do %> - - + - - - + + + + <% end %> -
ActionIDKey
-
" method="POST"> +
+" method="post"> - + - <%= html.html_escape(auth.id) %><% if #auth.key>32 then io.write(html.html_escape(string.sub(auth.key,0,16)) .. " ... " .. html.html_escape(string.sub(auth.key, -16))) else io.write(html.html_escape(auth.key)) end %>
<%= html.html_escape(auth.id) %><% if #auth.key>32 then io.write(html.html_escape(string.sub(auth.key,0,16)) .. " ... " .. html.html_escape(string.sub(auth.key, -16))) else io.write(html.html_escape(auth.key)) end %>
+

In order to preserve keys with lbu, you must add /<% if view.value.user.value ~= "root" then io.write("home/") end %><%= view.value.user.value %>/.ssh/authorized_keys to lbu include -

<% viewlibrary.dispatch_component("addauth", {user=view.value.user.value}) %> diff --git a/openssh-listusers-html.lsp b/openssh-listusers-html.lsp index 23b14a3..69c80e0 100644 --- a/openssh-listusers-html.lsp +++ b/openssh-listusers-html.lsp @@ -1,10 +1,10 @@ <% local view, viewlibrary, page_info, session = ... %> <% html = require("acf.html") %> -

System User Accounts

-
+

System User Accounts

<% for i,user in ipairs(view.value) do %> -
<%= html.html_escape(user) %>
-
Edit this account
+
<%= html.html_escape(user) %>
+
+ Edit this account +
<% end %> -
-- cgit v1.2.3