Merge pull request #101 from MiSchroe/MiSchroe/issue44

MiSchroe · Nov 8, 2022 · 5601093 · 5601093
2 parents 0061ae7 + 981e799
commit 5601093
Show file tree

Hide file tree

Showing 41 changed files with 5,774 additions and 2,008 deletions.
diff --git a/README.md b/README.md
@@ -216,6 +216,7 @@ The following devices are defined:
 
 -   (Michael Schroeder) Upgrade dependencies, switch to Typescript 4.6, compatibility check with js-controller 4.x
 -   (Michael Schroeder) [#12](https://github.com/MiSchroe/ioBroker.klf200/issues/12) Support silent mode in scenes
+-   (Michael Schroeder) [#44](https://github.com/MiSchroe/ioBroker.klf200/issues/44) Add advanced SSL configuration settings
 
 ### 1.0.1 (2020-07-20)
 

diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "Erweiterte SSL-Konfiguration",
+    "Cron pattern for automatic reboot": "Cron-Muster für automatischen Neustart",
+    "Enable automatic reboot": "Aktivieren Sie den automatischen Neustart",
+    "SSL Fingerprint": "SSL-Fingerabdruck",
+    "SSL Public Key": "Öffentlicher SSL-Schlüssel",
+    "SSL-tab": "SSL-Optionen",
     "host": "Host",
     "klf200 adapter settings": "klf200 Adaptereinstellungen",
     "on save adapter restarts with new config immediately": "Beim Speichern wird der Adapter sofort mit der neuen Konfiguration neu gestartet",
+    "options-tab": "Optionen",
     "password": "Passwort"
-}
+}
diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "Advanced SSL configuration",
+    "Cron pattern for automatic reboot": "Cron pattern for automatic reboot",
+    "Enable automatic reboot": "Enable automatic reboot",
+    "SSL Fingerprint": "SSL Fingerprint",
+    "SSL Public Key": "SSL Public Key",
+    "SSL-tab": "SSL options",
     "host": "host",
     "klf200 adapter settings": "klf200 adapter settings",
     "on save adapter restarts with new config immediately": "on save adapter restarts with new config immediately",
+    "options-tab": "Options",
     "password": "password"
-}
+}
diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "Configuración SSL avanzada",
+    "Cron pattern for automatic reboot": "Patrón cron para reinicio automático",
+    "Enable automatic reboot": "Habilitar el reinicio automático",
+    "SSL Fingerprint": "Huella digital SSL",
+    "SSL Public Key": "Clave pública SSL",
+    "SSL-tab": "Opciones SSL",
     "host": "anfitrión",
     "klf200 adapter settings": "ajustes del adaptador klf200",
     "on save adapter restarts with new config immediately": "al guardar el adaptador se reinicia con la nueva configuración inmediatamente",
+    "options-tab": "Opciones",
     "password": "contraseña"
-}
+}
diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "Paramétrage SSL avancé",
+    "Cron pattern for automatic reboot": "Modèle Cron pour le redémarrage automatique",
+    "Enable automatic reboot": "Activer le redémarrage automatique",
+    "SSL Fingerprint": "Empreinte SSL",
+    "SSL Public Key": "Clé publique SSL",
+    "SSL-tab": "Option SSL",
     "host": "hôte",
     "klf200 adapter settings": "paramètres de l'adaptateur klf200",
     "on save adapter restarts with new config immediately": "lors de l'enregistrement, l'adaptateur redémarre avec la nouvelle configuration immédiatement",
+    "options-tab": "Choix",
     "password": "mot de passe"
-}
+}
diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "Configurazione SSL avanzata",
+    "Cron pattern for automatic reboot": "Pattern Cron per il riavvio automatico",
+    "Enable automatic reboot": "Abilita il riavvio automatico",
+    "SSL Fingerprint": "Impronta digitale SSL",
+    "SSL Public Key": "Chiave pubblica SSL",
+    "SSL-tab": "Opzioni SSL",
     "host": "ospite",
     "klf200 adapter settings": "impostazioni dell'adattatore klf200",
     "on save adapter restarts with new config immediately": "on save adapter si riavvia immediatamente con la nuova configurazione",
+    "options-tab": "Opzioni",
     "password": "parola d'ordine"
-}
+}
diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "Geavanceerde SSL-configuratie",
+    "Cron pattern for automatic reboot": "Cron-patroon voor automatisch opnieuw opstarten",
+    "Enable automatic reboot": "Automatisch opnieuw opstarten inschakelen",
+    "SSL Fingerprint": "SSL-vingerafdruk",
+    "SSL Public Key": "SSL openbare sleutel",
+    "SSL-tab": "SSL-opties",
     "host": "gastheer",
     "klf200 adapter settings": "klf200 adapterinstellingen",
     "on save adapter restarts with new config immediately": "bij het opslaan van adapter wordt onmiddellijk opnieuw opgestart met nieuwe configuratie",
+    "options-tab": "Opties",
     "password": "wachtwoord"
-}
+}
diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "Zaawansowana konfiguracja SSL",
+    "Cron pattern for automatic reboot": "Wzór Cron do automatycznego restartu",
+    "Enable automatic reboot": "Włącz automatyczne ponowne uruchamianie",
+    "SSL Fingerprint": "Odcisk palca SSL",
+    "SSL Public Key": "Klucz publiczny SSL",
+    "SSL-tab": "Opcje SSL",
     "host": "gospodarz",
     "klf200 adapter settings": "ustawienia adaptera klf200",
     "on save adapter restarts with new config immediately": "po zapisaniu adapter natychmiast uruchamia się ponownie z nową konfiguracją",
+    "options-tab": "Opcje",
     "password": "hasło"
-}
+}
diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "Configuração SSL avançada",
+    "Cron pattern for automatic reboot": "Padrão cron para reinicialização automática",
+    "Enable automatic reboot": "Ativar reinicialização automática",
+    "SSL Fingerprint": "Impressão digital SSL",
+    "SSL Public Key": "Chave pública SSL",
+    "SSL-tab": "Opções de SSL",
     "host": "hospedeiro",
     "klf200 adapter settings": "configurações do adaptador klf200",
     "on save adapter restarts with new config immediately": "ao salvar o adaptador reinicia imediatamente com a nova configuração",
+    "options-tab": "Opções",
     "password": "senha"
-}
+}
diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "Расширенная конфигурация SSL",
+    "Cron pattern for automatic reboot": "Шаблон Cron для автоматической перезагрузки",
+    "Enable automatic reboot": "Включить автоматическую перезагрузку",
+    "SSL Fingerprint": "SSL-отпечаток",
+    "SSL Public Key": "Открытый ключ SSL",
+    "SSL-tab": "параметры SSL",
     "host": "хозяин",
     "klf200 adapter settings": "настройки адаптера klf200",
     "on save adapter restarts with new config immediately": "при сохранении адаптер перезапускается с новым конфигом немедленно",
+    "options-tab": "Опции",
     "password": "пароль"
-}
+}
diff --git a/admin/i18n/uk/translations.json b/admin/i18n/uk/translations.json
@@ -0,0 +1,13 @@
+{
+    "Advanced SSL configuration": "Розширена конфігурація SSL",
+    "Cron pattern for automatic reboot": "Шаблон Cron для автоматичного перезавантаження",
+    "Enable automatic reboot": "Увімкнути автоматичне перезавантаження",
+    "SSL Fingerprint": "Відбиток SSL",
+    "SSL Public Key": "Відкритий ключ SSL",
+    "SSL-tab": "Параметри SSL",
+    "host": "хост",
+    "klf200 adapter settings": "налаштування адаптера klf200",
+    "on save adapter restarts with new config immediately": "під час збереження адаптер негайно перезавантажується з новою конфігурацією",
+    "options-tab": "Опції",
+    "password": "пароль"
+}
diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json
@@ -1,6 +1,13 @@
 {
+    "Advanced SSL configuration": "高级 SSL 配置",
+    "Cron pattern for automatic reboot": "用于自动重启的 Cron 模式",
+    "Enable automatic reboot": "启用自动重启",
+    "SSL Fingerprint": "SSL 指纹",
+    "SSL Public Key": "SSL 公钥",
+    "SSL-tab": "SSL 选项",
     "host": "主办",
     "klf200 adapter settings": "klf200适配器设置",
     "on save adapter restarts with new config immediately": "保存适配器上的适配器立即以新配置重新启动",
+    "options-tab": "选项",
     "password": "密码"
-}
+}
diff --git a/admin/index_m.html b/admin/index_m.html
@@ -59,6 +59,18 @@
 					$("#automaticRebootCronTimeDiv").addClass("hide");
 				}
 
+				// Setup enable/disable due to checkbox state of advanced SSL configuration
+				$("#advancedSSLConfiguration").on("change", () => {
+					$("#SSLFingerprintDiv").toggleClass("hide");
+					$("#SSLPublicKeyDiv").toggleClass("hide");
+				});
+
+				// Setup initial hidden state of advanced SSL configuration
+				if (!settings.advancedSSLConfiguration) {
+					$("#SSLFingerprintDiv").addClass("hide");
+					$("#SSLPublicKeyDiv").addClass("hide");
+				}
+
 				$(".value").each(function () {
 					var $key = $(this);
 					var id = $key.attr("id");
@@ -78,6 +90,10 @@
 							.on("change", () => onChange())
 							.on("keyup", () => onChange());
 					}
+
+					if ($key.is("textarea")) {
+						M.textareaAutoResize($key);
+					}
 				});
 				onChange(false);
 
@@ -131,29 +147,69 @@
 
 			<!-- Put your content here -->
 
-			<div class="row">
-				<div class="input-field col s12 m6">
-					<input class="value" id="host" type="text" />
-					<label for="host" class="translate">host</label>
+			<!-- Tabs navigation -->
+			<div class=""col s9">
+				<ul class="tabs">
+					<li class="tab col s2">
+						<a href="#tab-options" class="translate">options-tab</a>
+					</li>
+					<li class="tab col s2">
+						<a href="#tab-ssl" class="translate">SSL-tab</a>
+					</li>
+				</ul>
+			</div>
+
+			<!-- Options Tab -->
+			<div id="tab-options" class="col s12">
+				<div class="row">
+					<div class="input-field col s12 m6">
+						<input class="value" id="host" type="text" />
+						<label for="host" class="translate">host</label>
+					</div>
+					<div class="input-field col s12 m6">
+						<input class="value" id="password" type="password" />
+						<label for="password" class="translate">password</label>
+					</div>
 				</div>
-				<div class="input-field col s12 m6">
-					<input class="value" id="password" type="password" />
-					<label for="password" class="translate">password</label>
+				<div class="row">
+					<div class="input-field col s12 m6">
+						<input class="value" type="checkbox" id="enableAutomaticReboot" />
+						<label for="enableAutomaticReboot" class="translate">Enable automatic reboot</label>
+					</div>
+					<div class="input-field col s12 m6" id="automaticRebootCronTimeDiv">
+						<input class="value" id="automaticRebootCronTime" type="text" />
+						<label for="automaticRebootCronTime" class="translate">Cron pattern for automatic reboot</label>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col s12">
+						<p class="translate">on save adapter restarts with new config immediately</p>
+					</div>
 				</div>
 			</div>
-			<div class="row">
-				<div class="input-field col s12 m6">
-					<input class="value" type="checkbox" id="enableAutomaticReboot" />
-					<label for="enableAutomaticReboot" class="translate">Enable automatic reboot</label>
+
+			<!-- SSL Tab -->
+			<div id="tab-ssl" class="col s12">
+				<div class="row">
+					<div class="input-field col s12 m6">
+						<input class="value" type="checkbox" id="advancedSSLConfiguration" />
+						<label for="advancedSSLConfiguration" class="translate">Advanced SSL configuration</label>
+					</div>
+					<div class="input-field col s12 m6" id="SSLFingerprintDiv">
+						<input class="value" type="text" id="SSLFingerprint" />
+						<label for="SSLFingerprint" class="translate">SSL Fingerprint</label>
+					</div>
 				</div>
-				<div class="input-field col s12 m6" id="automaticRebootCronTimeDiv">
-					<input class="value" id="automaticRebootCronTime" type="text" />
-					<label for="automaticRebootCronTime" class="translate">Cron pattern for automatic reboot</label>
+				<div class="row">
+					<div class="input-field col s12 m12 l12" id="SSLPublicKeyDiv">
+						<textarea class="value materialize-textarea" id="SSLPublicKey"></textarea>
+						<label for="SSLPublicKey" class="translate">SSL Public Key</label>
+					</div>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col s12">
-					<p class="translate">on save adapter restarts with new config immediately</p>
+				<div class="row">
+					<div class="col s12">
+						<p class="translate">on save adapter restarts with new config immediately</p>
+					</div>
 				</div>
 			</div>
 		</div>

diff --git a/admin/style.css b/admin/style.css
@@ -1,10 +1,14 @@
 /* You can delete those if you want. I just found them very helpful */
 * {
-	box-sizing: border-box
+	box-sizing: border-box;
 }
 .m {
 	/* Don't cut off dropdowns! */
 	overflow: initial;
 }
 
 /* Add your styles here */
+.hiddendiv {
+	visibility: hidden;
+	display: block;
+}