set min field widths on ports page (#544)

This commit is contained in:
Steve 2022-11-04 19:54:04 -07:00 committed by GitHub
parent 80a6da9276
commit eb631e4819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 30 deletions

View File

@ -148,7 +148,7 @@ local macs = {}
if config ~= "mesh" or nixio.fs.stat("/tmp/reboot-required") then if config ~= "mesh" or nixio.fs.stat("/tmp/reboot-required") then
http_header() http_header()
html.header(node .. " setup", true) html.header(node .. " setup", true)
html.print("<body><center><table width=790><tr><td>") html.print("<body><center><table width=820><tr><td>")
html.alert_banner() html.alert_banner()
navbar() navbar()
html.print("</td></tr><tr><td align=center><br><b>") html.print("</td></tr><tr><td align=center><br><b>")
@ -852,9 +852,9 @@ html.header(node .. " setup", true)
html.print("<body><center>") html.print("<body><center>")
html.alert_banner() html.alert_banner()
html.print("<form method=post action=/cgi-bin/ports enctype='multipart/form-data'>") html.print("<form method=post action=/cgi-bin/ports enctype='multipart/form-data'>")
html.print("<table width=790>") html.print("<table width=820>")
html.print("<tr><td>") html.print("<tr><td>")
navbar(); navbar()
html.print("</td></tr>") html.print("</td></tr>")
-- control buttons -- control buttons
@ -916,7 +916,7 @@ function print_reservations()
if val == "_add" and #list > 1 then if val == "_add" and #list > 1 then
html.print("<tr><td colspan=4 height=10></td></tr>") html.print("<tr><td colspan=4 height=10></td></tr>")
end end
html.print("<tr><td><input type=text name=dhcp" .. val .. "_host value='" .. host .. "' size=10></td>") html.print("<tr><td><input style='width=180;' type=text name=dhcp" .. val .. "_host value='" .. host .. "'></td>")
html.print("<td align=center><select name=dhcp" .. val .. "_ip>") html.print("<td align=center><select name=dhcp" .. val .. "_ip>")
if val == "_add" then if val == "_add" then
html.print("<option value=''>- IP Address -</option>\n") html.print("<option value=''>- IP Address -</option>\n")
@ -933,7 +933,7 @@ function print_reservations()
end end
end end
html.print("</select></td>") html.print("</select></td>")
html.print("<td><input type=text name=dhcp" .. val .. "_mac value='" .. mac .. "' size=16></td>") html.print("<td><input style='width:120;' type=text name=dhcp" .. val .. "_mac value='" .. mac .. "'></td>")
if dmz_mode ~= 0 then if dmz_mode ~= 0 then
if noprop == "#NOPROP" then if noprop == "#NOPROP" then
html.print("<td align=center><input type=checkbox id=dhcp" .. val .. "_noprop name=dhcp" .. val .. "_noprop value='#NOPROP' checked></td>") html.print("<td align=center><input type=checkbox id=dhcp" .. val .. "_noprop name=dhcp" .. val .. "_noprop value='#NOPROP' checked></td>")
@ -989,10 +989,14 @@ function print_reservations()
end end
function print_forwarding() function print_forwarding()
html.print("<table cellpadding=0 cellspacing=0><tr><th colspan=7>Port Forwarding</th></tr>") html.print("<table cellpadding=0 cellspacing=0>")
html.print("<tr><td>&nbsp;</td><td align=center>Interface</td><td align=center>Type</td>") html.print("<tr><th colspan=6>Port Forwarding</th></tr>")
html.print("<td align=center>Outside<br>Port</td><td align=center>LAN IP</td>") html.print("<tr><td colspan=6 height=5></td></tr>")
html.print("<td align=center width=1>LAN<br>Port</td><td>&nbsp;</td></tr>")
html.print("<tr><td align=center>Interface</td><td align=center>Type</td>")
html.print("<td align=center>Outside Port</td><td align=center>LAN IP</td>")
html.print("<td align=center>LAN Port</td><td>&nbsp;</td></tr>")
html.print("<tr><td colspan=6 height=5></td></tr>")
local list = {} local list = {}
for i = 1,parms.port_num for i = 1,parms.port_num
@ -1009,11 +1013,11 @@ function print_forwarding()
end end
if val == "_add" and #list > 1 then if val == "_add" and #list > 1 then
html.print("<tr><td colspan=7 height=10></td></tr>") html.print("<tr><td colspan=6 height=10></td></tr>")
end end
html.print("<tr><td>&nbsp;</td>") html.print("<tr>")
hide("<input type=hidden name=port" .. val .. "_enable value=1>") hide("<input style='width:90;' type=hidden name=port" .. val .. "_enable value=1>")
-- port forwarding settings -- port forwarding settings
html.print("<td align=center valign=top><select name=port" .. val .. "_intf title='forward inbound packets from this interface'>") html.print("<td align=center valign=top><select name=port" .. val .. "_intf title='forward inbound packets from this interface'>")
@ -1032,7 +1036,7 @@ function print_forwarding()
html.print("<option " .. (_type == "both" and "selected" or "") .. " value='both'>Both</option>") html.print("<option " .. (_type == "both" and "selected" or "") .. " value='both'>Both</option>")
html.print("</select></td>") html.print("</select></td>")
html.print("<td align=center valign=top><input type=text name=port" .. val .. "_out value='" .. _out .. "' size=8></td>") html.print("<td align=center valign=top><input style='width:90;' type=text name=port" .. val .. "_out value='" .. _out .. "'></td>")
html.print("<td align=center valign=top><select name=port" .. val .. "_ip>") html.print("<td align=center valign=top><select name=port" .. val .. "_ip>")
if val == "_add" then if val == "_add" then
html.print("<option value=''>- IP Address -</option>") html.print("<option value=''>- IP Address -</option>")
@ -1049,7 +1053,7 @@ function print_forwarding()
end end
html.print("</select></td>") html.print("</select></td>")
html.print("<td align=left valign=top><input type=text name=port" .. val .. "_in value='" .. _in .. "' size=4></td>") html.print("<td align=left valign=top><input style='width:90;' type=text name=port" .. val .. "_in value='" .. _in .. "'></td>")
html.print("<td><nobr>&nbsp;<input type=submit name=") html.print("<td><nobr>&nbsp;<input type=submit name=")
if val == "_add" then if val == "_add" then
@ -1067,7 +1071,7 @@ function print_forwarding()
table.remove(port_err, 1) table.remove(port_err, 1)
end end
html.print("<tr><td colspan=7 height=5></td></tr>") html.print("<tr><td colspan=6 height=5></td></tr>")
end end
-- dmz server for nat mode -- dmz server for nat mode
@ -1154,7 +1158,7 @@ function print_services()
html.print("<tr><td colspan=4 height=10></td></tr>") html.print("<tr><td colspan=4 height=10></td></tr>")
end end
html.print("<tr>") html.print("<tr>")
html.print("<td><input type=text size=6 name=serv" .. val .. "_name value='" .. _name .. "' title='what to call this service'></td>") html.print("<td><input type=text style='width:120;' name=serv" .. val .. "_name value='" .. _name .. "' title='what to call this service'></td>")
html.print("<td><nobr><input type=checkbox name=serv" .. val .. "_link value=1") html.print("<td><nobr><input type=checkbox name=serv" .. val .. "_link value=1")
if val ~= "_add" then if val ~= "_add" then
@ -1164,7 +1168,7 @@ function print_services()
html.print(" checked") html.print(" checked")
end end
html.print(" title='create a clickable link for this service'>") html.print(" title='create a clickable link for this service'>")
html.print("<input type=text size=2 name=serv" .. val .. "_proto value='" .. _proto .. "' title='URL Protocol'") html.print("<input type=text style='width:40;' name=serv" .. val .. "_proto value='" .. _proto .. "' title='URL Protocol'")
if val ~= "_add" and _link ~= "1" then if val ~= "_add" and _link ~= "1" then
html.print(" disabled") html.print(" disabled")
end end
@ -1190,11 +1194,11 @@ function print_services()
html.print("<td><nobr><b>:</b>//<small>" .. _host .. "</small>") html.print("<td><nobr><b>:</b>//<small>" .. _host .. "</small>")
end end
html.print("<b>:</b><input type=text size=2 name=serv" .. val .. "_port value='" .. _port .. "' title='port number'") html.print("<b>:</b><input type=text style='width:40;' name=serv" .. val .. "_port value='" .. _port .. "' title='port number'")
if val ~= "_add" and _link ~= "1" then if val ~= "_add" and _link ~= "1" then
html.print(" disabled") html.print(" disabled")
end end
html.print("> / <input type=text size=6 name=serv" .. val .. "_suffix value='" .. _suffix .. "' ") html.print("> / <input type=text style='width:80;' name=serv" .. val .. "_suffix value='" .. _suffix .. "' ")
html.print("title='leave blank unless the URL needs a more specific path'") html.print("title='leave blank unless the URL needs a more specific path'")
if val ~= "_add" and _link ~= "1" then if val ~= "_add" and _link ~= "1" then
html.print(" disabled") html.print(" disabled")
@ -1285,21 +1289,20 @@ function print_aliases()
html.print("</table>") html.print("</table>")
end end
html.print("<tr><td align=center><table width=100%>") html.print("<tr><td align=center>")
html.print("<tr><td width=1 align=center valign=top>") html.print("<table width=100%><tr><td align=center valign=top>")
if dmz_mode ~= 0 then if dmz_mode ~= 0 then
print_reservations() print_reservations()
else else
print_forwarding() print_forwarding()
end end
html.print("</td>") html.print("</td>")
html.print("<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td align=center valign=top>") html.print("<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>")
html.print("<td align=center valign=top>")
print_services() print_services()
html.print("</td>") html.print("</td>")
html.print("</tr></table></td></tr>") html.print("</tr>")
html.print("<tr><td>&nbsp;</td></tr>") html.print("<tr><td colspan=3><hr></td></tr>")
html.print("<tr><td><hr></td></tr>")
html.print("</table><table width=790>")
html.print("<tr><td align=center valign=top>") html.print("<tr><td align=center valign=top>")
if dmz_mode ~= 0 then if dmz_mode ~= 0 then
print_forwarding() print_forwarding()
@ -1308,10 +1311,10 @@ else
end end
html.print("</td>") html.print("</td>")
html.print("<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>") html.print("<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>")
html.print("<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>")
html.print("<td align=center valign=top>") html.print("<td align=center valign=top>")
print_aliases() print_aliases()
html.print("</td></tr></table>") html.print("</td></tr>")
html.print("</table>")
hide("<input type=hidden name=port_num value=" .. parms.port_num .. ">") hide("<input type=hidden name=port_num value=" .. parms.port_num .. ">")
hide("<input type=hidden name=dhcp_num value=" .. parms.dhcp_num .. ">") hide("<input type=hidden name=dhcp_num value=" .. parms.dhcp_num .. ">")
@ -1323,7 +1326,9 @@ do
html.print(h) html.print(h)
end end
html.print("</form></center>") html.print("<tr><td>")
html.footer() html.footer()
html.print(" </td></tr>")
html.print("</form></center></table>")
html.print("</body></html>") html.print("</body></html>")
http_footer() http_footer()