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

Merge pull request #1654 from TDT-AG/pr/20180301-luci-several-fixes

Browse source 
luci-app-firewall/luci-base/luci-mod-admin-full: some fixes and improvements
This commit is contained in:
Jo-Philipp Wich 2018-03-15 09:52:22 +01:00 committed by GitHub
commit 005f4fb7d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
View file

@ -2,6 +2,7 @@
local fw = require "luci.model.firewall".init() local fw = require "luci.model.firewall".init()
local wz = fw:get_zone("wan") local wz = fw:get_zone("wan")
local lz = fw:get_zone("lan") local lz = fw:get_zone("lan")
local zones = fw:get_zones()
%> %>
<div class="cbi-section-create cbi-tblsection-create"> <div class="cbi-section-create cbi-tblsection-create">
@ -38,7 +39,7 @@
</tr> </tr>
</table> </table>
<% end %> <% end %>
<% if wz and lz then %> <% if #zones > 1 then %>
<table class="cbi-section-table" style="margin-left:5px"> <table class="cbi-section-table" style="margin-left:5px">
<tr class="cbi-section-table-titles"> <tr class="cbi-section-table-titles">
<th class="cbi-section-table-cell left" colspan="6"><br /><%:New forward rule%>:</th> <th class="cbi-section-table-cell left" colspan="6"><br /><%:New forward rule%>:</th>
@ -56,14 +57,14 @@
<td class="cbi-section-table-cell" style="width:110px"> <td class="cbi-section-table-cell" style="width:110px">
<select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src"> <select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src">
<% local k, v; for k, v in ipairs(fw:get_zones()) do -%> <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
<option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option> <option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
<%- end %> <%- end %>
</select> </select>
</td> </td>
<td class="cbi-section-table-cell" style="width:110px"> <td class="cbi-section-table-cell" style="width:110px">
<select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest"> <select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
<% local k, v; for k, v in ipairs(fw:get_zones()) do -%> <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
<option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option> <option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
<%- end %> <%- end %>
</select> </select>
</td> </td>

5
applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
View file

@ -1,8 +1,7 @@
<% <%
local fw = require "luci.model.firewall".init() local fw = require "luci.model.firewall".init()
local nw = require "luci.model.network".init() local nw = require "luci.model.network".init()
local wz = fw:get_zone("wan") local zones = fw:get_zones()
local lz = fw:get_zone("lan")
local keys, vals, a, k, v = {}, {} local keys, vals, a, k, v = {}, {}
for k, v in ipairs(nw:get_interfaces()) do for k, v in ipairs(nw:get_interfaces()) do
@ -14,7 +13,7 @@
%> %>
<div class="cbi-section-create cbi-tblsection-create"> <div class="cbi-section-create cbi-tblsection-create">
<% if wz and lz then %> <% if #zones > 1 then %>
<br /> <br />
<table class="cbi-section-table" style="width:700px; margin-left:5px"> <table class="cbi-section-table" style="width:700px; margin-left:5px">
<tr class="cbi-section-table-titles"> <tr class="cbi-section-table-titles">

1
modules/luci-base/luasrc/view/cbi/browser.htm
View file

@ -2,6 +2,7 @@
<%+cbi/valueheader%> <%+cbi/valueheader%>
<input class="cbi-input-text" type="text"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> /> <input class="cbi-input-text" type="text"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> />
<script type="text/javascript"> <script type="text/javascript">
cbi_init()
cbi_browser_init('<%=cbid%>', '<%=resource%>', '<%=url('admin/filebrowser')%>'<%=self.default_path and ", '"..self.default_path.."'"%>); cbi_browser_init('<%=cbid%>', '<%=resource%>', '<%=url('admin/filebrowser')%>'<%=self.default_path and ", '"..self.default_path.."'"%>);
</script> </script>
<%+cbi/valuefooter%> <%+cbi/valuefooter%>

3
modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
View file

@ -54,6 +54,9 @@
</div> </div>
</form> </form>
</div> </div>
<% if reset_avail then %>
<div class="alert-message warning"><%:Custom files (certificates, scripts) may remain on the system. To prevent this, perform a factory-reset first.%></div>
<% end %>
</fieldset> </fieldset>
<br /> <br />