diff --git a/webroot/css/weatherscan.css b/webroot/css/weatherscan.css index dd65649..a6cac42 100644 --- a/webroot/css/weatherscan.css +++ b/webroot/css/weatherscan.css @@ -4050,14 +4050,6 @@ label{ .city-info-slide .info-subheader { padding-right: 10% } - - -.city-info-slide #subhead-city { - font-size: 30.2px; - padding-top: 3px; - right: 98px; - font-stretch: semi-expanded; -} .city-info-slide { position: relative; background: transparent url(/images/bluebuildings.jpg) no-repeat; @@ -6348,11 +6340,11 @@ label{ .info-slide #subhead-city { font-family: Frutiger; - font-size: 28px; - padding-top: 3px; - transform: translateY(-42.5%) scale(104.5%,100%); + font-size: 31px; + padding-top: 0px; + transform: translateY(-43.5%) scale(105.9%,100%); transform-origin: right; - right: 98px; + right: 90px; font-stretch: semi-expanded; } diff --git a/webroot/images/icons2006/01.png b/webroot/images/icons2006/01.png deleted file mode 100644 index e4b9994..0000000 Binary files a/webroot/images/icons2006/01.png and /dev/null differ diff --git a/webroot/images/icons2006/02.png b/webroot/images/icons2006/02.png deleted file mode 100644 index e1b9bd2..0000000 Binary files a/webroot/images/icons2006/02.png and /dev/null differ diff --git a/webroot/images/icons2006/03.png b/webroot/images/icons2006/03.png deleted file mode 100644 index 6c3a528..0000000 Binary files a/webroot/images/icons2006/03.png and /dev/null differ diff --git a/webroot/images/icons2006/04.png b/webroot/images/icons2006/04.png deleted file mode 100644 index 03a4ccc..0000000 Binary files a/webroot/images/icons2006/04.png and /dev/null differ diff --git a/webroot/images/icons2006/05.png b/webroot/images/icons2006/05.png deleted file mode 100644 index 26f983a..0000000 Binary files a/webroot/images/icons2006/05.png and /dev/null differ diff --git a/webroot/images/icons2006/06.png b/webroot/images/icons2006/06.png deleted file mode 100644 index 1c6bb04..0000000 Binary files a/webroot/images/icons2006/06.png and /dev/null differ diff --git a/webroot/images/icons2006/07.png b/webroot/images/icons2006/07.png deleted file mode 100644 index 26f983a..0000000 Binary files a/webroot/images/icons2006/07.png and /dev/null differ diff --git a/webroot/images/icons2006/08.png b/webroot/images/icons2006/08.png deleted file mode 100644 index db4a017..0000000 Binary files a/webroot/images/icons2006/08.png and /dev/null differ diff --git a/webroot/images/icons2006/09.png b/webroot/images/icons2006/09.png deleted file mode 100644 index 612a378..0000000 Binary files a/webroot/images/icons2006/09.png and /dev/null differ diff --git a/webroot/images/icons2006/10.png b/webroot/images/icons2006/10.png deleted file mode 100644 index 612a378..0000000 Binary files a/webroot/images/icons2006/10.png and /dev/null differ diff --git a/webroot/images/icons2006/11.png b/webroot/images/icons2006/11.png deleted file mode 100644 index 168b4e9..0000000 Binary files a/webroot/images/icons2006/11.png and /dev/null differ diff --git a/webroot/images/icons2006/12.png b/webroot/images/icons2006/12.png deleted file mode 100644 index ee54227..0000000 Binary files a/webroot/images/icons2006/12.png and /dev/null differ diff --git a/webroot/images/icons2006/13.png b/webroot/images/icons2006/13.png deleted file mode 100644 index 10a82e8..0000000 Binary files a/webroot/images/icons2006/13.png and /dev/null differ diff --git a/webroot/images/icons2006/14.png b/webroot/images/icons2006/14.png deleted file mode 100644 index 7e8766d..0000000 Binary files a/webroot/images/icons2006/14.png and /dev/null differ diff --git a/webroot/images/icons2006/15.png b/webroot/images/icons2006/15.png deleted file mode 100644 index 5aebf34..0000000 Binary files a/webroot/images/icons2006/15.png and /dev/null differ diff --git a/webroot/images/icons2006/16.png b/webroot/images/icons2006/16.png deleted file mode 100644 index a3fffdc..0000000 Binary files a/webroot/images/icons2006/16.png and /dev/null differ diff --git a/webroot/images/icons2006/17.png b/webroot/images/icons2006/17.png deleted file mode 100644 index a3fffdc..0000000 Binary files a/webroot/images/icons2006/17.png and /dev/null differ diff --git a/webroot/images/icons2006/20.png b/webroot/images/icons2006/20.png deleted file mode 100644 index c9f540d..0000000 Binary files a/webroot/images/icons2006/20.png and /dev/null differ diff --git a/webroot/images/icons2006/21.png b/webroot/images/icons2006/21.png deleted file mode 100644 index ee7fd86..0000000 Binary files a/webroot/images/icons2006/21.png and /dev/null differ diff --git a/webroot/images/icons2006/22.png b/webroot/images/icons2006/22.png deleted file mode 100644 index 8ad14c0..0000000 Binary files a/webroot/images/icons2006/22.png and /dev/null differ diff --git a/webroot/images/icons2006/23.png b/webroot/images/icons2006/23.png deleted file mode 100644 index 1eb5a9c..0000000 Binary files a/webroot/images/icons2006/23.png and /dev/null differ diff --git a/webroot/images/icons2006/24.png b/webroot/images/icons2006/24.png deleted file mode 100644 index 8732c33..0000000 Binary files a/webroot/images/icons2006/24.png and /dev/null differ diff --git a/webroot/images/icons2006/25.png b/webroot/images/icons2006/25.png deleted file mode 100644 index 2e358d5..0000000 Binary files a/webroot/images/icons2006/25.png and /dev/null differ diff --git a/webroot/images/icons2006/26.png b/webroot/images/icons2006/26.png deleted file mode 100644 index db1ebbd..0000000 Binary files a/webroot/images/icons2006/26.png and /dev/null differ diff --git a/webroot/images/icons2006/27.png b/webroot/images/icons2006/27.png deleted file mode 100644 index f919dbe..0000000 Binary files a/webroot/images/icons2006/27.png and /dev/null differ diff --git a/webroot/images/icons2006/28.png b/webroot/images/icons2006/28.png deleted file mode 100644 index d70efeb..0000000 Binary files a/webroot/images/icons2006/28.png and /dev/null differ diff --git a/webroot/images/icons2006/29.png b/webroot/images/icons2006/29.png deleted file mode 100644 index e1484a7..0000000 Binary files a/webroot/images/icons2006/29.png and /dev/null differ diff --git a/webroot/images/icons2006/30.png b/webroot/images/icons2006/30.png deleted file mode 100644 index c4d857e..0000000 Binary files a/webroot/images/icons2006/30.png and /dev/null differ diff --git a/webroot/images/icons2006/31.png b/webroot/images/icons2006/31.png deleted file mode 100644 index b667de6..0000000 Binary files a/webroot/images/icons2006/31.png and /dev/null differ diff --git a/webroot/images/icons2006/32.png b/webroot/images/icons2006/32.png deleted file mode 100644 index b185f06..0000000 Binary files a/webroot/images/icons2006/32.png and /dev/null differ diff --git a/webroot/images/icons2006/33.png b/webroot/images/icons2006/33.png deleted file mode 100644 index cbd1780..0000000 Binary files a/webroot/images/icons2006/33.png and /dev/null differ diff --git a/webroot/images/icons2006/35.png b/webroot/images/icons2006/35.png deleted file mode 100644 index a3e291a..0000000 Binary files a/webroot/images/icons2006/35.png and /dev/null differ diff --git a/webroot/images/icons2006/37.png b/webroot/images/icons2006/37.png deleted file mode 100644 index 3175bee..0000000 Binary files a/webroot/images/icons2006/37.png and /dev/null differ diff --git a/webroot/images/icons2006/38.png b/webroot/images/icons2006/38.png deleted file mode 100644 index f63c506..0000000 Binary files a/webroot/images/icons2006/38.png and /dev/null differ diff --git a/webroot/images/icons2006/40.png b/webroot/images/icons2006/40.png deleted file mode 100644 index 8cbb3f0..0000000 Binary files a/webroot/images/icons2006/40.png and /dev/null differ diff --git a/webroot/images/icons2006/41.png b/webroot/images/icons2006/41.png deleted file mode 100644 index db1ebbd..0000000 Binary files a/webroot/images/icons2006/41.png and /dev/null differ diff --git a/webroot/images/icons2006/45.png b/webroot/images/icons2006/45.png deleted file mode 100644 index d9abb0a..0000000 Binary files a/webroot/images/icons2006/45.png and /dev/null differ diff --git a/webroot/images/icons2006/46.png b/webroot/images/icons2006/46.png deleted file mode 100644 index dba1aa5..0000000 Binary files a/webroot/images/icons2006/46.png and /dev/null differ diff --git a/webroot/images/icons2006/47.png b/webroot/images/icons2006/47.png deleted file mode 100644 index e4b9994..0000000 Binary files a/webroot/images/icons2006/47.png and /dev/null differ diff --git a/webroot/images/icons2006/49.png b/webroot/images/icons2006/49.png deleted file mode 100644 index 5aebf34..0000000 Binary files a/webroot/images/icons2006/49.png and /dev/null differ diff --git a/webroot/images/icons2007/01.png b/webroot/images/icons2007/01.png new file mode 100644 index 0000000..b436c2d Binary files /dev/null and b/webroot/images/icons2007/01.png differ diff --git a/webroot/images/icons2007/02.png b/webroot/images/icons2007/02.png new file mode 100644 index 0000000..d33a539 Binary files /dev/null and b/webroot/images/icons2007/02.png differ diff --git a/webroot/images/icons2007/03.png b/webroot/images/icons2007/03.png new file mode 100644 index 0000000..f46a9db Binary files /dev/null and b/webroot/images/icons2007/03.png differ diff --git a/webroot/images/icons2007/04.png b/webroot/images/icons2007/04.png new file mode 100644 index 0000000..97854ef Binary files /dev/null and b/webroot/images/icons2007/04.png differ diff --git a/webroot/images/icons2007/05.png b/webroot/images/icons2007/05.png new file mode 100644 index 0000000..e1787b8 Binary files /dev/null and b/webroot/images/icons2007/05.png differ diff --git a/webroot/images/icons2007/06.png b/webroot/images/icons2007/06.png new file mode 100644 index 0000000..21d00b9 Binary files /dev/null and b/webroot/images/icons2007/06.png differ diff --git a/webroot/images/icons2007/07.png b/webroot/images/icons2007/07.png new file mode 100644 index 0000000..1155876 Binary files /dev/null and b/webroot/images/icons2007/07.png differ diff --git a/webroot/images/icons2007/08.png b/webroot/images/icons2007/08.png new file mode 100644 index 0000000..12e234a Binary files /dev/null and b/webroot/images/icons2007/08.png differ diff --git a/webroot/images/icons2007/09.png b/webroot/images/icons2007/09.png new file mode 100644 index 0000000..8e0711e Binary files /dev/null and b/webroot/images/icons2007/09.png differ diff --git a/webroot/images/icons2007/10.png b/webroot/images/icons2007/10.png new file mode 100644 index 0000000..f083558 Binary files /dev/null and b/webroot/images/icons2007/10.png differ diff --git a/webroot/images/icons2007/11.png b/webroot/images/icons2007/11.png new file mode 100644 index 0000000..3cd5b0f Binary files /dev/null and b/webroot/images/icons2007/11.png differ diff --git a/webroot/images/icons2007/12.png b/webroot/images/icons2007/12.png new file mode 100644 index 0000000..8ac1c85 Binary files /dev/null and b/webroot/images/icons2007/12.png differ diff --git a/webroot/images/icons2007/13.png b/webroot/images/icons2007/13.png new file mode 100644 index 0000000..2b4806a Binary files /dev/null and b/webroot/images/icons2007/13.png differ diff --git a/webroot/images/icons2007/14.png b/webroot/images/icons2007/14.png new file mode 100644 index 0000000..837aaff Binary files /dev/null and b/webroot/images/icons2007/14.png differ diff --git a/webroot/images/icons2007/15.png b/webroot/images/icons2007/15.png new file mode 100644 index 0000000..c0b24cf Binary files /dev/null and b/webroot/images/icons2007/15.png differ diff --git a/webroot/images/icons2007/16.png b/webroot/images/icons2007/16.png new file mode 100644 index 0000000..edf70e2 Binary files /dev/null and b/webroot/images/icons2007/16.png differ diff --git a/webroot/images/icons2007/17.png b/webroot/images/icons2007/17.png new file mode 100644 index 0000000..edf70e2 Binary files /dev/null and b/webroot/images/icons2007/17.png differ diff --git a/webroot/images/icons2006/18.png b/webroot/images/icons2007/18.png similarity index 100% rename from webroot/images/icons2006/18.png rename to webroot/images/icons2007/18.png diff --git a/webroot/images/icons2006/19.png b/webroot/images/icons2007/19.png similarity index 100% rename from webroot/images/icons2006/19.png rename to webroot/images/icons2007/19.png diff --git a/webroot/images/icons2007/20.png b/webroot/images/icons2007/20.png new file mode 100644 index 0000000..d3870e0 Binary files /dev/null and b/webroot/images/icons2007/20.png differ diff --git a/webroot/images/icons2007/21.png b/webroot/images/icons2007/21.png new file mode 100644 index 0000000..3b1d0e7 Binary files /dev/null and b/webroot/images/icons2007/21.png differ diff --git a/webroot/images/icons2007/22.png b/webroot/images/icons2007/22.png new file mode 100644 index 0000000..fc7f843 Binary files /dev/null and b/webroot/images/icons2007/22.png differ diff --git a/webroot/images/icons2007/23.png b/webroot/images/icons2007/23.png new file mode 100644 index 0000000..e1ff9fe Binary files /dev/null and b/webroot/images/icons2007/23.png differ diff --git a/webroot/images/icons2007/24.png b/webroot/images/icons2007/24.png new file mode 100644 index 0000000..f796b81 Binary files /dev/null and b/webroot/images/icons2007/24.png differ diff --git a/webroot/images/icons2007/25.png b/webroot/images/icons2007/25.png new file mode 100644 index 0000000..d0abf6a Binary files /dev/null and b/webroot/images/icons2007/25.png differ diff --git a/webroot/images/icons2007/26.png b/webroot/images/icons2007/26.png new file mode 100644 index 0000000..fd1cda1 Binary files /dev/null and b/webroot/images/icons2007/26.png differ diff --git a/webroot/images/icons2007/27.png b/webroot/images/icons2007/27.png new file mode 100644 index 0000000..46b49e8 Binary files /dev/null and b/webroot/images/icons2007/27.png differ diff --git a/webroot/images/icons2007/28.png b/webroot/images/icons2007/28.png new file mode 100644 index 0000000..20ecdc9 Binary files /dev/null and b/webroot/images/icons2007/28.png differ diff --git a/webroot/images/icons2007/29.png b/webroot/images/icons2007/29.png new file mode 100644 index 0000000..391e368 Binary files /dev/null and b/webroot/images/icons2007/29.png differ diff --git a/webroot/images/icons2007/30.png b/webroot/images/icons2007/30.png new file mode 100644 index 0000000..53c828c Binary files /dev/null and b/webroot/images/icons2007/30.png differ diff --git a/webroot/images/icons2007/31.png b/webroot/images/icons2007/31.png new file mode 100644 index 0000000..7f50ee3 Binary files /dev/null and b/webroot/images/icons2007/31.png differ diff --git a/webroot/images/icons2007/32.png b/webroot/images/icons2007/32.png new file mode 100644 index 0000000..cfa3d43 Binary files /dev/null and b/webroot/images/icons2007/32.png differ diff --git a/webroot/images/icons2007/33.png b/webroot/images/icons2007/33.png new file mode 100644 index 0000000..cc6baf0 Binary files /dev/null and b/webroot/images/icons2007/33.png differ diff --git a/webroot/images/icons2007/34.png b/webroot/images/icons2007/34.png new file mode 100644 index 0000000..edf1b7a Binary files /dev/null and b/webroot/images/icons2007/34.png differ diff --git a/webroot/images/icons2007/35.png b/webroot/images/icons2007/35.png new file mode 100644 index 0000000..725889b Binary files /dev/null and b/webroot/images/icons2007/35.png differ diff --git a/webroot/images/icons2006/36.png b/webroot/images/icons2007/36.png similarity index 100% rename from webroot/images/icons2006/36.png rename to webroot/images/icons2007/36.png diff --git a/webroot/images/icons2007/37.png b/webroot/images/icons2007/37.png new file mode 100644 index 0000000..9963cae Binary files /dev/null and b/webroot/images/icons2007/37.png differ diff --git a/webroot/images/icons2007/38.png b/webroot/images/icons2007/38.png new file mode 100644 index 0000000..19c663d Binary files /dev/null and b/webroot/images/icons2007/38.png differ diff --git a/webroot/images/icons2006/39.png b/webroot/images/icons2007/39.png similarity index 100% rename from webroot/images/icons2006/39.png rename to webroot/images/icons2007/39.png diff --git a/webroot/images/icons2007/40.png b/webroot/images/icons2007/40.png new file mode 100644 index 0000000..2825951 Binary files /dev/null and b/webroot/images/icons2007/40.png differ diff --git a/webroot/images/icons2007/41.png b/webroot/images/icons2007/41.png new file mode 100644 index 0000000..fd1cda1 Binary files /dev/null and b/webroot/images/icons2007/41.png differ diff --git a/webroot/images/icons2006/42.png b/webroot/images/icons2007/42.png similarity index 100% rename from webroot/images/icons2006/42.png rename to webroot/images/icons2007/42.png diff --git a/webroot/images/icons2006/44.png b/webroot/images/icons2007/44.png similarity index 100% rename from webroot/images/icons2006/44.png rename to webroot/images/icons2007/44.png diff --git a/webroot/images/icons2007/45.png b/webroot/images/icons2007/45.png new file mode 100644 index 0000000..d994129 Binary files /dev/null and b/webroot/images/icons2007/45.png differ diff --git a/webroot/images/icons2007/46.png b/webroot/images/icons2007/46.png new file mode 100644 index 0000000..f5680ea Binary files /dev/null and b/webroot/images/icons2007/46.png differ diff --git a/webroot/images/icons2007/47.png b/webroot/images/icons2007/47.png new file mode 100644 index 0000000..b436c2d Binary files /dev/null and b/webroot/images/icons2007/47.png differ diff --git a/webroot/images/icons2007/49.png b/webroot/images/icons2007/49.png new file mode 100644 index 0000000..c0b24cf Binary files /dev/null and b/webroot/images/icons2007/49.png differ diff --git a/webroot/images/icons2006/50.png b/webroot/images/icons2007/50.png similarity index 100% rename from webroot/images/icons2006/50.png rename to webroot/images/icons2007/50.png diff --git a/webroot/images/icons2007/moonphases/full.png b/webroot/images/icons2007/moonphases/full.png new file mode 100644 index 0000000..eeab6cc Binary files /dev/null and b/webroot/images/icons2007/moonphases/full.png differ diff --git a/webroot/images/icons2007/moonphases/half1.png b/webroot/images/icons2007/moonphases/half1.png new file mode 100644 index 0000000..2b2e90c Binary files /dev/null and b/webroot/images/icons2007/moonphases/half1.png differ diff --git a/webroot/images/icons2007/moonphases/half2.png b/webroot/images/icons2007/moonphases/half2.png new file mode 100644 index 0000000..bca991d Binary files /dev/null and b/webroot/images/icons2007/moonphases/half2.png differ diff --git a/webroot/images/icons2007/moonphases/new.png b/webroot/images/icons2007/moonphases/new.png new file mode 100644 index 0000000..7cbafa6 Binary files /dev/null and b/webroot/images/icons2007/moonphases/new.png differ diff --git a/webroot/js/newweathermanager.js b/webroot/js/newweathermanager.js index 0120a78..226843f 100644 --- a/webroot/js/newweathermanager.js +++ b/webroot/js/newweathermanager.js @@ -851,9 +851,7 @@ function grabHealthData() { $.getJSON('https://api.weather.com/v3/wx/globalAirQuality?geocode=' + maincitycoords.lat + ',' + maincitycoords.lon + "&language=en-US&scale=EPA&format=json&apiKey=" + api_key, function(data) { var airqualitydata = data weatherInfo.airquality.airqualityindex = airqualitydata.globalairquality.airQualityCategoryIndex - if (airqualitydata.globalairquality.primaryPollutant == "PM2.5" || airqualitydata.globalairquality.primaryPollutant == "PM10") { - weatherInfo.airquality.primarypolute = 'Fine Particulate' - } else {weatherInfo.airquality.primarypolute = airqualitydata.globalairquality.primaryPollutant}; + weatherInfo.airquality.primarypolute = (airqualitydata.globalairquality.primaryPollutant).replace('PM10','Fine Particulate').replace('PM2.5','Fine Particulate').replace('O3','Ozone') weatherInfo.airquality.date = dateFns.format(new Date(airqualitydata.globalairquality.expireTimeGmt * 1000), "dddd") }); $.getJSON('https://api.weather.com/v2/indices/uv/current?geocode=' + maincitycoords.lat + ',' + maincitycoords.lon + "&language=en-US&format=json&apiKey=" + api_key, function(data) { diff --git a/webroot/js/slides-loop.js b/webroot/js/slides-loop.js index ddc51c2..77b06a9 100644 --- a/webroot/js/slides-loop.js +++ b/webroot/js/slides-loop.js @@ -605,7 +605,7 @@ var mainMap // fade out info, fade in radar weatherAudio.playLocalRadar(); if (withsat == true) { - $('.radar-slide .infosubbheader .subheadtitle').text('Radar/Satellite') + $('.radar-slide .info-subheader .subhead-title').text('Radar/Satellite') $('.radar-slide .radar-legends .pastlegend').text('Past 5 Hours') } $('.radar-slide').fadeIn(0); @@ -966,11 +966,18 @@ var mainMap } else { if (weatherInfo.healthforecast.dayidx == 0 && dateFns.getHours(new Date()) >= 4) { $('.info-slide-content.health-forecast .mainforecast .hightext').css("right","85px"); - $('.info-slide-content.health-forecast .mainforecast .hightext').css("top","226.5"); + $('.info-slide-content.health-forecast .mainforecast .hightext').css("top","226.5px"); $('.info-slide-content.health-forecast .mainforecast .high').css("left","95px"); $('.info-slide-content.health-forecast .mainforecast .high').css("top","239px"); $('.info-slide-content.health-forecast .mainforecast .lowtext').fadeOut(0) $('.info-slide-content.health-forecast .mainforecast .low').fadeOut(0) + } else { + $('.info-slide-content.health-forecast .mainforecast .hightext').removeAttr("style"); + $('.info-slide-content.health-forecast .mainforecast .hightext').removeAttr("style"); + $('.info-slide-content.health-forecast .mainforecast .high').removeAttr("style"); + $('.info-slide-content.health-forecast .mainforecast .high').removeAttr("style"); + $('.info-slide-content.health-forecast .mainforecast .lowtext').fadeIn(0) + $('.info-slide-content.health-forecast .mainforecast .low').fadeIn(0) } $('.info-slide-content.health-forecast .thing').text("Forecast for " + weatherInfo.healthforecast.day) $('.info-slide-content.health-forecast .mainforecast .hightext').text(weatherInfo.healthforecast.high)