modules/admin-full: only display protocol related options if required software is installed, add posibility to remove 3g service field
This commit is contained in:
Jo-Philipp Wich
parent
0b34ab07d4
commit
f7dbdc6568
1 changed files with 98 additions and 91 deletions
|
|
@ -145,111 +145,118 @@ srv = s:option(Value, "server", translate("network_interface_server"))
|
||||||
srv:depends("proto", "pptp")
|
srv:depends("proto", "pptp")
|
||||||
srv.rmempty = true
|
srv.rmempty = true
|
||||||
|
|
||||||
service = s:option(ListValue, "service", translate("network_interface_service"))
|
if has_3g then
|
||||||
service:value("umts", "UMTS/GPRS")
|
service = s:option(ListValue, "service", translate("network_interface_service"))
|
||||||
service:value("cdma", "CDMA")
|
service:value("", translate("cbi_select"))
|
||||||
service:value("evdo", "EV-DO")
|
service:value("umts", "UMTS/GPRS")
|
||||||
service:depends("proto", "3g")
|
service:value("cdma", "CDMA")
|
||||||
|
service:value("evdo", "EV-DO")
|
||||||
|
service:depends("proto", "3g")
|
||||||
|
service.rmempty = true
|
||||||
|
|
||||||
apn = s:option(Value, "apn", translate("network_interface_apn"))
|
apn = s:option(Value, "apn", translate("network_interface_apn"))
|
||||||
apn:depends("proto", "3g")
|
apn:depends("proto", "3g")
|
||||||
|
|
||||||
pincode = s:option(Value, "pincode",
|
pincode = s:option(Value, "pincode",
|
||||||
translate("network_interface_pincode"),
|
translate("network_interface_pincode"),
|
||||||
translate("network_interface_pincode_desc")
|
translate("network_interface_pincode_desc")
|
||||||
)
|
)
|
||||||
pincode:depends("proto", "3g")
|
pincode:depends("proto", "3g")
|
||||||
|
end
|
||||||
|
|
||||||
user = s:option(Value, "username", translate("username"))
|
if has_pppd or has_pppoe or has_3g or has_pptp then
|
||||||
user.rmempty = true
|
user = s:option(Value, "username", translate("username"))
|
||||||
user:depends("proto", "pptp")
|
user.rmempty = true
|
||||||
user:depends("proto", "pppoe")
|
user:depends("proto", "pptp")
|
||||||
user:depends("proto", "ppp")
|
user:depends("proto", "pppoe")
|
||||||
user:depends("proto", "3g")
|
user:depends("proto", "ppp")
|
||||||
|
user:depends("proto", "3g")
|
||||||
|
|
||||||
pass = s:option(Value, "password", translate("password"))
|
pass = s:option(Value, "password", translate("password"))
|
||||||
pass.rmempty = true
|
pass.rmempty = true
|
||||||
pass.password = true
|
pass.password = true
|
||||||
pass:depends("proto", "pptp")
|
pass:depends("proto", "pptp")
|
||||||
pass:depends("proto", "pppoe")
|
pass:depends("proto", "pppoe")
|
||||||
pass:depends("proto", "ppp")
|
pass:depends("proto", "ppp")
|
||||||
pass:depends("proto", "3g")
|
pass:depends("proto", "3g")
|
||||||
|
|
||||||
ka = s:option(Value, "keepalive",
|
ka = s:option(Value, "keepalive",
|
||||||
translate("network_interface_keepalive"),
|
translate("network_interface_keepalive"),
|
||||||
translate("network_interface_keepalive_desc")
|
translate("network_interface_keepalive_desc")
|
||||||
)
|
)
|
||||||
ka.optional = true
|
ka.optional = true
|
||||||
ka:depends("proto", "pptp")
|
ka:depends("proto", "pptp")
|
||||||
ka:depends("proto", "pppoe")
|
ka:depends("proto", "pppoe")
|
||||||
ka:depends("proto", "ppp")
|
ka:depends("proto", "ppp")
|
||||||
ka:depends("proto", "3g")
|
ka:depends("proto", "3g")
|
||||||
|
|
||||||
demand = s:option(Value, "demand",
|
demand = s:option(Value, "demand",
|
||||||
translate("network_interface_demand"),
|
translate("network_interface_demand"),
|
||||||
translate("network_interface_demand_desc")
|
translate("network_interface_demand_desc")
|
||||||
)
|
)
|
||||||
demand.optional = true
|
demand.optional = true
|
||||||
demand:depends("proto", "pptp")
|
demand:depends("proto", "pptp")
|
||||||
demand:depends("proto", "pppoe")
|
demand:depends("proto", "pppoe")
|
||||||
demand:depends("proto", "ppp")
|
demand:depends("proto", "ppp")
|
||||||
demand:depends("proto", "3g")
|
demand:depends("proto", "3g")
|
||||||
|
end
|
||||||
|
|
||||||
device = s:option(Value, "device",
|
if has_pppd or has_3g then
|
||||||
translate("network_interface_device"),
|
device = s:option(Value, "device",
|
||||||
translate("network_interface_device_desc")
|
translate("network_interface_device"),
|
||||||
)
|
translate("network_interface_device_desc")
|
||||||
device:depends("proto", "ppp")
|
)
|
||||||
device:depends("proto", "3g")
|
device:depends("proto", "ppp")
|
||||||
|
device:depends("proto", "3g")
|
||||||
|
|
||||||
defaultroute = s:option(Flag, "defaultroute",
|
defaultroute = s:option(Flag, "defaultroute",
|
||||||
translate("network_interface_defaultroute"),
|
translate("network_interface_defaultroute"),
|
||||||
translate("network_interface_defaultroute_desc")
|
translate("network_interface_defaultroute_desc")
|
||||||
)
|
)
|
||||||
defaultroute:depends("proto", "ppp")
|
defaultroute:depends("proto", "ppp")
|
||||||
defaultroute:depends("proto", "3g")
|
defaultroute:depends("proto", "3g")
|
||||||
|
|
||||||
peerdns = s:option(Flag, "peerdns",
|
peerdns = s:option(Flag, "peerdns",
|
||||||
translate("network_interface_peerdns"),
|
translate("network_interface_peerdns"),
|
||||||
translate("network_interface_peerdns_desc")
|
translate("network_interface_peerdns_desc")
|
||||||
)
|
)
|
||||||
peerdns:depends("proto", "ppp")
|
peerdns:depends("proto", "ppp")
|
||||||
|
|
||||||
ipv6 = s:option(Flag, "ipv6", translate("network_interface_ipv6") )
|
ipv6 = s:option(Flag, "ipv6", translate("network_interface_ipv6") )
|
||||||
ipv6:depends("proto", "ppp")
|
ipv6:depends("proto", "ppp")
|
||||||
--ipv6:depends("proto", "3g")
|
--ipv6:depends("proto", "3g")
|
||||||
|
|
||||||
connect = s:option(Value, "connect",
|
connect = s:option(Value, "connect",
|
||||||
translate("network_interface_connect"),
|
translate("network_interface_connect"),
|
||||||
translate("network_interface_connect_desc")
|
translate("network_interface_connect_desc")
|
||||||
)
|
)
|
||||||
connect.optional = true
|
connect.optional = true
|
||||||
connect:depends("proto", "ppp")
|
connect:depends("proto", "ppp")
|
||||||
connect:depends("proto", "3g")
|
connect:depends("proto", "3g")
|
||||||
|
|
||||||
disconnect = s:option(Value, "disconnect",
|
disconnect = s:option(Value, "disconnect",
|
||||||
translate("network_interface_disconnect"),
|
translate("network_interface_disconnect"),
|
||||||
translate("network_interface_disconnect_desc")
|
translate("network_interface_disconnect_desc")
|
||||||
)
|
)
|
||||||
disconnect.optional = true
|
disconnect.optional = true
|
||||||
disconnect:depends("proto", "ppp")
|
disconnect:depends("proto", "ppp")
|
||||||
disconnect:depends("proto", "3g")
|
disconnect:depends("proto", "3g")
|
||||||
|
|
||||||
pppd_options = s:option(Value, "pppd_options",
|
pppd_options = s:option(Value, "pppd_options",
|
||||||
translate("network_interface_pppd_options"),
|
translate("network_interface_pppd_options"),
|
||||||
translate("network_interface_pppd_options_desc")
|
translate("network_interface_pppd_options_desc")
|
||||||
)
|
)
|
||||||
pppd_options.optional = true
|
pppd_options.optional = true
|
||||||
pppd_options:depends("proto", "ppp")
|
pppd_options:depends("proto", "ppp")
|
||||||
pppd_options:depends("proto", "3g")
|
pppd_options:depends("proto", "3g")
|
||||||
|
|
||||||
maxwait = s:option(Value, "maxwait",
|
|
||||||
translate("network_interface_maxwait"),
|
|
||||||
translate("network_interface_maxwait_desc")
|
|
||||||
)
|
|
||||||
maxwait.optional = true
|
|
||||||
maxwait:depends("proto", "3g")
|
|
||||||
|
|
||||||
|
maxwait = s:option(Value, "maxwait",
|
||||||
|
translate("network_interface_maxwait"),
|
||||||
|
translate("network_interface_maxwait_desc")
|
||||||
|
)
|
||||||
|
maxwait.optional = true
|
||||||
|
maxwait:depends("proto", "3g")
|
||||||
|
end
|
||||||
|
|
||||||
s2 = m:section(TypedSection, "alias", translate("aliases"))
|
s2 = m:section(TypedSection, "alias", translate("aliases"))
|
||||||
s2.addremove = true
|
s2.addremove = true
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue