diff options
Diffstat (limited to 'modules/luci-mod-admin-mini')
3 files changed, 7 insertions, 19 deletions
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua index 19952cd5dc..ec929f1ed9 100644 --- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua +++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua @@ -156,18 +156,6 @@ end local hwtype = m:get(wifidevs[1], "type") -if hwtype == "atheros" then - mode = s:option(ListValue, "hwmode", translate("Mode")) - mode.override_values = true - mode:value("", "auto") - mode:value("11b", "802.11b") - mode:value("11g", "802.11g") - mode:value("11a", "802.11a") - mode:value("11bg", "802.11b+g") - mode.rmempty = true -end - - ch = s:option(Value, "channel", translate("Channel")) for i=1, 14 do ch:value(i, i .. " (2.4 GHz)") @@ -224,7 +212,7 @@ encr.override_values = true encr:value("none", "No Encryption") encr:value("wep", "WEP") -if hwtype == "atheros" or hwtype == "mac80211" then +if hwtype == "mac80211" then local supplicant = fs.access("/usr/sbin/wpa_supplicant") local hostapd = fs.access("/usr/sbin/hostapd") @@ -288,7 +276,7 @@ port:depends({mode="ap", encryption="wpa2"}) port.rmempty = true -if hwtype == "atheros" or hwtype == "mac80211" then +if hwtype == "mac80211" then nasid = s:option(Value, "nasid", translate("NAS ID")) nasid:depends({mode="ap", encryption="wpa"}) nasid:depends({mode="ap", encryption="wpa2"}) @@ -339,7 +327,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then end -if hwtype == "atheros" or hwtype == "broadcom" then +if hwtype == "broadcom" then iso = s:option(Flag, "isolate", translate("AP-Isolation"), translate("Prevents Client to Client communication")) iso.rmempty = true iso:depends("mode", "ap") @@ -349,7 +337,7 @@ if hwtype == "atheros" or hwtype == "broadcom" then hide:depends("mode", "ap") end -if hwtype == "mac80211" or hwtype == "atheros" then +if hwtype == "mac80211" then bssid:depends({mode="adhoc"}) end diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm index 5818a567fc..621e3cbe89 100644 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm +++ b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm @@ -9,5 +9,5 @@ <p><%_<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt.%><br /> <%:On the following pages you can adjust all important settings of this device.%></p> <p><%:As we always want to improve this interface we are looking forward to your feedback and suggestions.%></p> -<p><%:And now have fun with your OpenWrt device!%></p> +<p><%:And now have fun with your device!%></p> <p><em><strong><a href="<%=controller%>/about"><%_The <abbr title="Lua Configuration Interface">LuCI</abbr> Team%></a></strong></em></p> diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm index ecd1e8a7a8..ef3e2e8d12 100644 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm +++ b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm @@ -13,7 +13,7 @@ <% if supported then %> <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data"> <p> - <%:Upload an OpenWrt image file to reflash the device.%> + <%:Upload a sysupgrade-compatible image file to reflash the device.%> <% if bad_image then %> <br /><br /> <div class="error"><%:The uploaded image file does not @@ -38,7 +38,7 @@ </form> <% else %> <div class="error"><%_ Sorry. - OpenWrt does not support a system upgrade on this platform.<br /> + A system upgrade is not supported on this platform.<br /> You need to manually flash your device. %></div> <% end %> <% elseif step == 2 then %> |