diff --git a/README.md b/README.md index 915689a4..5d22c47a 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,13 @@ When the adapter crashes or another Code error happens, this error message that ## Changelog +### **WORK IN PROGRESS** +* (simatec) dependencies updated +* (simatec) Design fix +* (simatec) Backup File upload added +* (simatec) Uploadserver added +* (simatec) Translation updated + ### 2.9.1 (2023-11-02) * (simatec) ignore Build directory for ESPHome added diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json index 30bc3dd3..47646d1a 100644 --- a/admin/i18n/de/translations.json +++ b/admin/i18n/de/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "Backitup Warnung!", "Backitup execution": "Backitup-Ausführung", "Backup Download": "Backup-Download", + "Backup Upload": "Backup Upload", "Backup error on:": "Sicherungsfehler bei:", "Backup history": "Backup Verlauf", "Backup of all scripts from Javascript adapter": "Backup aller Skripte des JavaScript-Adapters", @@ -230,11 +231,15 @@ "Telegram Receiver": "Telegram-Empfänger", "Telegram instance": "Telegram Instanz", "Test connection": "Verbindung testen", + "The Upload could not be started. The popup will close automaticall": "Der Upload konnte nicht gestartet werden. Der Popup schließt automatischall", "The connection to the WebDAV server was established successfully.": "Die Verbindung zum WebDAV-Server wurde erfolgreich hergestellt.", "The download could not be started. The popup will close automatically": "Der Download konnte nicht gestartet werden. Das Popup-Fenster wird automatisch geschlossen", "Token": "Token", "Token (only for v2.x)": "Token (nur für v2.x)", "Type": "Art", + "Upload Backup File": "Upload Backup Datei", + "Upload completed successfully. The popup will close automatically": "Upload erfolgreich abgeschlossen. Der Popup wird automatisch geschlossen", + "Upload from Backup File": "Upload von Backup Datei", "Username": "Benutzername", "Username of the CCU": "Benutzername der CCU", "Version": "Version", @@ -287,9 +292,9 @@ "path": "Pfad", "piece": "Stück", "port": "Port", - "restore Configuration": "Konfiguration wiederherstellen", + "restore Backitup settings": "Backitup-Einstellungen wiederherstellen", "restore type": "Wiederherstellungstyp", - "save Configuration": "Konfiguration sichern", + "save Backitup settings": "Backitup-Einstellungen sichern", "seconds": "Sekunden", "send analysis data": "Analysedaten senden", "slave instances": "Slave-Instanzen", diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json index 73b415a3..4b5b6eaf 100644 --- a/admin/i18n/en/translations.json +++ b/admin/i18n/en/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "Backitup warning!", "Backitup execution": "Backitup execution", "Backup Download": "Backup Download", + "Backup Upload": "Backup Upload", "Backup error on:": "Backup error on:", "Backup history": "Backup history", "Backup of all scripts from Javascript adapter": "Backup of all scripts of the JavaScript adapter", @@ -230,11 +231,15 @@ "Telegram Receiver": "Telegram recipient", "Telegram instance": "Telegram instance", "Test connection": "Test connection", + "The Upload could not be started. The popup will close automaticall": "The Upload could not be started. The popup will close automaticall", "The connection to the WebDAV server was established successfully.": "The connection to the WebDAV server was established successfully.", "The download could not be started. The popup will close automatically": "The download could not be started. The popup will close automatically", "Token": "Token", "Token (only for v2.x)": "Token (only for v2.x)", "Type": "Type", + "Upload Backup File": "Upload Backup file", + "Upload completed successfully. The popup will close automatically": "Upload completed successfully. The popup will close automatically", + "Upload from Backup File": "Upload from Backup File", "Username": "Username", "Username of the CCU": "Username of the CCU", "Version": "Version", @@ -287,9 +292,9 @@ "path": "Path", "piece": "piece", "port": "port", - "restore Configuration": "Restore configuration", + "restore Backitup settings": "restore Backitup settings", "restore type": "restore type", - "save Configuration": "save Configuration", + "save Backitup settings": "save Backitup settings", "seconds": "seconds", "send analysis data": "send analysis data", "slave instances": "slave instances", diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json index ea50a62d..193c3371 100644 --- a/admin/i18n/es/translations.json +++ b/admin/i18n/es/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "¡Advertencia de respaldo!", "Backitup execution": "Ejecución de backitup", "Backup Download": "Descarga de copia de seguridad", + "Backup Upload": "Backup Upload", "Backup error on:": "Error de copia de seguridad en:", "Backup history": "Historial de copias de seguridad", "Backup of all scripts from Javascript adapter": "Copia de seguridad de todos los scripts del adaptador Javascript", @@ -230,11 +231,15 @@ "Telegram Receiver": "Receptor de telegramas", "Telegram instance": "Instancia de Telegram", "Test connection": "Conexión de prueba", + "The Upload could not be started. The popup will close automaticall": "La carga no podía empezar. El popup cerrará automáticamente", "The connection to the WebDAV server was established successfully.": "La conexión con el servidor WebDAV se estableció correctamente.", "The download could not be started. The popup will close automatically": "No se pudo iniciar la descarga. La ventana emergente se cerrará automáticamente", "Token": "Simbólico", "Token (only for v2.x)": "Token (solo para v2.x)", "Type": "Tipo", + "Upload Backup File": "Subir archivo de copia de seguridad", + "Upload completed successfully. The popup will close automatically": "Carga completada con éxito. El popup se cerrará automáticamente", + "Upload from Backup File": "Subir desde Archivo de Backup", "Username": "nombre de usuario", "Username of the CCU": "Nombre de usuario de la CCU", "Version": "Versión", @@ -287,9 +292,9 @@ "path": "Ruta", "piece": "Pieza", "port": "Puerto", - "restore Configuration": "Restaurar configuración", + "restore Backitup settings": "restaurar configuración de Backitup", "restore type": "tipo de restauración", - "save Configuration": "guardar configuración", + "save Backitup settings": "guardar configuración de Backitup", "seconds": "segundos", "send analysis data": "enviar datos de análisis", "slave instances": "instancias esclavas", diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json index 72aef9a9..6f1bb44d 100644 --- a/admin/i18n/fr/translations.json +++ b/admin/i18n/fr/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "Avertissement de backitup!", "Backitup execution": "Exécution de backitup", "Backup Download": "Téléchargement de sauvegarde", + "Backup Upload": "Backup Upload", "Backup error on:": "Erreur de sauvegarde sur:", "Backup history": "Historique de sauvegarde", "Backup of all scripts from Javascript adapter": "Sauvegarde de tous les scripts de l'adaptateur Javascript", @@ -230,11 +231,15 @@ "Telegram Receiver": "Récepteur de télégramme", "Telegram instance": "Instance de télégramme", "Test connection": "Tester la connexion", + "The Upload could not be started. The popup will close automaticall": "Le téléchargement n'a pas pu être lancé. Le popup fermera automatiquement", "The connection to the WebDAV server was established successfully.": "La connexion au serveur WebDAV a été établie avec succès.", "The download could not be started. The popup will close automatically": "Le téléchargement n'a pas pu démarrer. La popup se fermera automatiquement", "Token": "Jeton", "Token (only for v2.x)": "Jeton (uniquement pour v2.x)", "Type": "Type", + "Upload Backup File": "Télécharger fichier de sauvegarde", + "Upload completed successfully. The popup will close automatically": "Chargement effectué avec succès. Le popup fermera automatiquement", + "Upload from Backup File": "Télécharger à partir du fichier de sauvegarde", "Username": "nom d'utilisateur", "Username of the CCU": "Nom d'utilisateur du CCU", "Version": "Version", @@ -287,9 +292,9 @@ "path": "Chemin", "piece": "Pièce", "port": "Port", - "restore Configuration": "Restaurer la configuration", + "restore Backitup settings": "restaurer les paramètres de sauvegarde", "restore type": "type de restauration", - "save Configuration": "enregistrer la configuration", + "save Backitup settings": "sauvegarder les paramètres de sauvegarde", "seconds": "secondes", "send analysis data": "envoyer des données d'analyse", "slave instances": "instances esclaves", diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json index 32621ef8..5d323c62 100644 --- a/admin/i18n/it/translations.json +++ b/admin/i18n/it/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "Avviso di backup!", "Backitup execution": "Esecuzione di Backitup", "Backup Download": "Download di backup", + "Backup Upload": "Caricamento di backup", "Backup error on:": "Errore di backup su:", "Backup history": "Cronologia di backup", "Backup of all scripts from Javascript adapter": "Backup di tutti gli script dall'adattatore Javascript", @@ -230,11 +231,15 @@ "Telegram Receiver": "Telegram Receiver", "Telegram instance": "Istanza di Telegram", "Test connection": "Verifica connessione", + "The Upload could not be started. The popup will close automaticall": "L'upload non poteva essere avviato. Il popup chiuderà automaticamente", "The connection to the WebDAV server was established successfully.": "La connessione al server WebDAV è stata stabilita correttamente.", "The download could not be started. The popup will close automatically": "Impossibile avviare il download. Il popup si chiuderà automaticamente", "Token": "Gettone", "Token (only for v2.x)": "Token (solo per v2.x)", "Type": "genere", + "Upload Backup File": "Carica file di backup", + "Upload completed successfully. The popup will close automatically": "Caricamento completato con successo. Il popup si chiude automaticamente", + "Upload from Backup File": "Carica da Backup File", "Username": "nome utente", "Username of the CCU": "Nome utente del CCU", "Version": "Versione", @@ -287,9 +292,9 @@ "path": "Percorso", "piece": "Pezzo", "port": "Porta", - "restore Configuration": "Ripristino della configurazione", + "restore Backitup settings": "ripristino delle impostazioni di backup", "restore type": "ripristinare il tipo", - "save Configuration": "salva configurazione", + "save Backitup settings": "salvare le impostazioni di backup", "seconds": "secondi", "send analysis data": "inviare dati di analisi", "slave instances": "istanze slave", diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json index 9f8b0d62..404a08c5 100644 --- a/admin/i18n/nl/translations.json +++ b/admin/i18n/nl/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "Backitup Waarschuwing!", "Backitup execution": "Backitup uitvoering", "Backup Download": "Back-up downloaden", + "Backup Upload": "Versterking", "Backup error on:": "Back-upfout op:", "Backup history": "Back-up geschiedenis", "Backup of all scripts from Javascript adapter": "Back-up van alle scripts van de Javascript-adapter", @@ -230,11 +231,15 @@ "Telegram Receiver": "Telegram-ontvanger", "Telegram instance": "Telegram-instantie", "Test connection": "Test verbinding", + "The Upload could not be started. The popup will close automaticall": "De Upload kon niet beginnen. De popup zal automatisch alles sluiten", "The connection to the WebDAV server was established successfully.": "De verbinding met de WebDAV-server is tot stand gebracht.", "The download could not be started. The popup will close automatically": "De download kon niet worden gestart. De pop-up wordt automatisch gesloten", "Token": "token", "Token (only for v2.x)": "Token (alleen voor v2.x)", "Type": "Type", + "Upload Backup File": "Upload back-up bestand", + "Upload completed successfully. The popup will close automatically": "Upload volbracht. De popup zal automatisch sluiten", + "Upload from Backup File": "Upload van back-up File", "Username": "Gebruikersnaam", "Username of the CCU": "Gebruikersnaam van de CCU", "Version": "Versie", @@ -287,9 +292,9 @@ "path": "Path", "piece": "Stuk", "port": "poort", - "restore Configuration": "Configuratie herstellen", + "restore Backitup settings": "herstellende backitup setting", "restore type": "herstel type", - "save Configuration": "configuratie opslaan", + "save Backitup settings": "red backitup setting", "seconds": "seconden", "send analysis data": "verzend analysegegevens", "slave instances": "slave-instanties", diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json index 2d55129e..4ad3b61b 100644 --- a/admin/i18n/pl/translations.json +++ b/admin/i18n/pl/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "Ostrzeżenie dotyczące tworzenia kopii zapasowych!", "Backitup execution": "Wykonanie Backitup", "Backup Download": "Pobieranie kopii zapasowej", + "Backup Upload": "Backup Upload (ang.)", "Backup error on:": "Błąd kopii zapasowej w:", "Backup history": "Historia kopii zapasowych", "Backup of all scripts from Javascript adapter": "Kopia zapasowa wszystkich skryptów z adaptera Javascript", @@ -230,11 +231,15 @@ "Telegram Receiver": "Odbiornik telegramu", "Telegram instance": "Instancja telegramu", "Test connection": "Testuj połączenie", + "The Upload could not be started. The popup will close automaticall": "Pojazd nie mógł zostać uruchomiony. Pojazd będzie zamykać automatycznie", "The connection to the WebDAV server was established successfully.": "Połączenie z serwerem WebDAV zostało pomyślnie nawiązane.", "The download could not be started. The popup will close automatically": "Nie można rozpocząć pobierania. Wyskakujące okienko zamknie się automatycznie", "Token": "Znak", "Token (only for v2.x)": "Token (tylko dla v2.x)", "Type": "Rodzaj", + "Upload Backup File": "Upload Backup", + "Upload completed successfully. The popup will close automatically": "Przeciążenie zakończyło się sukcesem. Pojazd automatycznie się zamyka", + "Upload from Backup File": "Wykaz gatunków Backup File", "Username": "nazwa uzytkownika", "Username of the CCU": "Nazwa uzytkownika CCU", "Version": "Wersja", @@ -287,9 +292,9 @@ "path": "Sciezka", "piece": "kawałek", "port": "Port", - "restore Configuration": "Przywracanie konfiguracji", + "restore Backitup settings": "przywracanie zapasów", "restore type": "typ przywracania", - "save Configuration": "zapisz konfigurację", + "save Backitup settings": "rekord Backitup", "seconds": "sekundy", "send analysis data": "przesłać dane analityczne", "slave instances": "instancje podrzędne", diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json index 96eb601e..90791fed 100644 --- a/admin/i18n/pt/translations.json +++ b/admin/i18n/pt/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "Aviso de backup!", "Backitup execution": "Execução de backitup", "Backup Download": "Download de backup", + "Backup Upload": "Fazer upload de backup", "Backup error on:": "Erro de backup em:", "Backup history": "Histórico de backup", "Backup of all scripts from Javascript adapter": "Backup de todos os scripts do adaptador Javascript", @@ -230,11 +231,15 @@ "Telegram Receiver": "Receptor de telegrama", "Telegram instance": "Instância do telegrama", "Test connection": "Conexão de teste", + "The Upload could not be started. The popup will close automaticall": "O Upload não pôde ser iniciado. O popup vai fechar automático tudo", "The connection to the WebDAV server was established successfully.": "A conexão com o servidor WebDAV foi estabelecida com sucesso.", "The download could not be started. The popup will close automatically": "O download não pôde ser iniciado. O pop-up será fechado automaticamente", "Token": "Símbolo", "Token (only for v2.x)": "Token (somente para v2.x)", "Type": "Tipo", + "Upload Backup File": "Carregar arquivo de backup", + "Upload completed successfully. The popup will close automatically": "Upload concluído com sucesso. O popup fechará automaticamente", + "Upload from Backup File": "Upload de arquivo de backup", "Username": "nome de usuário", "Username of the CCU": "Nome de usuário da CCU", "Version": "Versão", @@ -287,9 +292,9 @@ "path": "Caminho NAS", "piece": "Peça", "port": "Porta", - "restore Configuration": "Restaurar a configuração", + "restore Backitup settings": "restaurar configurações de backup", "restore type": "restaurar tipo", - "save Configuration": "salvar configuração", + "save Backitup settings": "salvar configurações de backup", "seconds": "segundos", "send analysis data": "enviar dados de análise", "slave instances": "instâncias escravas", diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json index 79c974b2..377ce432 100644 --- a/admin/i18n/ru/translations.json +++ b/admin/i18n/ru/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "Предупреждение о резервном копировании!", "Backitup execution": "Выполнение резервного копирования", "Backup Download": "Резервная загрузка", + "Backup Upload": "Backup Загрузить", "Backup error on:": "Ошибка резервного копирования:", "Backup history": "История резервного копирования", "Backup of all scripts from Javascript adapter": "Резервное копирование всех скриптов драйвера Javascript", @@ -230,11 +231,15 @@ "Telegram Receiver": "Приемник телеграмм", "Telegram instance": "Экземпляр Telegram", "Test connection": "Проверить соединение", + "The Upload could not be started. The popup will close automaticall": "Загрузка не может быть запущена. Попап закроет автоматический", "The connection to the WebDAV server was established successfully.": "Подключение к серверу WebDAV установлено успешно.", "The download could not be started. The popup will close automatically": "Загрузка не может быть запущена. Всплывающее окно закроется автоматически", "Token": "Токен", "Token (only for v2.x)": "Токен (только для v2.x)", "Type": "Тип", + "Upload Backup File": "Загрузить файл Backup", + "Upload completed successfully. The popup will close automatically": "Загрузите успешно. Попап закроется автоматически", + "Upload from Backup File": "Загрузить из Backup File", "Username": "Имя пользователя", "Username of the CCU": "Имя пользователя", "Version": "Версия", @@ -287,9 +292,9 @@ "path": "Путь", "piece": "часть", "port": "порт", - "restore Configuration": "Восстановление конфигурации", + "restore Backitup settings": "восстановить настройки Backitup", "restore type": "тип восстановления", - "save Configuration": "сохранить конфигурацию", + "save Backitup settings": "сохранить настройки Backitup", "seconds": "секунд", "send analysis data": "отправлять данные для анализа", "slave instances": "ведомые экземпляры", diff --git a/admin/i18n/uk/translations.json b/admin/i18n/uk/translations.json index 3e3214cd..571f5dd2 100644 --- a/admin/i18n/uk/translations.json +++ b/admin/i18n/uk/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "Попередження про резервне копіювання!", "Backitup execution": "Виконання резервної копії", "Backup Download": "Завантаження резервної копії", + "Backup Upload": "Резервне копіювання", "Backup error on:": "Помилка резервного копіювання:", "Backup history": "Історія резервного копіювання", "Backup of all scripts from Javascript adapter": "Резервне копіювання всіх скриптів адаптера JavaScript", @@ -230,11 +231,15 @@ "Telegram Receiver": "Одержувач Telegram", "Telegram instance": "Примірник Telegram", "Test connection": "Тестове підключення", + "The Upload could not be started. The popup will close automaticall": "Завантажити не можна. Закриє автоматичне", "The connection to the WebDAV server was established successfully.": "Підключення до сервера WebDAV успішно встановлено.", "The download could not be started. The popup will close automatically": "Не вдалося розпочати завантаження. Спливаюче вікно закриється автоматично", "Token": "Токен", "Token (only for v2.x)": "Токен (тільки для v2.x)", "Type": "Тип", + "Upload Backup File": "Завантажити файл Backup", + "Upload completed successfully. The popup will close automatically": "Завантажити успішно. Закриється автоматично", + "Upload from Backup File": "Завантаження з резервного копіювання", "Username": "Ім'я користувача", "Username of the CCU": "Ім'я користувача ЦКУ", "Version": "Версія", @@ -287,9 +292,9 @@ "path": "шлях", "piece": "шматок", "port": "порт", - "restore Configuration": "Відновлення конфігурації", + "restore Backitup settings": "відновлення параметрів резервного копіювання", "restore type": "тип відновлення", - "save Configuration": "зберегти конфігурацію", + "save Backitup settings": "зберегти налаштування резервного копіювання", "seconds": "секунд", "send analysis data": "відправити дані аналізу", "slave instances": "підлеглі екземпляри", diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json index 29e0e736..0209f203 100644 --- a/admin/i18n/zh-cn/translations.json +++ b/admin/i18n/zh-cn/translations.json @@ -34,6 +34,7 @@ "Backitup Warning!": "备份警告!", "Backitup execution": "备份执行", "Backup Download": "备份下载", + "Backup Upload": "包装", "Backup error on:": "备份错误:", "Backup history": "备份历史", "Backup of all scripts from Javascript adapter": "JavaScript 适配器的所有脚本的备份", @@ -230,11 +231,15 @@ "Telegram Receiver": "电报收件人", "Telegram instance": "电报实例", "Test connection": "测试连接", + "The Upload could not be started. The popup will close automaticall": "不能开始载荷。 人口将接近自动所有人", "The connection to the WebDAV server was established successfully.": "已成功建立与 WebDAV 服务器的连接。", "The download could not be started. The popup will close automatically": "无法开始下载。弹窗会自动关闭", "Token": "代币", "Token (only for v2.x)": "令牌(仅适用于 v2.x)", "Type": "类型", + "Upload Backup File": "包装档案", + "Upload completed successfully. The popup will close automatically": "成功完成的载荷。 人口将自动结束", + "Upload from Backup File": "Backile File的载荷", "Username": "用户名", "Username of the CCU": "CCU 的用户名", "Version": "版本", @@ -287,9 +292,9 @@ "path": "小路", "piece": "片", "port": "港口", - "restore Configuration": "恢复配置", + "restore Backitup settings": "b. 恢复包装环境", "restore type": "还原类型", - "save Configuration": "保存配置", + "save Backitup settings": "d. 挽救包装环境", "seconds": "秒", "send analysis data": "发送分析数据", "slave instances": "从实例", diff --git a/admin/tab_m.css b/admin/tab_m.css index 4a458ed2..b3eaaafd 100644 --- a/admin/tab_m.css +++ b/admin/tab_m.css @@ -119,7 +119,7 @@ body { border-radius: 4px; box-shadow: 0 3px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2); } -.btn-himself, .btn-restore-himself { +.btn-himself, .btn-restore-himself, .btn-backup-upload { width: 100%; margin-top: 0.3rem; border-radius: 4px; @@ -301,4 +301,44 @@ li { .card-content-text { overflow-y: auto; max-height: 187px; -} \ No newline at end of file +} +#toast-container { + bottom: 94%; + left: 30%; + top: initial; + right: initial; + position: absolute; + background-color: #174475; + box-shadow: rgba(0, 0, 0, 0.14) 0px 3px 3px 0px, rgba(0, 0, 0, 0.12) 0px 1px 5px 0px, rgba(0, 0, 0, 0.2) 0px 3px 1px -2px; + background-image: linear-gradient(179deg, rgb(51, 153, 204) 0%, rgb(23, 68, 117) 60%) !important; + color: white; + padding: 1rem; + font-size: larger; + z-index: 999; +} + +#dialog-upload .title { + width: 100%; + margin-left: auto; + left: auto; + right: auto; + background: #174475; + padding: 0.5rem; + border-radius: 4px; +} + +#dialog-upload .modal-content { + width: 100% !important; + height: calc(100% - 10px) !important; +} + +#dialog-upload { + max-height: 40% !important; + max-width: 70% !important; + width: 65% !important; + height: 35% !important; + overflow: visible !important; + top: 10px !important; + width: calc(100% - 100px); + border-radius: 4px; +} diff --git a/admin/tab_m.html b/admin/tab_m.html index 25971f05..e8bbd4b9 100644 --- a/admin/tab_m.html +++ b/admin/tab_m.html @@ -50,7 +50,7 @@