diff --git a/css/main.css b/css/main.css index fed22c1b..7fbdd4ed 100644 --- a/css/main.css +++ b/css/main.css @@ -134,6 +134,16 @@ body, html { margin-right: 10px; } +.icon-small +{ + position: relative; + display: inline-block; + font-size: 20px; + padding-left: 10px; + padding-right: -10px; + font-weight: 100; +} + .time .sec { font-size: 25px; color: #666; diff --git a/js/config.js b/js/config.js index b88f939d..8b882afa 100644 --- a/js/config.js +++ b/js/config.js @@ -4,12 +4,18 @@ var lang = window.navigator.language; //var lang = 'en'; //change weather params here: +//units: metric or imperial var weatherParams = { - 'q':'Baarn,Netherlands', - 'units':'metric', + 'q':'New York, NY', + 'units':'imperial', 'lang':lang }; +//var feed = 'http://feeds.nos.nl/nosjournaal?format=rss'; +//var feed = 'http://www.nu.nl/feeds/rss/achterklap.rss'; +//var feed = 'http://www.nu.nl/feeds/rss/opmerkelijk.rss'; +var feed = 'http://www.nytimes.com/services/xml/rss/nyt/HomePage.xml'; + // compliments: var compliments = [ 'Hey, handsome!', diff --git a/js/main.js b/js/main.js index 5ee66995..fe5ec00a 100644 --- a/js/main.js +++ b/js/main.js @@ -249,6 +249,26 @@ jQuery(document).ready(function($) { (function updateWeatherForecast() { + var iconTable = { + '01d':'wi-day-sunny', + '02d':'wi-day-cloudy', + '03d':'wi-cloudy', + '04d':'wi-cloudy-windy', + '09d':'wi-showers', + '10d':'wi-rain', + '11d':'wi-thunderstorm', + '13d':'wi-snow', + '50d':'wi-fog', + '01n':'wi-night-clear', + '02n':'wi-night-cloudy', + '03n':'wi-night-cloudy', + '04n':'wi-night-cloudy', + '09n':'wi-night-showers', + '10n':'wi-night-rain', + '11n':'wi-night-thunderstorm', + '13n':'wi-night-snow', + '50n':'wi-night-alt-cloudy-windy' + } $.getJSON('http://api.openweathermap.org/data/2.5/forecast', weatherParams, function(json, textStatus) { var forecastData = {}; @@ -260,10 +280,12 @@ jQuery(document).ready(function($) { if (forecastData[dateKey] == undefined) { forecastData[dateKey] = { 'timestamp':forecast.dt * 1000, + 'icon':forecast.weather[0].icon, 'temp_min':forecast.main.temp, 'temp_max':forecast.main.temp }; } else { + forecastData[dateKey]['icon'] = forecast.weather[0].icon; forecastData[dateKey]['temp_min'] = (forecast.main.temp < forecastData[dateKey]['temp_min']) ? forecast.main.temp : forecastData[dateKey]['temp_min']; forecastData[dateKey]['temp_max'] = (forecast.main.temp > forecastData[dateKey]['temp_max']) ? forecast.main.temp : forecastData[dateKey]['temp_max']; } @@ -275,10 +297,12 @@ jQuery(document).ready(function($) { var opacity = 1; for (var i in forecastData) { var forecast = forecastData[i]; + var iconClass = iconTable[forecast.icon]; var dt = new Date(forecast.timestamp); var row = $('