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/freifunk/contact.htm | 30 ++++---- .../luasrc/view/freifunk/public_status.htm | 84 +++++++++++----------- 2 files changed, 57 insertions(+), 57 deletions(-) (limited to 'modules/luci-mod-freifunk/luasrc/view/freifunk') diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm index 1add595c6c..dca35376cb 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm @@ -31,33 +31,33 @@ end
<%:Operator%> - - - - - - -
<%:Nickname%>:<%=nickname%>
<%:Realname%>:<%=name%>
<%:Homepage%>: +
+
<%:Nickname%>:
<%=nickname%>
+
<%:Realname%>:
<%=name%>
+
<%:Homepage%>:
<% for k, v in ipairs(homepage) do %> <%=v%>
<% end %> -
<%:E-Mail%>:<%=mail%>
<%:Phone%>:<%=phone%>
+ +
<%:E-Mail%>:
<%=mail%>
+
<%:Phone%>:
<%=phone%>
+
<%:Location%> - - - -
<%:Location%>:<%=location%>
<%:Coordinates%>:<%=lat%> <%=lon%> ("><%:Show on map%>)
+
+
<%:Location%>:
<%=location%>
+
<%:Coordinates%>:
<%=lat%> <%=lon%> ("><%:Show on map%>)
+
<% if note then %>
<%:Notice%> - - -
<%=note%>
+
+
<%=note%>
+
<%end%> diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm index 1dc1d8b0d1..a71926141b 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm @@ -246,17 +246,17 @@ end
- - - - - - - - - - - +
+
+
<%:Signal%>
+
<%:Bitrate%>
+
<%:SSID%>
+
<%:BSSID%>
+
<%:Channel%>
+
<%:Mode%>
+
<%:TX%>-<%:Power%>
+
<%:Interface%>
+
<% for _, dev in ipairs(devices) do local net @@ -301,20 +301,20 @@ end end local interface = net.iwinfo.ifname or "N/A" %> -
- - - - - - - - - +
+
<%=signal_string%>
+
<%=bitrate%>
+
<%=ssid%>
+
<%=bssid%>
+
<%=chan%>
+
<%=mode%>
+
<%=txpwr%>
+
<%=interface%>
+
<% end end end %> -
<%:Signal%><%:Bitrate%><%:SSID%><%:BSSID%><%:Channel%><%:Mode%><%:TX%>-<%:Power%><%:Interface%>
<%=signal_string%><%=bitrate%><%=ssid%><%=bssid%><%=chan%><%=mode%><%=txpwr%><%=interface%>
+
@@ -328,35 +328,35 @@ end <% if not def4 and not def6 then %> <%:No default routes known.%> <%else%> - - - - - - - +
+
+
<%:Network%>
+
<%:Interface%>
+
<%:Gateway%>
+
<%:Metric%>
+
<% if def4 then %> -
- - - - - +
+
<%=def4.dest%>
+
<%=def4.dev%>
+
<%=def4.gateway%>
+
<%=def4.metr%>
+
<% end if def6 then %> - - - - - - +
+
<%=def6.dest%>
+
<%=def6.dev%>
+
<%=def6.gateway%>
+
<%=def6.metr%>
+
<% end %> -
<%:Network%><%:Interface%><%:Gateway%><%:Metric%>
<%=def4.dest%><%=def4.dev%><%=def4.gateway%><%=def4.metr%>
<%=def6.dest%><%=def6.dev%><%=def6.gateway%><%=def6.metr%>
+ <% end %> -- cgit v1.2.3