luci-mod-admin-full: cleanup markup

[project/luci.git] / modules / luci-mod-admin-full / luasrc / view / admin_network / wifi_join.htm

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
index e9cfb3e85b278b1d7dfe35d182584fe7a73f4f95..9b93942c887db83ef589fcca7e82c6d881a86239 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -90,25 +90,43 @@
 <h2 name="content"><%:Join Network: Wireless Scan%></h2>
 
 <div class="cbi-map">
-       <fieldset class="cbi-section">
-               <div class="table cbi-section-table" style="empty-cells:hide">
+       <div class="cbi-section">
+               <div class="table">
+                       <div class="tr table-titles">
+                               <div class="th col-1 center"><%:Signal%></div>
+                               <div class="th col-5 left"><%:SSID%></div>
+                               <div class="th col-2 center"><%:Channel%></div>
+                               <div class="th col-2 left"><%:Mode%></div>
+                               <div class="th col-3 left"><%:BSSID%></div>
+                               <div class="th col-2 left"><%:Encryption%></div>
+                               <div class="th cbi-section-actions">&#160;</div>
+                       </div>
+
                        <!-- scan list -->
                        <% for i, net in ipairs(scanlist(3)) do net.encryption = net.encryption or { } %>
-                       <div class="tr cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
-                               <div class="td cbi-value-field" style="width:16px; padding:3px">
+                       <div class="tr cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
+                               <div class="td col-1 center">
                                        <abbr title="<%:Signal%>: <%=net.signal%> <%:dB%> / <%:Quality%>: <%=net.quality%>/<%=net.quality_max%>">
                                                <img src="<%=guess_wifi_signal(net)%>" /><br />
                                                <small><%=percent_wifi_signal(net)%>%</small>
                                        </abbr>
                                </div>
-                               <div class="td cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
-                                       <big><strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong></big><br />
-                                       <strong>Channel:</strong> <%=net.channel%> |
-                                       <strong>Mode:</strong> <%=net.mode%> |
-                                       <strong>BSSID:</strong> <%=net.bssid%> |
-                                       <strong>Encryption:</strong> <%=format_wifi_encryption(net.encryption)%>
+                               <div class="td col-5 left" data-title="<%:SSID%>">
+                                       <strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong>
+                               </div>
+                               <div class="td col-2 center" data-title="<%:Channel%>">
+                                       <%=net.channel%>
+                               </div>
+                               <div class="td col-2 left" data-title="<%:Mode%>">
+                                       <%=net.mode%>
+                               </div>
+                               <div class="td col-3 left" data-title="<%:BSSID%>">
+                                       <%=net.bssid%>
+                               </div>
+                               <div class="td col-2 left" data-title="<%:Encryption%>">
+                                       <%=format_wifi_encryption(net.encryption)%>
                                </div>
-                               <div class="td cbi-value-field" style="width:40px">
+                               <div class="td cbi-section-actions">
                                        <form action="<%=url('admin/network/wireless_join')%>" method="post">
                                                <input type="hidden" name="token" value="<%=token%>" />
                                                <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
@@ -126,23 +144,23 @@
 
                                                <input type="hidden" name="clbridge" value="<%=iw.type == "wl" and 1 or 0%>" />
 
-                                               <input class="cbi-button cbi-button-apply" type="submit" value="<%:Join Network%>" />
+                                               <input class="cbi-button cbi-button-action important" type="submit" value="<%:Join Network%>" />
                                        </form>
                                </div>
                        </div>
                        <% end %>
                        <!-- /scan list -->
                </div>
-       </fieldset>
+       </div>
 </div>
 <div class="cbi-page-actions right">
        <form class="inline" action="<%=url("admin/network/wireless")%>" method="get">
-               <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>" />
+               <input class="cbi-button cbi-button-neutral" type="submit" value="<%:Back to overview%>" />
        </form>
        <form class="inline" action="<%=url('admin/network/wireless_join')%>" method="post">
                <input type="hidden" name="token" value="<%=token%>" />
                <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
-               <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>" />
+               <input class="cbi-button cbi-button-action" type="submit" value="<%:Repeat scan%>" />
        </form>
 </div>