Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-travelmate: consolidate markup

Browse source 
Rework the various application view templates to properly render with the
latest responsive design changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-06-19 17:18:36 +02:00
parent ce8101ae75
commit db4139b149
3 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm
View file

@ -6,10 +6,10 @@ This is free software, licensed under the Apache License, Version 2.0
<%+header%> <%+header%>
<div class="cbi-map"> <div class="cbi-map">
<fieldset class="cbi-section"> <div class="cbi-section">
<div class="cbi-section-descr"><%:This form shows the syslog output, pre-filtered for travelmate related messages only.%></div> <div class="cbi-section-descr"><%:This form shows the syslog output, pre-filtered for travelmate related messages only.%></div>
<textarea id="logread_id" style="width: 100%; height: 450px; border: 1px solid #cccccc; padding: 5px; font-size: 12px; font-family: monospace; resize: none;" readonly="readonly" wrap="off" rows="<%=content:cmatch("\n")+2%>"><%=content:pcdata()%></textarea> <textarea id="logread_id" style="width: 100%; height: 450px; border: 1px solid #cccccc; padding: 5px; font-size: 12px; font-family: monospace; resize: none;" readonly="readonly" wrap="off" rows="<%=content:cmatch("\n")+2%>"><%=content:pcdata()%></textarea>
</fieldset> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">

28
applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
View file

@ -11,19 +11,21 @@ This is free software, licensed under the Apache License, Version 2.0
<%+header%> <%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<div class="cbi-map"> <div class="cbi-map">
<div class="cbi-map-descr"> <div class="cbi-map-descr">
<%=translatef("Provides an overview of all configured uplinks for the travelmate interface (%s). You can edit, delete or re-order existing uplinks or scan for a new one. The currently used uplink is emphasized in blue.", trmiface)%> <%=translatef("Provides an overview of all configured uplinks for the travelmate interface (%s). You can edit, delete or re-order existing uplinks or scan for a new one. The currently used uplink is emphasized in blue.", trmiface)%>
</div> </div>
<fieldset class="cbi-section"> <div class="cbi-section">
<div class="table cbi-section-table" style="empty-cells:hide"> <div class="table cbi-section-table">
<div class="tr cbi-section-table-titles"> <div class="tr cbi-section-table-titles">
<div class="th cbi-section-table-cell" style="text-align:left"><%:Device%></div> <div class="th left"><%:Device%></div>
<div class="th cbi-section-table-cell" style="text-align:left"><%:SSID%></div> <div class="th left"><%:SSID%></div>
<div class="th cbi-section-table-cell" style="text-align:left"><%:BSSID%></div> <div class="th left"><%:BSSID%></div>
<div class="th cbi-section-table-cell" style="text-align:left"><%:Encryption%></div> <div class="th left"><%:Encryption%></div>
<div class="th cbi-section-table-cell" style="text-align:center" colspan="2"><%:Actions%></div> <div class="th center">&#160;</div>
</div> </div>
<% <%
uci:foreach("wireless", "wifi-iface", function(s) uci:foreach("wireless", "wifi-iface", function(s)
@ -45,11 +47,9 @@ This is free software, licensed under the Apache License, Version 2.0
<div class="td" style="<%=style%>"><%=ssid%></div> <div class="td" style="<%=style%>"><%=ssid%></div>
<div class="td" style="<%=style%>"><%=bssid%></div> <div class="td" style="<%=style%>"><%=bssid%></div>
<div class="td" style="<%=style%>"><%=encryption%></div> <div class="td" style="<%=style%>"><%=encryption%></div>
<div class="td cbi-value-field" style="width:80px"> <div class="td cbi-section-actions">
<input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/> <input class="cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/>
<input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/> <input class="cbi-button cbi-button-down" type="button" value="<%:Down%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
</div>
<div class="td cbi-value-field" style="width:150px">
<input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/> <input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/>
<input type="button" class="cbi-button cbi-button-remove" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/> <input type="button" class="cbi-button cbi-button-remove" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/>
</div> </div>
@ -59,7 +59,7 @@ This is free software, licensed under the Apache License, Version 2.0
end) end)
%> %>
</div> </div>
</fieldset> </div>
<div class="cbi-page-actions right"> <div class="cbi-page-actions right">
<% <%
uci:foreach("wireless", "wifi-device", function(s) uci:foreach("wireless", "wifi-device", function(s)
@ -68,7 +68,7 @@ This is free software, licensed under the Apache License, Version 2.0
<form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post"> <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post">
<input type="hidden" name="device" value="<%=device%>"/> <input type="hidden" name="device" value="<%=device%>"/>
<input type="hidden" name="token" value="<%=token%>"/> <input type="hidden" name="token" value="<%=token%>"/>
<input type="submit" class="cbi-button cbi-button-find" title="<%:Find and join network on%> <%=device%>" value="<%:Scan%> <%=device%>"/> <input type="submit" class="cbi-button cbi-button-action important" title="<%:Find and join network on%> <%=device%>" value="<%:Scan%> <%=device%>"/>
</form> </form>
<% <%
end) end)

32
applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
View file

@ -39,31 +39,33 @@ This is free software, licensed under the Apache License, Version 2.0
<%+header%> <%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:Wireless Scan%></h2> <h2 name="content"><%:Wireless Scan%></h2>
<fieldset class="cbi-section"> <div class="cbi-section">
<div class="table cbi-section-table" style="empty-cells:hide"> <div class="table cbi-section-table">
<div class="tr cbi-section-table-titles"> <div class="tr cbi-section-table-titles">
<div class="th cbi-section-table-cell" style="text-align:left"><%:Uplink SSID%></div> <div class="th left"><%:Uplink SSID%></div>
<div class="th cbi-section-table-cell" style="text-align:left"><%:Uplink BSSID%></div> <div class="th left"><%:Uplink BSSID%></div>
<div class="th cbi-section-table-cell" style="text-align:left"><%:Encryption%></div> <div class="th left"><%:Encryption%></div>
<div class="th cbi-section-table-cell" style="text-align:left" colspan="2"><%:Signal strength%></div> <div class="th left"><%:Signal strength%></div>
</div> </div>
<% for i, net in ipairs(iw.scanlist or { }) do %> <% for i, net in ipairs(iw.scanlist or { }) do %>
<div class="tr cbi-section-table-row cbi-rowstyle-1"> <div class="tr cbi-section-table-row cbi-rowstyle-1">
<div class="td cbi-value-field" style="text-align:left"> <div class="td left">
<%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%> <%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%>
</div> </div>
<div class="td cbi-value-field" style="text-align:left"> <div class="td left">
<%=net.bssid and utl.pcdata(net.bssid)%> <%=net.bssid and utl.pcdata(net.bssid)%>
</div> </div>
<div class="td cbi-value-field" style="text-align:left"> <div class="td left">
<%=format_wifi_encryption(net.encryption)%> <%=format_wifi_encryption(net.encryption)%>
</div> </div>
<div class="td cbi-value-field" style="text-align:left"> <div class="td left">
<%=percent_wifi_signal(net)%> % <%=percent_wifi_signal(net)%> %
</div> </div>
<div class="td cbi-value-field" style="width:100px;text-align:right"> <div class="td cbi-section-actions">
<form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiadd')%>" method="post"> <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiadd')%>" method="post">
<input type="hidden" name="token" value="<%=token%>"/> <input type="hidden" name="token" value="<%=token%>"/>
<input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/> <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/>
@ -80,16 +82,16 @@ This is free software, licensed under the Apache License, Version 2.0
</div> </div>
<% end %> <% end %>
</div> </div>
</fieldset> </div>
<div class="cbi-page-actions right"> <div class="cbi-page-actions right">
<form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/stations')%>" method="get">
<input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/>
</form>
<form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post"> <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post">
<input type="hidden" name="token" value="<%=token%>"/> <input type="hidden" name="token" value="<%=token%>"/>
<input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/> <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-input-find" type="submit" value="<%:Repeat scan%>"/>
</form> </form>
<form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/stations')%>" method="post">
<input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/>
</form>
</div> </div>
</div> </div>