diff --git a/front/changeLog.php b/front/changeLog.php index 92aa7582..675594d6 100644 --- a/front/changeLog.php +++ b/front/changeLog.php @@ -2,9 +2,13 @@ require 'php/templates/header.php'; ?>
- +
+
+ +
+
diff --git a/front/changeLogCore.php b/front/changeLogCore.php index 4b47f52a..dc27a919 100644 --- a/front/changeLogCore.php +++ b/front/changeLogCore.php @@ -14,10 +14,10 @@
-
+
-
+
diff --git a/front/css/app.css b/front/css/app.css index 6f3a2d0c..9cdd6bea 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -248,7 +248,7 @@ a[target="_blank"] { .main-footer { padding: 5px; z-index: 10000; - position: inherit; + position: inherit; } .header-server-time @@ -1018,6 +1018,11 @@ height: 50px; /* report */ /* --------------------------------------------------------- */ +#notifications +{ + display: flex; +} + #notificationData { margin-bottom: 10px; @@ -2687,7 +2692,7 @@ table.dataTable tbody > tr.selected .change-log .helpIcon{ font-size: x-small; - top: 65px; + top: 0px; } #panHistory .change-log .helpIcon{ @@ -2706,10 +2711,23 @@ table.dataTable tbody > tr.selected padding:0px; } -#panHistory .change-log-skeleton-class +.changeLogFilter{ + display:flex; + gap:10px; + flex-wrap:wrap; + align-items:center; + padding:5px; +} + +#changeHistoryPage .box { - margin-left: 0px; - width: calc(100% - 40px); + margin-bottom:0px +} + +#changeHistoryPage .change-log-skeleton-class +{ + padding: 15px; + width: auto; } /* ----------------------------------------------------------------------------- @@ -2755,7 +2773,7 @@ table.dataTable tbody > tr.selected /* Page-level overlay base */ #settings-skeleton, #devices-skeleton, #device-details-skeleton, -#events-skeleton, #presence-skeleton, #report-skeleton, #skel-app-events, #change-log-skeleton +#events-skeleton, #presence-skeleton, #report-skeleton, #skel-app-events, #change-log-skeleton, #notifications-skeleton, #workflows-skeleton, #plugins-skeleton, .skel-tab-pane { position: absolute; top: 0; @@ -2770,7 +2788,7 @@ table.dataTable tbody > tr.selected #settings-skeleton { margin: 15px; min-height: 500px; } #devices-skeleton { margin: 15px; top: 50px; min-height: 500px; } #skel-app-events { margin: 15px; top: 50px; min-height: 500px; z-index: inherit;} -#device-details-skeleton { margin: 15px; top: 42px; } +#device-details-skeleton { margin: 15px; top: 42px; padding: 10px } #events-skeleton { margin: 15px; top: 50px; min-height: 500px; } #presence-skeleton { margin: 15px; top: 50px; min-height: 500px; } #report-skeleton { margin: 15px; top: 50px; min-height: 400px; } @@ -2911,5 +2929,8 @@ table.dataTable tbody > tr.selected .skel-info-tab { padding: 15px; min-height: 360px; } .skel-info-tab { margin: -10px;} +/* ----- ChangeLog tabs -------------------------------------------------- */ +#panHistory .change-log-skeleton-class { width: calc(100% - 30px); padding: 5px; top: auto;} + /* ===== /Loading Skeleton ===== */ diff --git a/front/deviceDetails.php b/front/deviceDetails.php index 5e0b76e4..e340fb7b 100755 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -599,9 +599,16 @@ window.onload = function() { // ----------------------------------------------------------------------------- function hideDeviceDetailsSkeleton() { - $('#device-details-skeleton').fadeOut(0, function() { $(this).remove(); }); + $('#device-details-skeleton').fadeOut(0, function() { $(this).hide(); }); } +// ----------------------------------------------------------------------------- +function showDeviceDetailsSkeleton() { + var $skel = $('#device-details-skeleton'); + $skel.stop(true, true).fadeIn(10); +} + + // Fallback: remove main skeleton and all tab pane skeletons if init stalls setTimeout(function() { hideDeviceDetailsSkeleton(); diff --git a/front/js/common.js b/front/js/common.js index 765d3438..bcad76e6 100755 --- a/front/js/common.js +++ b/front/js/common.js @@ -1041,11 +1041,6 @@ function showSpinner(stringKey = "Loading", target = null) { }); } -function hideSpinner() { - $("#loadingSpinner") - .removeClass("visible") - .fadeOut(animationTime); -} function hideSpinner() { clearTimeout(spinnerTimeout); @@ -1053,7 +1048,7 @@ function hideSpinner() { if (!spinner.length) return; - const target = $(".spinnerTarget").first(); + const target = $(".spinnerTarget").last(); if (target.length) { // Lock position to target diff --git a/front/php/templates/language/ar_ar.json b/front/php/templates/language/ar_ar.json index a04dbe68..efd45287 100644 --- a/front/php/templates/language/ar_ar.json +++ b/front/php/templates/language/ar_ar.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "الأجهزة القديمة", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "وصف الحدث العام", "general_event_title": "عنوان الحدث العام", "go_to_device_event_tooltip": "انتقل إلى الجهاز", @@ -825,4 +830,4 @@ "settings_system_label": "نظام", "settings_update_item_warning": "قم بتحديث القيمة أدناه. احرص على اتباع التنسيق السابق. لم يتم إجراء التحقق.", "test_event_tooltip": "احفظ التغييرات أولاً قبل اختبار الإعدادات." -} +} \ No newline at end of file diff --git a/front/php/templates/language/ca_ca.json b/front/php/templates/language/ca_ca.json index 1c22b95f..15bac36d 100644 --- a/front/php/templates/language/ca_ca.json +++ b/front/php/templates/language/ca_ca.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "Refrescant…", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "L'esdeveniment que has desencadenat pot trigar un temps fins que acabin els processos de fons. L'execució acabarà una cop buida la cua d'execució (Comprova el registre d'errors si hi ha problemes).

Cua d'execució:", "general_event_title": "Execució d'un esdeveniment ad-hoc", "go_to_device_event_tooltip": "Navegar al dispositiu", diff --git a/front/php/templates/language/cs_cz.json b/front/php/templates/language/cs_cz.json index 6ef1de6c..6ad0912a 100644 --- a/front/php/templates/language/cs_cz.json +++ b/front/php/templates/language/cs_cz.json @@ -784,6 +784,11 @@ "device_history_empty_state": "V rámci nastaveného okna uchovávání nebyly zaznamenány změny žádné z vlastností.", "device_history_tab_title": "Seznam změn", "device_history_table_title_changes": "Změny", + "gen_actions": "", + "gen_content": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "devices_old": "Znovunačítání…", "gen_device": "Zařízení", "general_event_description": "Událost kterou jste spustili může zabrat delší dobu, než budou procesy na pozadí dokončeny. Vykonávání skončilo jakmile se níže uvedená fronta vykonávání vyprázdní (pokud narazíte na problémy, podívejte se do záznamu chyb).

Fronta vykonávání:", diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json index df8d6f49..76014ba9 100644 --- a/front/php/templates/language/de_de.json +++ b/front/php/templates/language/de_de.json @@ -858,7 +858,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "Aktualisiert...", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "Das Ereignis, das Sie ausgelöst haben, könnte eine Weile dauern, bis Hintergrundprozesse abgeschlossen sind. Die Ausführung endet, wenn die unten ausgeführte Warteschlangen abgearbeitet ist. (Siehe error log, wenn Probleme auftreten.)

Ausführungsschlange:", "general_event_title": "", "go_to_device_event_tooltip": "", diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 41b72b17..7b67929b 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -785,7 +785,12 @@ "device_history_tab_title": "Change log", "device_history_table_title_changes": "Changes", "devices_old": "Refreshing…", + "gen_actions": "Actions", + "gen_content": "Content", "gen_device": "Device", + "gen_level": "Level", + "gen_read": "Read", + "gen_timestamp": "Timestamp", "general_event_description": "The event you have triggered might take a while until background processes finish. The execution ended once the below execution queue empties (Check the error log if you encounter issues).

Execution queue:", "general_event_title": "Executing an ad-hoc event", "go_to_device_event_tooltip": "Navigate to the device", diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json index 22dc552e..7039b169 100644 --- a/front/php/templates/language/es_es.json +++ b/front/php/templates/language/es_es.json @@ -856,7 +856,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "Refrescando . . .", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "El evento que ha activado puede tardar un poco hasta que finalicen los procesos en segundo plano. La ejecución finalizó una vez que se vacía la cola de ejecución a continuación (consulte el registro de errores si encuentra problemas).

Cola de ejecución:", "general_event_title": "Ejecutar un evento ad-hoc", "go_to_device_event_tooltip": "Navegar al dispositivo", diff --git a/front/php/templates/language/fa_fa.json b/front/php/templates/language/fa_fa.json index 9f8962fc..53a99933 100644 --- a/front/php/templates/language/fa_fa.json +++ b/front/php/templates/language/fa_fa.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "", "general_event_title": "", "go_to_device_event_tooltip": "", diff --git a/front/php/templates/language/fi_fi.json b/front/php/templates/language/fi_fi.json index 5a2fda63..1f93b730 100644 --- a/front/php/templates/language/fi_fi.json +++ b/front/php/templates/language/fi_fi.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "", "general_event_title": "", "go_to_device_event_tooltip": "", diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json index 1b2b7fde..2254af9f 100644 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -785,7 +785,12 @@ "device_history_tab_title": "Journaux des changements", "device_history_table_title_changes": "Changements", "devices_old": "Rafraichissement…", + "gen_actions": "", + "gen_content": "", "gen_device": "Appareil", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "L'événement que vous avez lancé peut prendre du temps avant que les tâches de fond ne soit terminées. La durée d'exécution finira une fois que la file d'exécution ci-dessous sera vide (consulter les journaux d'erreur si vous rencontrez des erreurs).

File d'exécution :", "general_event_title": "Lancement d'un événement sur mesure", "go_to_device_event_tooltip": "Naviguer vers cet appareil", @@ -825,4 +830,4 @@ "settings_system_label": "Système", "settings_update_item_warning": "Mettre à jour la valeur ci-dessous. Veillez à bien suivre le même format qu'auparavant. Il n'y a pas de pas de contrôle.", "test_event_tooltip": "Enregistrer d'abord vos modifications avant de tester vôtre paramétrage." -} +} \ No newline at end of file diff --git a/front/php/templates/language/he_il.json b/front/php/templates/language/he_il.json index 5a2fda63..1f93b730 100644 --- a/front/php/templates/language/he_il.json +++ b/front/php/templates/language/he_il.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "", "general_event_title": "", "go_to_device_event_tooltip": "", diff --git a/front/php/templates/language/id_id.json b/front/php/templates/language/id_id.json index 5a2fda63..1f93b730 100644 --- a/front/php/templates/language/id_id.json +++ b/front/php/templates/language/id_id.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "", "general_event_title": "", "go_to_device_event_tooltip": "", diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json index 67fb53a2..47760069 100644 --- a/front/php/templates/language/it_it.json +++ b/front/php/templates/language/it_it.json @@ -785,7 +785,12 @@ "device_history_tab_title": "Registro delle modifiche", "device_history_table_title_changes": "Modifiche", "devices_old": "Aggiornamento…", + "gen_actions": "", + "gen_content": "", "gen_device": "Dispositivo", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "L'evento che hai attivato potrebbe richiedere del tempo prima che i processi in background vengano completati. L'esecuzione è terminata una volta che la coda di esecuzione sottostante si è svuotata (controlla il log degli errori se riscontri problemi).

Coda di esecuzione:", "general_event_title": "Esecuzione di un evento ad-hoc", "go_to_device_event_tooltip": "Naviga al dispositivo", @@ -825,4 +830,4 @@ "settings_system_label": "Sistema", "settings_update_item_warning": "Aggiorna il valore qui sotto. Fai attenzione a seguire il formato precedente. La convalida non viene eseguita.", "test_event_tooltip": "Salva le modifiche prima di provare le nuove impostazioni." -} +} \ No newline at end of file diff --git a/front/php/templates/language/ja_jp.json b/front/php/templates/language/ja_jp.json index 2aa31f98..1638f432 100644 --- a/front/php/templates/language/ja_jp.json +++ b/front/php/templates/language/ja_jp.json @@ -747,9 +747,9 @@ "VERSION_name": "バージョンまたはタイムスタンプ", "WF_Action_Add": "アクションを追加", "WF_Action_field": "フィールド", - "WF_Action_target": "", - "WF_Action_target_conditions": "", - "WF_Action_token_hint": "", + "WF_Action_target": "アクションを適用する", + "WF_Action_target_conditions": "対象デバイスの条件", + "WF_Action_token_hint": "トリガーとなったデバイスを参照するには、{{trigger.COLUMN}} を使用します（例：{{trigger.devLastIP}}、{{trigger.devMac}}）", "WF_Action_type": "種別", "WF_Action_value": "値", "WF_Actions": "アクション", @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "リフレッシュ中…", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "トリガーされたイベントは、バックグラウンド処理が完了するまで時間がかかる場合があります。以下の実行キューが空になると処理は終了します（問題が発生した場合は エラーログ を確認してください）。

実行キュー:", "general_event_title": "アドホックイベントの実行", "go_to_device_event_tooltip": "デバイスに移動", @@ -820,13 +825,9 @@ "settings_publishers_label": "パブリッシャー", "settings_readonly": "app.conf の読み取りまたは書き込みができません。コンテナを再起動し、ファイルの権限に関するドキュメント を参照してください", "settings_saved": "
設定が保存されました。
再読込中…

", - "settings_saved_background": "", + "settings_saved_background": "設定が保存されました。変更はバックグラウンドで反映されます。", "settings_system_icon": "fa-solid fa-gear", "settings_system_label": "システム", "settings_update_item_warning": "以下の値を更新してください。以前のフォーマットに従うよう注意してください。検証は行われません。", - "test_event_tooltip": "設定をテストする前に、まず変更を保存してください。", - "WF_Action_target": "アクションを適用する", - "WF_Action_target_conditions": "対象デバイスの条件", - "WF_Action_token_hint": "トリガーとなったデバイスを参照するには、{{trigger.COLUMN}} を使用します（例：{{trigger.devLastIP}}、{{trigger.devMac}}）", - "settings_saved_background": "設定が保存されました。変更はバックグラウンドで反映されます。" -} + "test_event_tooltip": "設定をテストする前に、まず変更を保存してください。" +} \ No newline at end of file diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json index 8862e009..1e985a97 100644 --- a/front/php/templates/language/nb_no.json +++ b/front/php/templates/language/nb_no.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "Oppdaterer...", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "Hendelsen du har utløst kan ta en stund til før bakgrunnsprosesser er ferdig. Utførelsen ble avsluttet når utførelseskøen nedenfor tømmes (sjekk Feillogg Hvis du møter problemer).

Utførelseskø:", "general_event_title": "Utfører en ad-hoc hendelse", "go_to_device_event_tooltip": "", @@ -825,4 +830,4 @@ "settings_system_label": "System", "settings_update_item_warning": "Oppdater verdien nedenfor. Pass på å følge forrige format. Validering etterpå utføres ikke.", "test_event_tooltip": "Lagre endringene først, før du tester innstillingene dine." -} +} \ No newline at end of file diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json index 23ffd4de..ccffc1c6 100644 --- a/front/php/templates/language/pl_pl.json +++ b/front/php/templates/language/pl_pl.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "Odświeżanie…", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "Zdarzenie, które wywołałeś, może potrwać chwilę, zanim zakończą się procesy w tle. Wykonanie zostanie zakończone, gdy poniższa kolejka wykonania zostanie opróżniona (jeśli napotkasz problemy, sprawdź dziennik błędów).

Kolejka wykonania:", "general_event_title": "Wykonywanie zdarzenia ad-hoc", "go_to_device_event_tooltip": "", @@ -825,4 +830,4 @@ "settings_system_label": "System", "settings_update_item_warning": "Zaktualizuj wartość poniżej. Uważaj, aby zachować poprzedni format. Walidacja nie jest wykonywana.", "test_event_tooltip": "Najpierw zapisz swoje zmiany, zanim przetestujesz ustawienia." -} +} \ No newline at end of file diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json index 4f68ca7e..77b95cb5 100644 --- a/front/php/templates/language/pt_br.json +++ b/front/php/templates/language/pt_br.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "", "general_event_title": "", "go_to_device_event_tooltip": "", diff --git a/front/php/templates/language/pt_pt.json b/front/php/templates/language/pt_pt.json index d667b592..7120d3c6 100644 --- a/front/php/templates/language/pt_pt.json +++ b/front/php/templates/language/pt_pt.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "A atualizar…", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "O evento que ativou pode demorar algum tempo até que os processos de planos de fundo terminem. A execução acabou uma vez que a lista de execução abaixo fica vazia (Verifique o registo de erros se encontrar problemas).

Lista de execução:", "general_event_title": "A executar um evento ad-hoc", "go_to_device_event_tooltip": "Navegar para o dispositivo", diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json index 07ca5ed6..5902520f 100644 --- a/front/php/templates/language/ru_ru.json +++ b/front/php/templates/language/ru_ru.json @@ -747,9 +747,9 @@ "VERSION_name": "Версия или временная метка", "WF_Action_Add": "Добавить действие", "WF_Action_field": "Поле", - "WF_Action_target": "", - "WF_Action_target_conditions": "", - "WF_Action_token_hint": "", + "WF_Action_target": "Применить действие к", + "WF_Action_target_conditions": "Состояние целевого устройства", + "WF_Action_token_hint": "Используйте {{trigger.COLUMN}} для ссылки на триггерное устройство (например, {{trigger.devLastIP}}, {{trigger.devMac}})", "WF_Action_type": "Тип", "WF_Action_value": "Значение", "WF_Actions": "Действия", @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "Актуализируется…", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "Событие, которое вы инициировали, может занять некоторое время, прежде чем фоновые процессы завершатся. Выполнение завершится, как только очередь выполнения, указанная ниже, опустеет (Проверьте журнал ошибок при возникновении проблем).

· · Очередь выполнения:", "general_event_title": "Выполнение специального события", "go_to_device_event_tooltip": "Перейти к устройству", @@ -820,13 +825,9 @@ "settings_publishers_label": "Уведомления", "settings_readonly": "Невозможно ПРОЧИТАТЬ или ЗАПИСАТЬ app.conf. Попробуйте перезапустить контейнер и прочитать документацию по разрешениям файлов", "settings_saved": "
Настройки сохранены.
Перезагрузка...

", - "settings_saved_background": "", + "settings_saved_background": "Настройки сохранены. Изменения применяются в фоновом режиме.", "settings_system_icon": "fa-solid fa-gear", "settings_system_label": "Система", "settings_update_item_warning": "Обновить значение ниже. Будьте осторожны, следуя предыдущему формату. Проверка не выполняется.", - "test_event_tooltip": "Сначала сохраните изменения, прежде чем проверять настройки.", - "WF_Action_target": "Применить действие к", - "WF_Action_target_conditions": "Состояние целевого устройства", - "WF_Action_token_hint": "Используйте {{trigger.COLUMN}} для ссылки на триггерное устройство (например, {{trigger.devLastIP}}, {{trigger.devMac}})", - "settings_saved_background": "Настройки сохранены. Изменения применяются в фоновом режиме." -} + "test_event_tooltip": "Сначала сохраните изменения, прежде чем проверять настройки." +} \ No newline at end of file diff --git a/front/php/templates/language/sv_sv.json b/front/php/templates/language/sv_sv.json index 5a2fda63..1f93b730 100644 --- a/front/php/templates/language/sv_sv.json +++ b/front/php/templates/language/sv_sv.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "", "general_event_title": "", "go_to_device_event_tooltip": "", diff --git a/front/php/templates/language/tr_tr.json b/front/php/templates/language/tr_tr.json index 810b29fd..58911414 100644 --- a/front/php/templates/language/tr_tr.json +++ b/front/php/templates/language/tr_tr.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "Yenileniyor...", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "", "general_event_title": "", "go_to_device_event_tooltip": "", @@ -825,4 +830,4 @@ "settings_system_label": "Sistem", "settings_update_item_warning": "", "test_event_tooltip": "" -} +} \ No newline at end of file diff --git a/front/php/templates/language/uk_ua.json b/front/php/templates/language/uk_ua.json index 44fae3ce..d8883dd9 100644 --- a/front/php/templates/language/uk_ua.json +++ b/front/php/templates/language/uk_ua.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "Освіжає…", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "Подія, яку ви ініціювали, може зайняти деякий час, поки завершаться фонові процеси. Виконання завершилося, коли наведена нижче черга виконання спорожнилася (перевірте журнал помилок, якщо виникнуть проблеми).

Черга виконання:", "general_event_title": "Виконання спеціальної події", "go_to_device_event_tooltip": "Перейдіть до пристрою", @@ -825,4 +830,4 @@ "settings_system_label": "Система", "settings_update_item_warning": "Оновіть значення нижче. Слідкуйте за попереднім форматом. Перевірка не виконана.", "test_event_tooltip": "Перш ніж перевіряти налаштування, збережіть зміни." -} +} \ No newline at end of file diff --git a/front/php/templates/language/vi_vn.json b/front/php/templates/language/vi_vn.json index 5a2fda63..1f93b730 100644 --- a/front/php/templates/language/vi_vn.json +++ b/front/php/templates/language/vi_vn.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "", "general_event_title": "", "go_to_device_event_tooltip": "", diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json index 2a5b1efa..c2da26e3 100644 --- a/front/php/templates/language/zh_cn.json +++ b/front/php/templates/language/zh_cn.json @@ -785,7 +785,12 @@ "device_history_tab_title": "", "device_history_table_title_changes": "", "devices_old": "刷新中…", + "gen_actions": "", + "gen_content": "", "gen_device": "", + "gen_level": "", + "gen_read": "", + "gen_timestamp": "", "general_event_description": "您触发的事件可能需要一段时间才能完成后台进程。一旦以下执行队列清空，执行就会结束（如果遇到问题，请检查错误日志）。

执行队列：", "general_event_title": "执行自组织网络事件", "go_to_device_event_tooltip": "前往设备页面", diff --git a/front/php/templates/skel_change_log.php b/front/php/templates/skel_change_log.php index c51c0b64..ec5165f9 100644 --- a/front/php/templates/skel_change_log.php +++ b/front/php/templates/skel_change_log.php @@ -1,6 +1,6 @@ -
-
+
+
diff --git a/front/userNotifications.php b/front/userNotifications.php index 52dd7080..ebd13772 100755 --- a/front/userNotifications.php +++ b/front/userNotifications.php @@ -15,21 +15,21 @@ require 'php/templates/header.php';
-
+

-
+
- - - + + + - - + + @@ -75,6 +75,7 @@ require 'php/templates/header.php'; $(document).ready(function() { const table = $('#notificationsTable').DataTable({ + "autoWidth": false, "pageLength": parseInt(getSetting("UI_DEFAULT_PAGE_SIZE")), 'lengthMenu' : getLengthMenu(parseInt(getSetting("UI_DEFAULT_PAGE_SIZE"))), "columns": [ diff --git a/server/models/notification_instance.py b/server/models/notification_instance.py index 007e0656..2e09c320 100755 --- a/server/models/notification_instance.py +++ b/server/models/notification_instance.py @@ -146,9 +146,14 @@ class NotificationInstance: mail_html, conf.REPORT_DASHBOARD_URL + "/deviceDetails.php?mac=" ) - # Add Preheaders for preview after mac links created + # Add preheader for inbox preview after all links have been generated. + # Invisible padding prevents email clients from showing the start of the email body. + preheader = " • ".join(preheaders) + padding = " " * 40 + "​" * 40 + mail_html = mail_html.replace( - "PREHEADER", " • ".join(preheaders) + "PREHEADER", + preheader + padding, ) final_html = indent(
TimestampLevelContent GUIDReadActions