summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-splash/luasrc
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-05-28 14:57:54 +0200
committerJo-Philipp Wich <jo@mein.io>2018-05-28 15:18:45 +0200
commit067d7dc9f708d5ebeda1072fb6dc82e960de0d81 (patch)
tree10910cfcfc1d86a3f88d8b3239316564489585ea /applications/luci-app-splash/luasrc
parent79c82237e373b9d9a101858e0cab96e4bd548f0c (diff)
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 <jo@mein.io>
Diffstat (limited to 'applications/luci-app-splash/luasrc')
-rw-r--r--applications/luci-app-splash/luasrc/view/admin_status/splash.htm74
1 files changed, 37 insertions, 37 deletions
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 37f67776a..aad330791 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 += '<tr class="cbi-section-table-row"><td colspan="7" class="cbi-section-table-cell"><br /><em><%:No clients connected%></em><br /></td></tr>'
+ s += '<div class="tr cbi-section-table-row"><div colspan="7" class="td cbi-section-table-cell"><br /><em><%:No clients connected%></em><br /></div></div>'
};
for (var idx = 0; idx < info.length; idx++)
{
var splash = info[idx];
s += String.format(
- '<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+'">' +
- '<td class="cbi-section-table-cell">%s</td>' +
- '<td class="cbi-section-table-cell">%s</td>' +
- '<td class="cbi-section-table-cell">%s</td>' +
- '<td class="cbi-section-table-cell">%s</td>' +
- '<td class="cbi-section-table-cell">%s/%s</td>' +
- '<td class="cbi-section-table-cell">',
+ '<div class="tr cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+'">' +
+ '<div class="td cbi-section-table-cell">%s</div>' +
+ '<div class="td cbi-section-table-cell">%s</div>' +
+ '<div class="td cbi-section-table-cell">%s</div>' +
+ '<div class="td cbi-section-table-cell">%s</div>' +
+ '<div class="td cbi-section-table-cell">%s/%s</div>' +
+ '<div class="td cbi-section-table-cell">',
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 += '</td></tr>'
+ s += '</div></div>'
}
tbody.innerHTML = s;
}
@@ -200,18 +200,18 @@ end
<legend><%:Active Clients%></legend>
<div class="cbi-section-node">
<% if is_admin then %><form action="<%=REQUEST_URI%>" method="post"><input type="hidden" name="token" value="<%=token%>" /><% end %>
- <table class="cbi-section-table">
- <thead>
- <tr class="cbi-section-table-titles">
- <th class="cbi-section-table-cell"><%:Hostname%></th>
- <th class="cbi-section-table-cell"><%:IP Address%></th>
- <th class="cbi-section-table-cell"><%:MAC Address%></th>
- <th class="cbi-section-table-cell"><%:Time remaining%></th>
- <th class="cbi-section-table-cell"><%:Traffic in/out%></th>
- <th class="cbi-section-table-cell"><%:Policy%></th>
- </tr>
- </thead>
- <tbody id="splash_table">
+ <div class="table cbi-section-table">
+ <div class="thead">
+ <div class="tr cbi-section-table-titles">
+ <div class="th cbi-section-table-cell"><%:Hostname%></div>
+ <div class="th cbi-section-table-cell"><%:IP Address%></div>
+ <div class="th cbi-section-table-cell"><%:MAC Address%></div>
+ <div class="th cbi-section-table-cell"><%:Time remaining%></div>
+ <div class="th cbi-section-table-cell"><%:Traffic in/out%></div>
+ <div class="th cbi-section-table-cell"><%:Policy%></div>
+ </div>
+ </div>
+ <div class="tbody" id="splash_table">
<%-
local count = 0
@@ -227,16 +227,16 @@ end
if c.ip then
count = count + 1
-%>
- <tr class="cbi-section-table-row cbi-rowstyle-<%=2-(count%2)%>">
- <td class="cbi-section-table-cell"><%=c.hostname or "<em>" .. translate("unknown") .. "</em>"%></td>
- <td class="cbi-section-table-cell"><%=c.ip or "<em>" .. translate("unknown") .. "</em>"%></td>
- <td class="cbi-section-table-cell"><%=showmac(c.mac)%></td>
- <td class="cbi-section-table-cell"><%=
+ <div class="tr cbi-section-table-row cbi-rowstyle-<%=2-(count%2)%>">
+ <div class="td cbi-section-table-cell"><%=c.hostname or "<em>" .. translate("unknown") .. "</em>"%></div>
+ <div class="td cbi-section-table-cell"><%=c.ip or "<em>" .. translate("unknown") .. "</em>"%></div>
+ <div class="td cbi-section-table-cell"><%=showmac(c.mac)%></div>
+ <div class="td cbi-section-table-cell"><%=
(c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or
(c.policy ~= "normal") and "-" or "<em>" .. translate("expired") .. "</em>"
- %></td>
- <td class="cbi-section-table-cell"><%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%></td>
- <td class="cbi-section-table-cell">
+ %></div>
+ <div class="td cbi-section-table-cell"><%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%></div>
+ <div class="td cbi-section-table-cell">
<% if is_admin then %>
<select name="policy.<%=c.mac:lower()%>" style="width:200px">
<option value="whitelist"<%=c.policy=="whitelist" and ' selected="selected"'%>><%:whitelisted%></option>
@@ -250,21 +250,21 @@ end
<% else %>
<%=c.policy%>
<% end %>
- </td>
- </tr>
+ </div>
+ </div>
<%-
end
end
if count == 0 then
-%>
- <tr class="cbi-section-table-row">
- <td colspan="7" class="cbi-section-table-cell">
+ <div class="tr cbi-section-table-row">
+ <div colspan="7" class="td cbi-section-table-cell">
<br /><em><%:No clients connected%></em><br />
- </td>
- </tr>
+ </div>
+ </div>
<%- end -%>
- </tbody>
- </table>
+ </div>
+ </div>
<% if is_admin then %></form><% end %>
</div>
</fieldset>