From cc589376b020ed0e0653b0f6eba71a8680dd5114 Mon Sep 17 00:00:00 2001
From: wvhn <17801971+wvhn@users.noreply.github.com>
Date: Fri, 7 May 2021 09:29:35 +0200
Subject: [PATCH 1/4] update info on weather services

---
 .gitignore                             | 12 ------------
 pages/docu/weather/widget_weather.html | 12 +++++++++---
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74673aad0..0764f9ab9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,15 +2,3 @@ config.ini
 /config.php
 .DS_Store
 readme.md
-
-# ignore directories below /pages exept listed exceptions
-/pages
-!/pages/_template
-!/pages/base
-!/pages/docu
-!/pages/example1.smarthome
-!/pages/example2.knxd
-!/pages/example3.graphic
-!/pages/example4.quad
-!/pages/kurzanleitung
-!/pages/smarthome
diff --git a/pages/docu/weather/widget_weather.html b/pages/docu/weather/widget_weather.html
index 4368c841c..cbc88cc5e 100644
--- a/pages/docu/weather/widget_weather.html
+++ b/pages/docu/weather/widget_weather.html
@@ -19,12 +19,13 @@ <h1>Weather-Widgets</h1>
 	The weather widgets get their information from an online weather service. Each service works
 	a little bit different - especially the 'location' format.
 	<br /><br />
-	<b><a href="http://www.yr.no" target="_blank">yr.no</a></b><br />
-	The location format must be 'Tyskland/Bayern/Würzburg'. Go to the webpage to get your location from the url.
+	<b><a href="http://www.met.no" target="_blank">met.no</a></b><br />
+	The location format must be geograpchic coordinates, e.g. 'lat=50.93331&lon=6.95'.
 
 	<br /><br />
 	<b><a href="http://www.openweathermap.org" target="_blank">openweathermap</a></b><br />
-	The location format must be 'Würzburg, DE'. Go to the webpage to get your location from the url.
+	The location format can be 'Köln, DE', postal code 'zip=50667,DE', Openweathermap location ID 'id=2886242' or the
+	geographic coordinates 'lat=50.93331&lon=6.95'. 
 	You need to register with openweathermap to get a free API key.
 	
 	<br /><br />
@@ -33,6 +34,11 @@ <h1>Weather-Widgets</h1>
 	Fill it into the location field. The public key is '6532d6454b8aa370768e63d6ba5a832e'. 
 	Additionally, you need your postal code, e.g. '97070:DE'
 
+	<br /><br />
+	<b><a href="http://www.yr.no" target="_blank">yr.no</a></b><br />
+	The location format must be 'Tyskland/Bayern/Würzburg'. Go to the webpage to get your location from the url.
+	The yr.no service is deprecated as per smartVISU v3.1. Replacement is met.no.
+
 	<br /><br />
 	<b><a href="https://darksky.net/dev" target="_blank">darksky.net</a></b><br />
 	You need a key for that service. Go to the webpage to generate your own key.<br />

From 8ba83b0604e35507fd550aa6c0a576d1cf52f107 Mon Sep 17 00:00:00 2001
From: wvhn <17801971+wvhn@users.noreply.github.com>
Date: Fri, 7 May 2021 09:47:24 +0200
Subject: [PATCH 2/4] Revert "update info on weather services"

This reverts commit cc589376b020ed0e0653b0f6eba71a8680dd5114.
---
 .gitignore                             | 12 ++++++++++++
 pages/docu/weather/widget_weather.html | 12 +++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0764f9ab9..74673aad0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,15 @@ config.ini
 /config.php
 .DS_Store
 readme.md
+
+# ignore directories below /pages exept listed exceptions
+/pages
+!/pages/_template
+!/pages/base
+!/pages/docu
+!/pages/example1.smarthome
+!/pages/example2.knxd
+!/pages/example3.graphic
+!/pages/example4.quad
+!/pages/kurzanleitung
+!/pages/smarthome
diff --git a/pages/docu/weather/widget_weather.html b/pages/docu/weather/widget_weather.html
index cbc88cc5e..4368c841c 100644
--- a/pages/docu/weather/widget_weather.html
+++ b/pages/docu/weather/widget_weather.html
@@ -19,13 +19,12 @@ <h1>Weather-Widgets</h1>
 	The weather widgets get their information from an online weather service. Each service works
 	a little bit different - especially the 'location' format.
 	<br /><br />
-	<b><a href="http://www.met.no" target="_blank">met.no</a></b><br />
-	The location format must be geograpchic coordinates, e.g. 'lat=50.93331&lon=6.95'.
+	<b><a href="http://www.yr.no" target="_blank">yr.no</a></b><br />
+	The location format must be 'Tyskland/Bayern/Würzburg'. Go to the webpage to get your location from the url.
 
 	<br /><br />
 	<b><a href="http://www.openweathermap.org" target="_blank">openweathermap</a></b><br />
-	The location format can be 'Köln, DE', postal code 'zip=50667,DE', Openweathermap location ID 'id=2886242' or the
-	geographic coordinates 'lat=50.93331&lon=6.95'. 
+	The location format must be 'Würzburg, DE'. Go to the webpage to get your location from the url.
 	You need to register with openweathermap to get a free API key.
 	
 	<br /><br />
@@ -34,11 +33,6 @@ <h1>Weather-Widgets</h1>
 	Fill it into the location field. The public key is '6532d6454b8aa370768e63d6ba5a832e'. 
 	Additionally, you need your postal code, e.g. '97070:DE'
 
-	<br /><br />
-	<b><a href="http://www.yr.no" target="_blank">yr.no</a></b><br />
-	The location format must be 'Tyskland/Bayern/Würzburg'. Go to the webpage to get your location from the url.
-	The yr.no service is deprecated as per smartVISU v3.1. Replacement is met.no.
-
 	<br /><br />
 	<b><a href="https://darksky.net/dev" target="_blank">darksky.net</a></b><br />
 	You need a key for that service. Go to the webpage to generate your own key.<br />

From 8cafa20aeaa55abfa28c21afa8ace71ed10e086b Mon Sep 17 00:00:00 2001
From: wvhn <17801971+wvhn@users.noreply.github.com>
Date: Fri, 7 May 2021 09:48:51 +0200
Subject: [PATCH 3/4] update info on weather services

---
 pages/docu/weather/widget_weather.html | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/docu/weather/widget_weather.html b/pages/docu/weather/widget_weather.html
index 4368c841c..cbc88cc5e 100644
--- a/pages/docu/weather/widget_weather.html
+++ b/pages/docu/weather/widget_weather.html
@@ -19,12 +19,13 @@ <h1>Weather-Widgets</h1>
 	The weather widgets get their information from an online weather service. Each service works
 	a little bit different - especially the 'location' format.
 	<br /><br />
-	<b><a href="http://www.yr.no" target="_blank">yr.no</a></b><br />
-	The location format must be 'Tyskland/Bayern/Würzburg'. Go to the webpage to get your location from the url.
+	<b><a href="http://www.met.no" target="_blank">met.no</a></b><br />
+	The location format must be geograpchic coordinates, e.g. 'lat=50.93331&lon=6.95'.
 
 	<br /><br />
 	<b><a href="http://www.openweathermap.org" target="_blank">openweathermap</a></b><br />
-	The location format must be 'Würzburg, DE'. Go to the webpage to get your location from the url.
+	The location format can be 'Köln, DE', postal code 'zip=50667,DE', Openweathermap location ID 'id=2886242' or the
+	geographic coordinates 'lat=50.93331&lon=6.95'. 
 	You need to register with openweathermap to get a free API key.
 	
 	<br /><br />
@@ -33,6 +34,11 @@ <h1>Weather-Widgets</h1>
 	Fill it into the location field. The public key is '6532d6454b8aa370768e63d6ba5a832e'. 
 	Additionally, you need your postal code, e.g. '97070:DE'
 
+	<br /><br />
+	<b><a href="http://www.yr.no" target="_blank">yr.no</a></b><br />
+	The location format must be 'Tyskland/Bayern/Würzburg'. Go to the webpage to get your location from the url.
+	The yr.no service is deprecated as per smartVISU v3.1. Replacement is met.no.
+
 	<br /><br />
 	<b><a href="https://darksky.net/dev" target="_blank">darksky.net</a></b><br />
 	You need a key for that service. Go to the webpage to generate your own key.<br />

From b8af6f92b3e9b5167815c0f3cc938242643b8764 Mon Sep 17 00:00:00 2001
From: wvhn <17801971+wvhn@users.noreply.github.com>
Date: Fri, 7 May 2021 13:03:11 +0200
Subject: [PATCH 4/4] set new version

---
 version-info.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version-info.php b/version-info.php
index 5d959b475..347924c59 100644
--- a/version-info.php
+++ b/version-info.php
@@ -1,7 +1,7 @@
 <?php
 define ('config_visu', 'smartVISU');
-define ('config_version', '3.0');  // deprecated as from v3.0
+define ('config_version', '3.1');  // deprecated as from v3.0
 define ('config_version_major', '3');
-define ('config_version_minor', '0');
-define ('config_version_revision', 'a');
+define ('config_version_minor', '1');
+define ('config_version_revision', '0');
 ?>