From 8ce2e4fb1d3a023402cf162127afad5d09c1e4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerald=20Ba=CC=88ck?= Date: Wed, 28 May 2014 12:19:17 +0200 Subject: [PATCH 01/10] one div too much in index.php --- index.php | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/index.php b/index.php index e1318aa200..f6ee286aa9 100644 --- a/index.php +++ b/index.php @@ -13,21 +13,33 @@ -
-
-
Vaatwasser is klaar!
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Vaatwasser is klaar!
+
+
+
+
+
+
+
- - - - - - - - - + + + + + + + From d708cf88c72b050541d2d4a6a100eb0083fff58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerald=20Ba=CC=88ck?= Date: Thu, 29 May 2014 13:25:10 +0200 Subject: [PATCH 02/10] austrianized greetings --- js/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/config.js b/js/config.js index b88f939d03..4c177bc12e 100644 --- a/js/config.js +++ b/js/config.js @@ -13,7 +13,7 @@ var weatherParams = { // compliments: var compliments = [ 'Hey, handsome!', - 'Hi, sexy!', + 'Hallo, Mausl!', 'Hello, beauty!', 'You look sexy!', 'Wow, you look hot!', From 51e1863c4c763a2e3236fbe980c94b83b6056170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerald=20Ba=CC=88ck?= Date: Thu, 29 May 2014 13:39:07 +0200 Subject: [PATCH 03/10] changed feed url --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index 1d096b0059..02599735d9 100644 --- a/js/main.js +++ b/js/main.js @@ -297,7 +297,7 @@ jQuery(document).ready(function($) { (function fetchNews() { $.feedToJson({ - feed:'http://feeds.nos.nl/nosjournaal?format=rss', + feed:'http://derstandard.at/?page=rss', //feed:'http://www.nu.nl/feeds/rss/achterklap.rss', //feed:'http://www.nu.nl/feeds/rss/opmerkelijk.rss', success: function(data){ From 9c904d9211d5b26b015fdf056acda58899bc8017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerald=20Ba=CC=88ck?= Date: Thu, 29 May 2014 13:47:07 +0200 Subject: [PATCH 04/10] more settings changes --- js/config.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/js/config.js b/js/config.js index 4c177bc12e..e5efc8981e 100644 --- a/js/config.js +++ b/js/config.js @@ -5,19 +5,21 @@ var lang = window.navigator.language; //change weather params here: var weatherParams = { - 'q':'Baarn,Netherlands', + 'q':'Vienna,Austria', 'units':'metric', 'lang':lang }; // compliments: var compliments = [ - 'Hey, handsome!', - 'Hallo, Mausl!', - 'Hello, beauty!', - 'You look sexy!', - 'Wow, you look hot!', - 'Looking good today!', - 'You look nice!', - 'Enjoy your day!' - ]; + 'Hallo, Mausl!', + 'Hello, beauty!', + 'Hallo, es ist schon morgen in der Früh!', + 'Wow, you look hot!', + 'Looking good today!', + 'You look nice!', + 'Enjoy your day!' +]; + +// feed +var feed = ''; \ No newline at end of file From 88dac4a11640aa54802a5a361f844b8b832f778f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerald=20Ba=CC=88ck?= Date: Thu, 29 May 2014 13:50:40 +0200 Subject: [PATCH 05/10] more settings --- js/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/config.js b/js/config.js index e5efc8981e..5855021648 100644 --- a/js/config.js +++ b/js/config.js @@ -13,7 +13,7 @@ var weatherParams = { // compliments: var compliments = [ 'Hallo, Mausl!', - 'Hello, beauty!', + 'Seas!', 'Hallo, es ist schon morgen in der Früh!', 'Wow, you look hot!', 'Looking good today!', From 2a9c3ad0ebb3ba8cb029d9c3a8dbe32ebf43a88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerald=20Ba=CC=88ck?= Date: Thu, 29 May 2014 13:57:16 +0200 Subject: [PATCH 06/10] newsfeed is now part of the settings file --- js/config.js | 2 +- js/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/config.js b/js/config.js index 5855021648..de05e5194a 100644 --- a/js/config.js +++ b/js/config.js @@ -22,4 +22,4 @@ var compliments = [ ]; // feed -var feed = ''; \ No newline at end of file +var newsfeed = 'http://derStandard.at/?page=rss&ressort=Seite1'; \ No newline at end of file diff --git a/js/main.js b/js/main.js index 02599735d9..2e246e731a 100644 --- a/js/main.js +++ b/js/main.js @@ -297,7 +297,7 @@ jQuery(document).ready(function($) { (function fetchNews() { $.feedToJson({ - feed:'http://derstandard.at/?page=rss', + feed: newsfeed, //feed:'http://www.nu.nl/feeds/rss/achterklap.rss', //feed:'http://www.nu.nl/feeds/rss/opmerkelijk.rss', success: function(data){ From 0ed0bede06ea061f025ad35a2aaa338343d3bd95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerald=20Ba=CC=88ck?= Date: Thu, 29 May 2014 14:10:00 +0200 Subject: [PATCH 07/10] css now included with link rel="stylesheet" and without php --- index.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/index.php b/index.php index f6ee286aa9..1721d2dae2 100644 --- a/index.php +++ b/index.php @@ -1,9 +1,7 @@ Magic Mirror - +