Merge pull request #1011 from wvhn/develop

Prepare release v3.5

changelog.md

@@ -1,4 +1,4 @@
-## 3.4.a
+## 3.5
 ### Important for the current release to avoid breaking changes
 - imports of widgets must be deleted from the visu pages or the namespace @widgets must be used. 
   Visit https://knx-user-forum.de/forum/supportforen/smartvisu/1920060-handlungsbedarf-ma%C3%9Fnahmen-gegen-seitenladefehler-ab-v3-4-a-v3-5

lang/de.ini

@@ -589,6 +589,7 @@ backup = "Einstellungen sichern"
 docu = "Dokumentation"
 forum = "Unterstützung im knx-user-forum"
 github = "Quellen auf Github"
+newstuff = "Neue Widgets und Erweiterungen"
 connected = "verbunden seit"
 location = "Ortsinformationen"
 moonphase = "Mondphase"

lang/en.ini

@@ -571,6 +571,7 @@ backup = "Backup config"
 docu = "Documentation"
 forum = "Support on knx-user-forum"
 github = "Sources on Github"
+newstuff = "New widgets and supplements"
 connected = "connected since"
 location = "location info"
 moonphase = "moonphase"

lang/fr.ini

@@ -364,6 +364,7 @@ backup = "Sauvegarde de configuration"
 docu = "Documentation"
 forum = "Support dans le knx-user-forum"
 github = "Sources sur Github"
+newstuff = "Nouveaux widgets et additifs"
 connected = "connecté depuis"
 location = "Informations du lieu"
 moonphase = "phase de la lune"

lang/it.ini

@@ -550,6 +550,7 @@ backup = "Backup configurazione"
 docu = "Documentazione"
 forum = "Assistenza nel knx-user-forum"
 github = "Codice sorgente su Github"
+newstuff = "Nuovi widget e estensioni"
 connected = "interconnettato da"
 location = "Informazioni del luogo"
 moonphase = "fase lunare"

lib/base/check_php_mbstring.php

@@ -3,7 +3,7 @@
  * -----------------------------------------------------------------------------
  * @package     smartVISU
  * @author      Martin Gleiß
- * @copyright   2012 - 2015
+ * @copyright   2012 - 2024
  * @license     GPL [http://www.gnu.de]
  * -----------------------------------------------------------------------------
  */
@@ -17,12 +17,12 @@
 
 if (extension_loaded("mbstring"))
 {
-	$ret = array('icon' => 'message_ok.svg', 'text' => "PHP extension 'mbstring' loaded");
+	$ret = array('icon' => 'message_ok.svg', 'text' => translate("PHP extension 'mbstring' loaded", 'templatechecker'));
 }
 else
 {
 	header("HTTP/1.0 600 smartVISU Config Error");
-	$ret = array('icon' => 'message_attention.svg', 'text' => "PHP extension 'mbstring' not loaded!");
+	$ret = array('icon' => 'message_attention.svg', 'text' => translate("PHP extension 'mbstring' not loaded!", 'templatechecker'));
 }
 
 echo json_encode($ret);

pages/base/menu.html

@@ -1,8 +1,8 @@
 /**
 * -----------------------------------------------------------------------------
 * @package     smartVISU
-* @author      Martin Gleiss, Wolfram v. Hülsen
-* @copyright   2012 - 2023
+* @author      Martin Gleiß, Wolfram v. Hülsen
+* @copyright   2012 - 2024
 * @license     GPL [http://www.gnu.de]
 * -----------------------------------------------------------------------------
 */

pages/base/system_menu.html

@@ -81,6 +81,13 @@ <h3>{{ lang('system', 'forum') }}</h3>
 				<h3>{{ lang('system', 'github') }}</h3>
 			</a>
 		</li>
+
+		<li class="ui-li-has-thumb" data-icon="false">
+			<a href="https://github.com/smartvisu-newstuff" target="_blank">
+				{{ lib.svgimg ('', 'edit_favorites', 'icon0', '') }}
+				<h3>{{ lang('system', 'newstuff') }}</h3>
+			</a>
+		</li>
 
 		<li data-role="list-divider">Info</li>
 

pages/docu/device/widget_device.codepad.html

@@ -34,7 +34,7 @@ <h5>Example</h5>
 </div>
 	<br/>
 	<div>
-		If you want to test ist, the correct number for that codepad is: <b>{{ config_codepad_code }}</b>
+		If you want to test it, the correct number for that codepad is: <b>{{ config_codepad_code }}</b>
 	</div>
 	<div class="codepad" data-bind='codepad1' >
 		{{ basic.stateswitch('', 'bath.light.switch', 'icon') }}

readme.md

@@ -2,10 +2,6 @@
 
 [![Join the chat at https://gitter.im/sVISU/Lobby](https://badges.gitter.im/sVISU/Lobby.svg)](https://gitter.im/sVISU/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-## Warning ! The current version in this develop branch is experimental and should not be used in productive environments!
-Use version v3.4 from master branch instead.
-
-
 ## DESCRIPTION
 smartVISU is a framework to create a visualisation for smart home environments with simple html-pages.  
 It can be used with several smart home automation backends or directly on KNX.  

version-info.php

@@ -1,6 +1,6 @@
 <?php
 define ('config_visu', 'smartVISU');
 define ('config_version_major', '3');
-define ('config_version_minor', '4');
-define ('config_version_revision', 'a');
+define ('config_version_minor', '5');
+define ('config_version_revision', '0');
 ?>

widgets/plot.html

@@ -90,7 +90,7 @@
 * @param {text[?](line,linestack,stair,spline,area,areastair,areaspline,areastack,column,columnstack)=line} type of each serie: 'line', 'linestack', 'stair', 'spline', 'area', 'areastair', 'areaspline', 'areastack','column', 'columnstack'; multiples in array form (optional, default 'line')
 * @param {text[?]=} title for the x-axis and y-axes in array form: [title_x-axis, title_y-axis1, title_y-axis2, ...] (optional)
 * @param {duration(advanced,day)=} minimal time range while zooming or 'advanced' or 'day' (optional, duration-format)
-	By passing 'advanced' a seaparate range selector is shown and data grouping for large amount of data is enabled
+	By passing 'advanced' a separate range selector is shown and data grouping for large amount of data is enabled
 	By passing 'day', the plot is shown from 0:00 until 24:00 on the day starting after tmin. Set tmin  to '24h' or '1d' for today, '48h' or '2d' for yesterday and so on. tmax must be 'now' or at least 48 hours less than tmin. 
 * @param {value[?]=} assignment of the series to the y-axes; multiples in array form (optional)
 * @param {value[?]=} y-axes setup for left '0' and right '1' hand in array form (optional)