From 067d7dc9f708d5ebeda1072fb6dc82e960de0d81 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 28 May 2018 14:57:54 +0200 Subject: treewide: convert HTML tables to div Mostly convert HTML tables to div based markup to allow for easier styling in the future. Also change JS accessor code accordingly. Signed-off-by: Jo-Philipp Wich --- .../luasrc/view/admin_status/splash.htm | 74 +++++++++++----------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'applications/luci-app-splash/luasrc/view/admin_status') diff --git a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm index 37f67776aa..aad330791d 100644 --- a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm +++ b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm @@ -145,19 +145,19 @@ end { var s = ''; if (info.length == undefined) { - s += '
<%:No clients connected%>
' + s += '

<%:No clients connected%>
' }; for (var idx = 0; idx < info.length; idx++) { var splash = info[idx]; s += String.format( - '' + - '%s' + - '%s' + - '%s' + - '%s' + - '%s/%s' + - '', + '
' + + '
%s
' + + '
%s
' + + '
%s
' + + '
%s
' + + '
%s/%s
' + + '
', splash.hostname, splash.ip, splash.mac, splash.timeleft, splash.trafficin, splash.trafficout); <% if is_admin then %> @@ -185,7 +185,7 @@ end <% else %> s += String.format('%s', splash.policy); <% end %> - s += '' + s += '
' } tbody.innerHTML = s; } @@ -200,18 +200,18 @@ end <%:Active Clients%>
<% if is_admin then %>
<% end %> - - - - - - - - - - - - +
+
+
+
<%:Hostname%>
+
<%:IP Address%>
+
<%:MAC Address%>
+
<%:Time remaining%>
+
<%:Traffic in/out%>
+
<%:Policy%>
+
+
+
<%- local count = 0 @@ -227,16 +227,16 @@ end if c.ip then count = count + 1 -%> -
- - - - - - - + + <%- end end if count == 0 then -%> - - - + + <%- end -%> - -
<%:Hostname%><%:IP Address%><%:MAC Address%><%:Time remaining%><%:Traffic in/out%><%:Policy%>
<%=c.hostname or "" .. translate("unknown") .. ""%><%=c.ip or "" .. translate("unknown") .. ""%><%=showmac(c.mac)%><%= +
+
<%=c.hostname or "" .. translate("unknown") .. ""%>
+
<%=c.ip or "" .. translate("unknown") .. ""%>
+
<%=showmac(c.mac)%>
+
<%= (c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or (c.policy ~= "normal") and "-" or "" .. translate("expired") .. "" - %>
<%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%> + %> +
<%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%>
+
<% if is_admin then %>
+
+

<%:No clients connected%>
-
+
+ <% if is_admin then %><% end %> -- cgit v1.2.3