luci-app-firewall: cleanup template markup

Rework the cbi section add template markup 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 16:58:39 +02:00
parent bbf096c79e
commit e097d3f734
3 changed files with 211 additions and 227 deletions

View file

@ -18,95 +18,91 @@
vals[#vals+1] = '%s (%s)' %{ ip, name } vals[#vals+1] = '%s (%s)' %{ ip, name }
end) end)
-%> -%>
<div class="cbi-section-create cbi-tblsection-create">
<br /> <h4><%:New port forward%></h4>
<div class="table cbi-section-table" style="width:810px; margin-left:5px"> <div class="table">
<div class="tr cbi-section-table-titles"> <div class="tr table-titles">
<div class="th cbi-section-table-cell" colspan="8"><%:New port forward%>:</div> <div class="th"><%:Name%></div>
<div class="th"><%:Protocol%></div>
<div class="th"><%:External zone%></div>
<div class="th"><%:External port%></div>
<div class="th"><%:Internal zone%></div>
<div class="th"><%:Internal IP address%></div>
<div class="th"><%:Internal port%></div>
<div class="th"></div>
</div>
<div class="tr">
<div class="td">
<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New port forward%>" />
</div> </div>
<div class="tr cbi-section-table-descr"> <div class="td">
<div class="th cbi-section-table-cell"><%:Name%></div> <select class="cbi-input-select" id="_newfwd.proto" name="_newfwd.proto">
<div class="th cbi-section-table-cell"><%:Protocol%></div> <option value="tcp udp">TCP+UDP</option>
<div class="th cbi-section-table-cell"><%:External zone%></div> <option value="tcp">TCP</option>
<div class="th cbi-section-table-cell"><%:External port%></div> <option value="udp">UDP</option>
<div class="th cbi-section-table-cell"><%:Internal zone%></div> <option value="other"><%:Other...%></option>
<div class="th cbi-section-table-cell"><%:Internal IP address%></div> </select>
<div class="th cbi-section-table-cell"><%:Internal port%></div>
<div class="th cbi-section-table-cell"></div>
</div> </div>
<div class="tr cbi-section-table-row"> <div class="td">
<div class="td cbi-section-table-cell"> <select class="cbi-input-select" id="_newfwd.extzone" name="_newfwd.extzone">
<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New port forward%>" /> <% for _, z in ipairs(ezl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
</div> </select>
<div class="td cbi-section-table-cell" style="width:110px"> </div>
<select class="cbi-input-select" id="_newfwd.proto" name="_newfwd.proto"> <div class="td">
<option value="tcp udp">TCP+UDP</option> <input type="text" class="cbi-input-text" id="_newfwd.extport" name="_newfwd.extport" data-type="portrange" data-optional="true" />
<option value="tcp">TCP</option> </div>
<option value="udp">UDP</option> <div class="td">
<option value="other"><%:Other...%></option> <select class="cbi-input-select" id="_newfwd.intzone" name="_newfwd.intzone">
</select> <% for _, z in ipairs(izl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
</div> </select>
<div class="td cbi-section-table-cell" style="width:55px"> </div>
<select class="cbi-input-select" id="_newfwd.extzone" name="_newfwd.extzone"> <div class="td">
<% for _, z in ipairs(ezl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %> <input type="text" class="cbi-input-text" id="_newfwd.intaddr" name="_newfwd.intaddr" data-type="host" data-optional="true"<%=
</select> ifattr(#keys > 0, "data-choices", {keys, vals})
</div> %>/>
<div class="td cbi-section-table-cell" style="width:110px"> </div>
<input type="text" class="cbi-input-text" id="_newfwd.extport" name="_newfwd.extport" data-type="portrange" data-optional="true" /> <div class="td">
</div> <input type="text" class="cbi-input-text" id="_newfwd.intport" name="_newfwd.intport" data-type="portrange" data-optional="true" />
<div class="td cbi-section-table-cell" style="width:55px"> </div>
<select class="cbi-input-select" id="_newfwd.intzone" name="_newfwd.intzone"> <div class="td bottom">
<% for _, z in ipairs(izl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %> <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
</select>
</div>
<div class="td cbi-section-table-cell" style="width:110px">
<input type="text" class="cbi-input-text" id="_newfwd.intaddr" name="_newfwd.intaddr" data-type="host" data-optional="true"<%=
ifattr(#keys > 0, "data-choices", {keys, vals})
%>/>
</div>
<div class="td cbi-section-table-cell" style="width:110px">
<input type="text" class="cbi-input-text" id="_newfwd.intport" name="_newfwd.intport" data-type="portrange" data-optional="true" />
</div>
<div class="td cbi-section-table-cell">
<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
</div>
</div> </div>
</div> </div>
<script type="text/javascript">//<![CDATA[
cbi_bind(document.getElementById('_newfwd.extport'), 'blur',
function() {
var n = document.getElementById('_newfwd.name');
var p = document.getElementById('_newfwd.proto');
var i = document.getElementById('_newfwd.intport');
var hints = {
/* port name 0=both, 1=tcp, 2=udp, 3=other */
21: [ 'FTP', 1 ],
22: [ 'SSH', 1 ],
53: [ 'DNS', 0 ],
80: [ 'HTTP', 1 ],
443: [ 'HTTPS', 1 ],
3389: [ 'RDP', 1 ],
5900: [ 'VNC', 1 ],
};
if (!this.className.match(/invalid/))
{
if (!i.value) i.value = this.value;
var hint = hints[this.value || 0] || hints[i.value || 0];
if (hint)
{
p.selectedIndex = hint[1];
if (!n.value)
n.value = hint[0];
}
else if (!n.value)
{
n.value = 'Forward' + this.value;
}
}
});
//]]></script>
</div> </div>
<script type="text/javascript">//<![CDATA[
cbi_bind(document.getElementById('_newfwd.extport'), 'blur',
function() {
var n = document.getElementById('_newfwd.name');
var p = document.getElementById('_newfwd.proto');
var i = document.getElementById('_newfwd.intport');
var hints = {
/* port name 0=both, 1=tcp, 2=udp, 3=other */
21: [ 'FTP', 1 ],
22: [ 'SSH', 1 ],
53: [ 'DNS', 0 ],
80: [ 'HTTP', 1 ],
443: [ 'HTTPS', 1 ],
3389: [ 'RDP', 1 ],
5900: [ 'VNC', 1 ],
};
if (!this.className.match(/invalid/))
{
if (!i.value) i.value = this.value;
var hint = hints[this.value || 0] || hints[i.value || 0];
if (hint)
{
p.selectedIndex = hint[1];
if (!n.value)
n.value = hint[0];
}
else if (!n.value)
{
n.value = 'Forward' + this.value;
}
}
});
//]]></script>

View file

@ -5,112 +5,105 @@
local zones = fw:get_zones() local zones = fw:get_zones()
%> %>
<div class="cbi-section-create cbi-tblsection-create"> <% if wz then %>
<% if wz then %> <h4><%:Open ports on router%></h4>
<br /> <div class="table">
<div class="table cbi-section-table" style="margin-left:5px"> <div class="tr cbi-section-table-titles">
<div class="tr cbi-section-table-titles"> <div class="th"><%:Name%></div>
<div class="th cbi-section-table-cell left" colspan="4"><%:Open ports on router%>:</div> <div class="th"><%:Protocol%></div>
<div class="th"><%:External port%></div>
<div class="th"></div>
</div>
<div class="tr">
<div class="td">
<input type="text" class="cbi-input-text" id="_newopen.name" name="_newopen.name" placeholder="<%:New input rule%>" />
</div> </div>
<div class="tr cbi-section-table-descr"> <div class="td">
<div class="th cbi-section-table-cell"><%:Name%></div> <select class="cbi-input-select" id="_newopen.proto" name="_newopen.proto">
<div class="th cbi-section-table-cell"><%:Protocol%></div> <option value="tcp udp">TCP+UDP</option>
<div class="th cbi-section-table-cell"><%:External port%></div> <option value="tcp">TCP</option>
<div class="th cbi-section-table-cell"></div> <option value="udp">UDP</option>
<option value="other"><%:Other...%></option>
</select>
</div> </div>
<div class="tr cbi-section-table-row"> <div class="td">
<div class="td cbi-section-table-cell" style="width:130px"> <input type="text" class="cbi-input-text" id="_newopen.extport" name="_newopen.extport" />
<input type="text" class="cbi-input-text" id="_newopen.name" name="_newopen.name" placeholder="<%:New input rule%>" /> </div>
</div> <div class="td bottom">
<div class="td cbi-section-table-cell" style="width:110px"> <input type="submit" class="cbi-button cbi-button-add" name="_newopen.submit" value="<%:Add%>" />
<select class="cbi-input-select" id="_newopen.proto" name="_newopen.proto">
<option value="tcp udp">TCP+UDP</option>
<option value="tcp">TCP</option>
<option value="udp">UDP</option>
<option value="other"><%:Other...%></option>
</select>
</div>
<div class="td cbi-section-table-cell" style="width:110px">
<input type="text" class="cbi-input-text" id="_newopen.extport" name="_newopen.extport" />
</div>
<div class="td cbi-section-table-cell left">
<input type="submit" class="cbi-button cbi-button-add" name="_newopen.submit" value="<%:Add%>" />
</div>
</div> </div>
</div> </div>
<% end %> </div>
<% if #zones > 1 then %> <% end %>
<div class="table cbi-section-table" style="margin-left:5px"> <% if #zones > 1 then %>
<div class="tr cbi-section-table-titles"> <h4><%:New forward rule%></h4>
<div class="th cbi-section-table-cell left" colspan="6"><br /><%:New forward rule%>:</div> <div class="table">
<div class="tr cbi-section-table-titles">
<div class="th"><%:Name%></div>
<div class="th"><%:Source zone%></div>
<div class="th"><%:Destination zone%></div>
<div class="th"></div>
</div>
<div class="tr">
<div class="td">
<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New forward rule%>" />
</div> </div>
<div class="tr cbi-section-table-descr"> <div class="td">
<div class="th cbi-section-table-cell"><%:Name%></div> <select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src">
<div class="th cbi-section-table-cell"><%:Source zone%></div> <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
<div class="th cbi-section-table-cell"><%:Destination zone%></div> <option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
<div class="th cbi-section-table-cell"></div> <%- end %>
</select>
</div> </div>
<div class="tr cbi-section-table-row"> <div class="td">
<div class="td cbi-section-table-cell" style="width:130px"> <select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New forward rule%>" /> <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
</div> <option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
<div class="td cbi-section-table-cell" style="width:110px"> <%- end %>
<select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src"> </select>
<% local k, v; for k, v in ipairs(fw:get_zones()) do -%> </div>
<option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option> <div class="td bottom">
<%- end %> <input type="submit" class="cbi-button cbi-button-link" name="_newfwd.submit" value="<%:Add and edit...%>" />
</select>
</div>
<div class="td cbi-section-table-cell" style="width:110px">
<select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
<% 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>
<%- end %>
</select>
</div>
<div class="td cbi-section-table-cell left">
<input type="submit" class="cbi-button cbi-button-link" name="_newfwd.submit" value="<%:Add and edit...%>" />
</div>
</div> </div>
</div> </div>
<% else %> </div>
<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" /> <% else %>
<% end %> <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
<% end %>
<% if wz then %> <% if wz then %>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))'); cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
cbi_bind(document.getElementById('_newopen.extport'), 'blur', cbi_bind(document.getElementById('_newopen.extport'), 'blur',
function() { function() {
var n = document.getElementById('_newopen.name'); var n = document.getElementById('_newopen.name');
var p = document.getElementById('_newopen.proto'); var p = document.getElementById('_newopen.proto');
var hints = { var hints = {
/* port name 0=both, 1=tcp, 2=udp, 3=other */ /* port name 0=both, 1=tcp, 2=udp, 3=other */
22: [ 'SSH', 1 ], 22: [ 'SSH', 1 ],
53: [ 'DNS', 0 ], 53: [ 'DNS', 0 ],
80: [ 'HTTP', 1 ], 80: [ 'HTTP', 1 ],
443: [ 'HTTPS', 1 ], 443: [ 'HTTPS', 1 ],
}; };
if (!this.className.match(/invalid/)) if (!this.className.match(/invalid/))
{
var hint = hints[this.value || 0];
if (hint)
{ {
var hint = hints[this.value || 0]; p.selectedIndex = hint[1];
if (hint)
{
p.selectedIndex = hint[1];
if (!n.value) if (!n.value)
n.value = hint[0]; n.value = hint[0];
}
else if (!n.value && this.value)
{
n.value = 'Open' + this.value;
}
} }
}); else if (!n.value && this.value)
{
n.value = 'Open' + this.value;
}
}
});
cbi_validate_field('cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>', true, 'uciname'); cbi_validate_field('cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>', true, 'uciname');
//]]></script> //]]></script>
<% end %> <% end %>
</div>

View file

@ -12,53 +12,48 @@
end end
%> %>
<div class="cbi-section-create cbi-tblsection-create"> <% if #zones > 1 then %>
<% if #zones > 1 then %> <h4><%:New source NAT%></h4>
<br /> <div class="table">
<div class="table cbi-section-table" style="width:700px; margin-left:5px"> <div class="tr cbi-section-table-titles">
<div class="tr cbi-section-table-titles"> <div class="th"><%:Name%></div>
<div class="th cbi-section-table-cell left" colspan="6"><%:New source NAT%>:</div> <div class="th"><%:Source zone%></div>
<div class="th"><%:Destination zone%></div>
<div class="th"><%:To source IP%></div>
<div class="th"><%:To source port%></div>
<div class="th"></div>
</div>
<div class="tr">
<div class="td">
<input type="text" class="cbi-input-text" id="_newsnat.name" name="_newsnat.name" placeholder="<%:New SNAT rule%>" />
</div> </div>
<div class="tr cbi-section-table-descr"> <div class="td">
<div class="th cbi-section-table-cell"><%:Name%></div> <select class="cbi-input-text" id="_newsnat.src" name="_newsnat.src">
<div class="th cbi-section-table-cell"><%:Source zone%></div> <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
<div class="th cbi-section-table-cell"><%:Destination zone%></div> <option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
<div class="th cbi-section-table-cell"><%:To source IP%></div> <%- end %>
<div class="th cbi-section-table-cell"><%:To source port%></div> </select>
<div class="th cbi-section-table-cell"></div>
</div> </div>
<div class="tr cbi-section-table-row"> <div class="td">
<div class="td cbi-section-table-cell"> <select class="cbi-input-text" id="_newsnat.dest" name="_newsnat.dest">
<input type="text" class="cbi-input-text" id="_newsnat.name" name="_newsnat.name" placeholder="<%:New SNAT rule%>" /> <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
</div> <option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
<div class="td cbi-section-table-cell" style="width:110px"> <%- end %>
<select class="cbi-input-text" id="_newsnat.src" name="_newsnat.src"> </select>
<% local k, v; for k, v in ipairs(fw:get_zones()) do -%> </div>
<option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option> <div class="td">
<%- end %> <input type="text" class="cbi-input-text" id="_newsnat.dip" name="_newsnat.dip" placeholder="<%:Do not rewrite%>" data-type="ip4addr" data-optional="true"<%=
</select> ifattr(#keys > 0, "data-choices", { keys, vals })
</div> %> />
<div class="td cbi-section-table-cell" style="width:110px"> </div>
<select class="cbi-input-text" id="_newsnat.dest" name="_newsnat.dest"> <div class="td">
<% local k, v; for k, v in ipairs(fw:get_zones()) do -%> <input type="text" class="cbi-input-text" id="_newsnat.dport" name="_newsnat.dport" placeholder="<%:Do not rewrite%>" data-type="portrange" data-optional="true" />
<option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option> </div>
<%- end %> <div class="td bottom">
</select> <input type="submit" class="cbi-button cbi-button-link" name="_newsnat.submit" value="<%:Add and edit...%>" />
</div>
<div class="td cbi-section-table-cell" style="width:110px">
<input type="text" class="cbi-input-text" id="_newsnat.dip" name="_newsnat.dip" placeholder="<%:Do not rewrite%>" data-type="ip4addr" data-optional="true"<%=
ifattr(#keys > 0, "data-choices", { keys, vals })
%> />
</div>
<div class="td cbi-section-table-cell" style="width:110px">
<input type="text" class="cbi-input-text" id="_newsnat.dport" name="_newsnat.dport" placeholder="<%:Do not rewrite%>" data-type="portrange" data-optional="true" />
</div>
<div class="td cbi-section-table-cell">
<input type="submit" class="cbi-button cbi-button-link" name="_newsnat.submit" value="<%:Add and edit...%>" />
</div>
</div> </div>
</div> </div>
<% else %> </div>
<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" /> <% else %>
<% end %> <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
</div> <% end %>