From 0bea4d17e6fa82c723dd7b5db4b9081f9c4407ce Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Wed, 7 Sep 2016 16:37:13 +0000 Subject: wifi_add: show the SSID of the network being joined. After clicking the "join" button on the scan list, the SSID is no longer visible, though it's kept in the form to pass to the server. Show the chosen SSID on the top of the page, to help people confirm that they're joining the right network. Signed-off-by: Karl Palsson --- modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/luci-mod-admin-full/luasrc/model') diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua index 96b8b4d740..d64d667a4d 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua @@ -16,7 +16,7 @@ if not iw then return end -m = SimpleForm("network", translate("Join Network: Settings")) +m = SimpleForm("network", translate("Joining Network: %q", http.formvalue("join"))) m.cancel = translate("Back to scan results") m.reset = false -- cgit v1.2.3 From ccc9970c24fd9db110a62d47852d7d11247d2f13 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 23 Sep 2016 17:02:41 +0000 Subject: wifi_add: help text should match reality An additonal network is created if the box _is_ checked. --- modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/luci-mod-admin-full/luasrc/model') diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua index d64d667a4d..55c970d1b6 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua @@ -44,7 +44,7 @@ m.hidden = { if iw and iw.mbssid_support then replace = m:field(Flag, "replace", translate("Replace wireless configuration"), - translate("An additional network will be created if you leave this unchecked.")) + translate("An additional network will be created if you leave this checked.")) function replace.cfgvalue() return "1" end else -- cgit v1.2.3 From 4a5cee22ed769623ce8c51e87eed32ad2c7b4e0e Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Wed, 7 Sep 2016 16:41:04 +0000 Subject: wifi_add: allow multi SSID by default if supported. Instead of defaulting to replace, even on hardware that supports multi SSID, make the default to add. This reduces the chance of locking oneself out when adding a second network. If you intended to replace, ending up with two networks then deleting one is easier than recovering when the old network configuration is gone. Signed-off-by: Karl Palsson --- modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/luci-mod-admin-full/luasrc/model') diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua index 55c970d1b6..05b27a9f0c 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua @@ -46,7 +46,7 @@ if iw and iw.mbssid_support then replace = m:field(Flag, "replace", translate("Replace wireless configuration"), translate("An additional network will be created if you leave this checked.")) - function replace.cfgvalue() return "1" end + function replace.cfgvalue() return "0" end else replace = m:field(DummyValue, "replace", translate("Replace wireless configuration")) replace.default = translate("The hardware is not multi-SSID capable and the existing " .. -- cgit v1.2.3