luci-0.9: merge r5920-5922

diff --git a/applications/luci-livestats/luasrc/view/livestats/wireless.htm b/applications/luci-livestats/luasrc/view/livestats/wireless.htm
index ca384b2f7cf466a1945590e8dfee0fa10708e70c..1502e1ed98eb750916ca2752d87397cc62534522 100644 (file)
--- a/applications/luci-livestats/luasrc/view/livestats/wireless.htm
+++ b/applications/luci-livestats/luasrc/view/livestats/wireless.htm
@@ -18,7 +18,7 @@
                        [ function(data) {
                                return parseFloat(data["Signal level"])
                                 - parseFloat(data["Noise level"]);
-                       }, "S/N (dBm)"],
+                       }, "S/N (dB)"],
 
                        // Graph layout options
                        { drawBackground: false, yAxis: [ 0, 50 ],

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index c37e726293d9144ef666c2620052ccb81ac86f19..37144fbc41515f852dca3ed7722dacf96311c60d 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -15,6 +15,7 @@ $Id$
 require("luci.sys")
 require("luci.sys.zoneinfo")
 require("luci.tools.webadmin")
+require("luci.fs")
 
 m = Map("system", translate("system"), translate("a_s_desc"))
 
@@ -72,7 +73,9 @@ function tz.write(self, section, value)
        end
 
        AbstractValue.write(self, section, value)
-       self.map.uci:set("system", section, "timezone", lookup_zone(value) or "GMT0")
+       local timezone = lookup_zone(value) or "GMT0"
+       self.map.uci:set("system", section, "timezone", timezone)
+       luci.fs.writefile("/etc/TZ", timezone .. "\n")
 end
 
 s:option(Value, "log_size", nil, "kiB").optional = true

diff --git a/themes/base/htdocs/luci-static/resources/Dropdowns.js b/themes/base/htdocs/luci-static/resources/Dropdowns.js
index 8c07a6f2fcd8dee7bf63707622645b9900273c1f..a8d12b959ccc386aa437136889ef5bef4ca0b33c 100644 (file)
--- a/themes/base/htdocs/luci-static/resources/Dropdowns.js
+++ b/themes/base/htdocs/luci-static/resources/Dropdowns.js
@@ -187,6 +187,14 @@ function initDropdowns() {
                        }
                }
        }
+
+       XHTML1.addEventListener(document, "click", function() {
+               if (delayHideTimerId) {
+                       clearTimeout(delayHideTimerId);
+                       delayHideTimerId = 0;
+                       delayHide();
+               }
+       });
 }
 
 if(XHTML1.isDOMSupported()) {