diff options
Diffstat (limited to 'modules')
8 files changed, 11 insertions, 10 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js index f4bf0f40fa..c27cc8264e 100644 --- a/modules/luci-base/htdocs/luci-static/resources/cbi.js +++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js @@ -2071,7 +2071,7 @@ function cbi_dropdown_init(sb) { cbi_dropdown_init.prototype = CBIDropdown; function cbi_update_table(table, data, placeholder) { - target = isElem(table) ? table : document.querySelector(table); + var target = isElem(table) ? table : document.querySelector(table); if (!isElem(target)) return; diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index 82dc55f958..c6f4477dff 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -16,14 +16,14 @@ TZ = { { 'Africa/Brazzaville', 'WAT-1' }, { 'Africa/Bujumbura', 'CAT-2' }, { 'Africa/Cairo', 'EET-2' }, - { 'Africa/Casablanca', 'WET0WEST,M3.5.0,M10.5.0/3' }, + { 'Africa/Casablanca', '<+01>-1' }, { 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Africa/Conakry', 'GMT0' }, { 'Africa/Dakar', 'GMT0' }, { 'Africa/Dar es Salaam', 'EAT-3' }, { 'Africa/Djibouti', 'EAT-3' }, { 'Africa/Douala', 'WAT-1' }, - { 'Africa/El Aaiun', 'WET0WEST,M3.5.0,M10.5.0/3' }, + { 'Africa/El Aaiun', '<+01>-1' }, { 'Africa/Freetown', 'GMT0' }, { 'Africa/Gaborone', 'CAT-2' }, { 'Africa/Harare', 'CAT-2' }, diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index 20f57dc1b2..e63e2a6958 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -9,7 +9,6 @@ OFFSET = { wat = 3600, -- WAT cat = 7200, -- CAT eet = 7200, -- EET - wet = 0, -- WET sast = 7200, -- SAST hst = -36000, -- HST hdt = -32400, -- HDT @@ -36,6 +35,7 @@ OFFSET = { wita = 28800, -- WITA kst = 32400, -- KST jst = 32400, -- JST + wet = 0, -- WET acst = 34200, -- ACST acdt = 37800, -- ACDT aest = 36000, -- AEST diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js b/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js index cae0cd66f7..48ae91cd81 100644 --- a/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js +++ b/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js @@ -53,8 +53,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { trigger: function(e) { var lonlat = map.getLonLatFromViewPortPx(e.xy); - lat=merc2lat(lonlat.lat); - lon=merc2lon(lonlat.lon); + var lat=merc2lat(lonlat.lat); + var lon=merc2lon(lonlat.lon); if(parent.document.getElementById(latfield_id)==null){ latfield=document.getElementById('osmlat'); }else{ @@ -92,7 +92,7 @@ function init(){ function drawmap() { OpenLayers.Lang.setCode('de'); - mapdiv=document.getElementById('map'); + var mapdiv=document.getElementById('map'); mapdiv.style.height=window.innerHeight+"px"; mapdiv.style.width=window.innerWidth+"px"; map = new OpenLayers.Map('map', { diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm index dbf3820f5c..bd936ac705 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm @@ -4,7 +4,7 @@ local has_latlon = false local uci = require "luci.model.uci".cursor() uci:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_nameservice.so.0.3" and s.latlon_file then + if s.library == "olsrd_nameservice" and s.latlon_file then has_latlon = true end end) diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm index c3951f9c63..f69401d6e3 100644 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm +++ b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm @@ -85,7 +85,7 @@ local uci = require "luci.model.uci".cursor() uci:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_nameservice.so.0.3" and s.latlon_file then + if s.library == "olsrd_nameservice" and s.latlon_file then fd = io.open(s.latlon_file) end end) diff --git a/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm index 8ec43cb0e6..03ea2bef01 100644 --- a/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm +++ b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm @@ -61,6 +61,7 @@ var label_rate_peak; var label_scale; + var label_scale_2; /* wait for SVG */ diff --git a/modules/luci-mod-system/luasrc/view/admin_system/packages.htm b/modules/luci-mod-system/luasrc/view/admin_system/packages.htm index 39582c6a93..9e364d69ae 100644 --- a/modules/luci-mod-system/luasrc/view/admin_system/packages.htm +++ b/modules/luci-mod-system/luasrc/view/admin_system/packages.htm @@ -88,7 +88,7 @@ end <div class="cbi-value cbi-value-last"> <%:Free space%>: <strong><%=(100-used_perc)%>%</strong> (<strong><%=wa.byte_format(free_byte)%></strong>) - <div style="margin:3px 0; width:300px; height:10px; border:1px solid #000000; background-color:#80C080"> + <div style="margin:3px 0; width:300px; height:10px; border:1px solid #000000; background-color:#80C080" id="swfreespace"> <div style="background-color:#F08080; border-right:1px solid #000000; height:100%; width:<%=used_perc%>%"> </div> </div> </div> |