Merge pull request #2331 from dibdot/ovpn

luci-app-openvpn: "final" changeset

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js
index 1852f179fd19f5094fbd6514ef661c88ba0ca5f3..88f48d189aa8cfd4cfc9f78f62186fae09e15090 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js
@@ -6,10 +6,8 @@ requestAnimationFrame(function() {
 
                L.poll(5, L.url('admin/network/iface_status', network), null, function(xhr, ifaces) {
                        var ifc = Array.isArray(ifaces) ? ifaces[0] : null;
-                       if (!ifc) {
-                               alert('No ifc!');
+                       if (!ifc)
                                return;
-                       }
 
                        L.itemlist(info, [
                                _('Device'),  ifc.ifname,

diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
index 8ed39df4861cdad6c55142faaf44c0a5988c6967..7c408866058f3de74157ea1343b35afaf6454383 100644 (file)
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
@@ -872,12 +872,14 @@ if hwtype == "mac80211" or hwtype == "prism2" then
 
        ft_psk_generate_local = s:taboption("encryption", Flag, "ft_psk_generate_local",
                translate("Generate PMK locally"),
-               translate("When using a PSK, the PMK can be generated locally without inter AP communications"))
+               translate("When using a PSK, the PMK can be automatically generated. When enabled, the R0/R1 key options below are not applied. Disable this to use the R0 and R1 key options."))
        ft_psk_generate_local:depends({ieee80211r="1"})
+       ft_psk_generate_local.default = ft_psk_generate_local.enabled
+       ft_psk_generate_local.rmempty = false
 
        r0_key_lifetime = s:taboption("encryption", Value, "r0_key_lifetime",
                        translate("R0 Key Lifetime"), translate("minutes"))
-       r0_key_lifetime:depends({ieee80211r="1", ft_psk_generate_local=""})
+       r0_key_lifetime:depends({ieee80211r="1"})
        r0_key_lifetime.placeholder = "10000"
        r0_key_lifetime.datatype = "uinteger"
        r0_key_lifetime.rmempty = true
@@ -885,13 +887,13 @@ if hwtype == "mac80211" or hwtype == "prism2" then
        r1_key_holder = s:taboption("encryption", Value, "r1_key_holder",
                        translate("R1 Key Holder"),
                        translate("6-octet identifier as a hex string - no colons"))
-       r1_key_holder:depends({ieee80211r="1", ft_psk_generate_local=""})
+       r1_key_holder:depends({ieee80211r="1"})
        r1_key_holder.placeholder = "00004f577274"
        r1_key_holder.datatype = "and(hexstring,rangelength(12,12))"
        r1_key_holder.rmempty = true
 
        pmk_r1_push = s:taboption("encryption", Flag, "pmk_r1_push", translate("PMK R1 Push"))
-       pmk_r1_push:depends({ieee80211r="1", ft_psk_generate_local=""})
+       pmk_r1_push:depends({ieee80211r="1"})
        pmk_r1_push.placeholder = "0"
        pmk_r1_push.rmempty = true
 
@@ -901,7 +903,7 @@ if hwtype == "mac80211" or hwtype == "prism2" then
                        "<br />This list is used to map R0KH-ID (NAS Identifier) to a destination " ..
                        "MAC address when requesting PMK-R1 key from the R0KH that the STA " ..
                        "used during the Initial Mobility Domain Association."))
-       r0kh:depends({ieee80211r="1", ft_psk_generate_local=""})
+       r0kh:depends({ieee80211r="1"})
        r0kh.rmempty = true
 
        r1kh = s:taboption("encryption", DynamicList, "r1kh", translate("External R1 Key Holder List"),
@@ -910,7 +912,7 @@ if hwtype == "mac80211" or hwtype == "prism2" then
                        "<br />This list is used to map R1KH-ID to a destination MAC address " ..
                        "when sending PMK-R1 key from the R0KH. This is also the " ..
                        "list of authorized R1KHs in the MD that can request PMK-R1 keys."))
-       r1kh:depends({ieee80211r="1", ft_psk_generate_local=""})
+       r1kh:depends({ieee80211r="1"})
        r1kh.rmempty = true
        -- End of 802.11r options
 

diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
index f6ea9645ff56c2feed6e460641193d1b5f84ac84..f8133833e8c10d2bd3ee7c206506b18361e9403a 100644 (file)
--- a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
@@ -211,6 +211,7 @@ hr {
        -webkit-overflow-scrolling: touch;
        transition: opacity .125s ease-in;
        opacity: 0;
+       visibility: hidden;
 }
 
 .modal {
@@ -250,6 +251,7 @@ body.modal-overlay-active #modal_overlay {
        left: 0;
        right: 0;
        opacity: 1;
+       visibility: visible;
 }
 
 .warning {