diff options
Diffstat (limited to 'luci2/htdocs/luci2/proto/6in4.js')
| -rw-r--r-- | luci2/htdocs/luci2/proto/6in4.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/luci2/htdocs/luci2/proto/6in4.js b/luci2/htdocs/luci2/proto/6in4.js index bb65184..3223065 100644 --- a/luci2/htdocs/luci2/proto/6in4.js +++ b/luci2/htdocs/luci2/proto/6in4.js @@ -1,4 +1,4 @@ -L.NetworkModel.Protocol.extend({ +L.network.Protocol.extend({ protocol: '6in4', description: L.tr('IPv6-in-IPv4 (RFC4213)'), tunnel: true, @@ -6,7 +6,7 @@ L.NetworkModel.Protocol.extend({ populateForm: function(section, iface) { - var wan = L.NetworkModel.findWAN(); + var wan = L.network.findWAN(); section.taboption('general', L.cbi.InputValue, 'ipaddr', { caption: L.tr('Local IPv4 address'), @@ -18,15 +18,15 @@ L.NetworkModel.Protocol.extend({ section.taboption('general', L.cbi.InputValue, 'peeraddr', { caption: L.tr('Remote IPv4 address'), - description: L.tr('This is usually the address of the nearest PoP optional by the tunnel broker'), + description: L.tr('This is usually the address of the nearest PoP operated by the tunnel broker'), datatype: 'ip4addr', optional: false }); section.taboption('general', L.cbi.InputValue, 'ip6addr', { caption: L.tr('Local IPv6 address'), - description: L.tr('This is the local endpoint address assigned by the tunnel broker, it usually ends with :2'), - datatype: 'ip6addr', + description: L.tr('This is the local endpoint address assigned by the tunnel broker'), + datatype: 'cidr6', optional: false }); @@ -59,14 +59,15 @@ L.NetworkModel.Protocol.extend({ section.taboption('general', L.cbi.InputValue, 'username', { caption: L.tr('HE.net user ID'), - description: L.tr('This is the 32 byte hex encoded user ID, not the login name'), - datatype: 'rangelength(32, 32)', + description: L.tr('The login name of the HE.net account'), + datatype: 'string', optional: false, keep: false }).depends('_update', true); section.taboption('general', L.cbi.PasswordValue, 'password', { - caption: L.tr('HE.net password'), + caption: L.tr('Password'), + description: L.tr('Tunnel update key or HE.net account password'), optional: false, keep: false }).depends('_update', true); |