WebUI: Update Check, Cleanup and Hyperion Switcher IPv6 Fix

Update Check:
- New Property which allows you to select stable or beta branch checks.
- This would rely on current versions.json. It selects the first version in list with you branch (stable, beta). If it is newer hyperion tells you that a update is available
- For this we should keep our deployment pipeline in mind to format the json this way.

Cleanup:
- I cleaned up the WebUI from dead links and the support page with the affiliate links and donation adresses as we don't have them under our control. Currently only disabled, not deleated

Switcher:
- If the address which is published via bonjour serve is IPv6 the Switcher was bugged. Fixed that.

assets/webconfig/content/about.html

@@ -30,7 +30,7 @@
 	lang = lang.toString().replace(/,/g,", ");
 
 	var fc = ['<span id="danger_trig">'+$.i18n("about_version")+'<span>',$.i18n("about_build"),$.i18n("about_builddate"),$.i18n("about_translations"),$.i18n("about_resources", $.i18n("general_webui_title"))];
-	var sc = [currentVersion,si.build,si.time,'('+availLang.length+')<p>'+lang+'</p><p><a href="https://hyperion-project.org/contribute/?pk_campaign=WebUI&pk_kwd=about_contribute" target="_blank">'+$.i18n("about_contribute")+'</a></p>',libh];
+	var sc = [currentVersion,si.build,si.time,'('+availLang.length+')<p>'+lang+'</p><p><a href="https://github.com/hyperion-project/hyperion.ng" target="_blank">'+$.i18n("about_contribute")+'</a></p>',libh];
 
 	createTable("","atb","about_cont");
 	for(var i = 0; i<fc.length; i++)

assets/webconfig/content/conf_logging.html

@@ -7,6 +7,7 @@
 			<hr />
 			<div id="log_content"><span style="font-weight:bold;font-size:17px" data-i18n="conf_logging_nomessage"></span></div>
 			<hr>
+			<div style="display:none">
 			<h4 style="font-weight:bold"><i class="fa fa-reorder fa-fw"></i><span data-i18n="conf_logging_report">Bericht</span></h4>
 			<button  class="btn btn-primary" id="btn_logupload"><i class="fa fa-upload fa-fw"></i><span data-i18n="conf_logging_btn_pbupload"></span></button>
 			<div id="log_upl_pol"></div>
@@ -14,6 +15,7 @@
 			<div id="prev_reports"></div>
 			</div>
 		</div>
+	</div>
 </div>
 
 <script src="/js/content_logging.js"></script>

assets/webconfig/content/dashboard.html

@@ -37,6 +37,10 @@
 													<td  data-i18n="dashboard_infobox_label_currenthyp">Hyperion version:</td>
 													<td id="dash_currv">unknown</td>
 												</tr>
+												<tr>
+													<td  data-i18n="dashboard_infobox_label_versionbranch">Version Branch:</td>
+													<td id="dash_versionbranch">unknown</td>
+												</tr>
 												<tr>
 													<td  data-i18n="dashboard_infobox_label_latesthyp">Latest version:</td>
 													<td id="dash_latev">unknown</td>
@@ -71,7 +75,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="col-md-12 col-xxl-5">
+							<div class="col-md-12 col-xxl-5" style="display:none">
 								<div class="panel panel-default">
 									<div class="panel-heading">
 										<i class="fa fa-newspaper-o fa-fw"></i>

assets/webconfig/content/support.html

@@ -3,6 +3,7 @@
         <div class="col-xs-12">
             <h3 class="page-header"><i class="fa fa-info fa-fw"></i><span  data-i18n="support_label_title">Support Hyperion</span></h3>
 			<div id="supp_intro"></div>
+      <div style="display:none">
   			<h4 style="font-weight: bold"  data-i18n="support_label_spreadtheword">Spread the word</h4>
   			<a href="https://www.facebook.com/Hyperion-1415088231896140/" target="_blank" class="unlink">
   				<div class="col-xs-12 col-sm-6 col-lg-3 support-container">
@@ -40,7 +41,8 @@
   				</div>
   			</a>
   		</div>
-		<div class="col-xs-12">
+    </div>
+		<div class="col-xs-12" style="display:none">
 			<hr>
 			<h4 style="font-weight: bold"  data-i18n="support_label_donate">Donate or use our affiliate links</h4>
 			<ol>

assets/webconfig/i18n/de.json

@@ -50,6 +50,7 @@
 	"dashboard_infobox_label_platform" : "Plattform:",
 	"dashboard_infobox_label_instance" : "Instanz:",
 	"dashboard_infobox_label_ports" : "Ports (flat|proto):",
+	"dashboard_infobox_label_versionbranch" : "Versionszweig:",
 	"dashboard_infobox_message_updatewarning" : "Eine aktuellere Version von Hyperion ist verfügbar! (V$1)",
 	"dashboard_infobox_message_updatesuccess" : "Du nutzt die aktuellste Version von Hyperion.",
 	"dashboard_infobox_label_statush" : "Hyperion Status:",
@@ -260,7 +261,7 @@
 	"about_builddate" : "Build Datum",
 	"about_translations" : "Übersetzungen",
 	"about_resources" : "$1 Bibliotheken",
-	"about_contribute" : "Übersetze Hyperion in weitere Sprachen!",
+	"about_contribute" : "Entwickel Hyperion mit uns weiter!",
 	"about_credits" : "Einen Dank an alle Entwickler!",
 	"info_conlost_label_title" : "Verbindung zum Hyperion Service unterbrochen!",
 	"info_conlost_label_reason" : "Mögliche Ursachen:",
@@ -438,6 +439,8 @@
 	"edt_conf_gen_name_expl" : "Der Name wird verwendet, um Hyperion besser zu identifizieren. (Hilfreich bei mehreren Instanzen)",
 	"edt_conf_gen_showOptHelp_title" : "Zeige Erklärungen",
 	"edt_conf_gen_showOptHelp_expl" : "Zeige alle verfügbaren Options-Erklärungen. Empfohlen für Anfänger",
+	"edt_conf_gen_versionBranch_title" : "Versionszweig",
+	"edt_conf_gen_versionBranch_expl" : "Gibt an, welcher Versionszweig für die Suche von neuen Hyperion Versionen genutzt werden soll.",
 	"edt_conf_color_heading_title" : "Farbkalibrierung",
 	"edt_conf_color_channelAdjustment_header_title" : "Anpassung Farbkanäle",
 	"edt_conf_color_channelAdjustment_header_itemtitle" : "Profil",

assets/webconfig/i18n/en.json

@@ -50,6 +50,7 @@
 	"dashboard_infobox_label_platform" : "Platform:",
 	"dashboard_infobox_label_instance" : "Instance:",
 	"dashboard_infobox_label_ports" : "Ports (flat|proto):",
+	"dashboard_infobox_label_versionbranch" : "Version Branch:",
 	"dashboard_infobox_message_updatewarning" : "A newer version of Hyperion is available! ($1)",
 	"dashboard_infobox_message_updatesuccess" : "You run the latest version of Hyperion.",
 	"dashboard_infobox_label_statush" : "Hyperion status:",
@@ -260,7 +261,7 @@
 	"about_builddate" : "Build date",
 	"about_translations" : "Translations",
 	"about_resources" : "$1 libraries",
-	"about_contribute" : "Add more languages to Hyperion!",
+	"about_contribute" : "Develop Hyperion further with us!",
 	"about_credits" : "Credits to all these developers!",
 	"info_conlost_label_title" : "Lost connection to Hyperion service!",
 	"info_conlost_label_reason" : "Possible reasons:",
@@ -439,6 +440,8 @@
 	"edt_conf_gen_name_expl" : "A user defined name which is used to detect Hyperion. (Helpful with more than one Hyperion instance)",
 	"edt_conf_gen_showOptHelp_title" : "Show explanations",
 	"edt_conf_gen_showOptHelp_expl" : "Show all available explanations in each section. Highly recommended for beginners!",
+	"edt_conf_gen_versionBranch_title" : "Version Branch",
+	"edt_conf_gen_versionBranch_expl" : "Selects which version branch should be used for searching new Hyperion versions.",
 	"edt_conf_color_heading_title" : "Color Calibration",
 	"edt_conf_color_channelAdjustment_header_itemtitle" : "Profile",
 	"edt_conf_color_channelAdjustment_header_title" : "Color channel adjustments",

assets/webconfig/js/content_dashboard.js

@@ -78,19 +78,28 @@ $(document).ready( function() {
 	$('#dash_currv').html(window.currentVersion);
 	$('#dash_instance').html(window.serverConfig.general.name);
 	$('#dash_ports').html(window.serverConfig.flatbufServer.port+' | '+window.serverConfig.protoServer.port);
+	$('#dash_versionbranch').html(window.serverConfig.general.versionBranch);
 
 	$.get( "https://raw.githubusercontent.com/hyperion-project/hyperion.ng/master/version.json", function( data ) {
 		window.parsedUpdateJSON = JSON.parse(data);
-		window.latestVersion = window.parsedUpdateJSON[0].versionnr;
+
-	//	var cleanLatestVersion = window.latestVersion.replace(/\./g, '');
+		for(let i=0; i<window.parsedUpdateJSON.length; i++) {
-	//	var cleanCurrentVersion = window.currentVersion.replace(/\./g, '');
+			if(window.parsedUpdateJSON[i].channel == window.serverConfig.general.versionBranch) {
+				window.latestVersion = window.parsedUpdateJSON[i].versionnr;
+				break;
+			}
+			else window.latestVersion = window.currentVersion;
+		}
+
+		var cleanLatestVersion = window.latestVersion.replace(/\./g, '');
+		var cleanCurrentVersion = window.currentVersion.replace(/\./g, '');
 
 		$('#dash_latev').html(window.currentVersion);
-	//	$('#dash_latev').html(window.latestVersion);
+	  $('#dash_latev').html(window.latestVersion);
 
-	//	if ( cleanCurrentVersion < cleanLatestVersion )
+		if ( cleanCurrentVersion < cleanLatestVersion )
-	//		$('#versioninforesult').html('<div class="bs-callout bs-callout-warning" style="margin:0px">'+$.i18n('dashboard_infobox_message_updatewarning', window.latestVersion)+'</div>');
+			$('#versioninforesult').html('<div class="bs-callout bs-callout-warning" style="margin:0px">'+$.i18n('dashboard_infobox_message_updatewarning', window.latestVersion)+'</div>');
-	//	else
+	else
 			$('#versioninforesult').html('<div class="bs-callout bs-callout-success" style="margin:0px">'+$.i18n('dashboard_infobox_message_updatesuccess')+'</div>');
 	});
 

assets/webconfig/js/settings.js

@@ -124,9 +124,15 @@ $(document).ready( function() {
 
 		for (var i = 0; i<window.wSess.length; i++)
 		{
-			
 			if(lsys != window.wSess[i].host+':'+window.wSess[i].port)
-				$('#id_select').append(createSelOpt('http://'+window.wSess[i].address+':'+window.wSess[i].port, window.wSess[i].name))
+				var hyperionAddress
+
+				if (window.wSess[i].address.indexOf(':') > -1 && window.wSess[i].address.length == 36)
+					hyperionAddress = 'http://['+window.wSess[i].address+']:'+window.wSess[i].port
+				else
+					hyperionAddress = 'http://'+window.wSess[i].address+':'+window.wSess[i].port
+
+				$('#id_select').append(createSelOpt(hyperionAddress, window.wSess[i].host))
 		}
 
 		$('#id_btn_saveset').off().on('click',function() {

config/hyperion.config.json.commented

@@ -6,10 +6,12 @@
 {
 	/// general Settings
 	/// * 'name'          : The user friendly name of the hyperion instance (used for network things)
+	/// * 'versionBranch'          : Which branch should be used for hyperion version
 	/// * 'showOptHelp'   : Show option expanations at the webui. Highly recommended for beginners.
 	"general" :
 	{
 		"name"       : "MyHyperionConfig",
+		"versionBranch" : "Stable",
 		"showOptHelp" : true
 	},
 	/// set log level: silent warn verbose debug

config/hyperion.config.json.default

@@ -2,6 +2,7 @@
 	"general" :
 	{
 		"name"       : "My Hyperion Config",
+		"versionBranch" : "Stable",
 		"showOptHelp" : true
 	},
 	"logger" :

libsrc/hyperion/schema/schema-general.json

@@ -14,13 +14,26 @@
 			"required" : true,
 			"propertyOrder" : 1
 		},
+		"versionBranch" :
+		{
+			"type" : "string",
+			"title" : "edt_conf_gen_versionBranch_title",
+			"enum" : ["Stable", "Beta"],
+			"required" : true,
+			"access" : "expert",
+			"default" : "Stable",
+			"options" : {
+				"enum_titles" : ["Stable", "Beta"]
+			},
+			"propertyOrder" : 2
+		},
 		"showOptHelp" :
 		{
 			"type" : "boolean",
 			"title" : "edt_conf_gen_showOptHelp_title",
 			"default" : true,
 			"required" : true,
-			"propertyOrder" : 2
+			"propertyOrder" : 3
 		}
 	},
 	"additionalProperties" : false