Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions front/changeLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
require 'php/templates/header.php';
?>
<div class="content-wrapper changeHistoryPage spinnerTarget" id="changeHistoryPage">
<?php
require 'changeLogCore.php';
?>
<div class="content" >
<div class="tab-content box">
<?php
require 'changeLogCore.php';
?>
</div>
</div>
</div>


Expand Down
4 changes: 2 additions & 2 deletions front/changeLogCore.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

<div class="row">
<div class="col-xs-12">
<div class="box">
<div >

<!-- Filter Bar -->
<div class="box-header" style="display:flex; gap:10px; flex-wrap:wrap; align-items:center;">
<div class="changeLogFilter" >
<select id="filterChangedBy" class="form-control" style="width:200px;">
<option value=""><?= lang('device_history_col_source'); ?> - All</option>
</select>
Expand Down
35 changes: 28 additions & 7 deletions front/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ a[target="_blank"] {
.main-footer {
padding: 5px;
z-index: 10000;
position: inherit;
position: inherit;
}

.header-server-time
Expand Down Expand Up @@ -1018,6 +1018,11 @@ height: 50px;
/* report */
/* --------------------------------------------------------- */

#notifications
{
display: flex;
}

#notificationData
{
margin-bottom: 10px;
Expand Down Expand Up @@ -2687,7 +2692,7 @@ table.dataTable tbody > tr.selected

.change-log .helpIcon{
font-size: x-small;
top: 65px;
top: 0px;
}

#panHistory .change-log .helpIcon{
Expand All @@ -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;
}

/* -----------------------------------------------------------------------------
Expand Down Expand Up @@ -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;
Expand All @@ -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; }
Expand Down Expand Up @@ -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 ===== */

9 changes: 8 additions & 1 deletion front/deviceDetails.php
Original file line number Diff line number Diff line change
Expand Up @@ -599,9 +599,16 @@ function applyDevicePageTitle(mac, name, owner) {

// -----------------------------------------------------------------------------
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();
Expand Down
7 changes: 1 addition & 6 deletions front/js/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -1041,19 +1041,14 @@ function showSpinner(stringKey = "Loading", target = null) {
});
}

function hideSpinner() {
$("#loadingSpinner")
.removeClass("visible")
.fadeOut(animationTime);
}

function hideSpinner() {
clearTimeout(spinnerTimeout);
const spinner = $("#loadingSpinner");

if (!spinner.length) return;

const target = $(".spinnerTarget").first();
const target = $(".spinnerTarget").last();

if (target.length) {
// Lock position to target
Expand Down
7 changes: 6 additions & 1 deletion front/php/templates/language/ar_ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "انتقل إلى الجهاز",
Expand Down Expand Up @@ -825,4 +830,4 @@
"settings_system_label": "نظام",
"settings_update_item_warning": "قم بتحديث القيمة أدناه. احرص على اتباع التنسيق السابق. <b>لم يتم إجراء التحقق.</b>",
"test_event_tooltip": "احفظ التغييرات أولاً قبل اختبار الإعدادات."
}
}
5 changes: 5 additions & 0 deletions front/php/templates/language/ca_ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href='/maintenance.php#tab_Logging'></a> si hi ha problemes). <br/> <br/> Cua d'execució:",
"general_event_title": "Execució d'un esdeveniment ad-hoc",
"go_to_device_event_tooltip": "Navegar al dispositiu",
Expand Down
5 changes: 5 additions & 0 deletions front/php/templates/language/cs_cz.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href='/maintenance.php#tab_Logging'>záznamu chyb</a>). <br/> <br/> Fronta vykonávání:",
Expand Down
5 changes: 5 additions & 0 deletions front/php/templates/language/de_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href='/maintenance.php#tab_Logging'>error log</a>, wenn Probleme auftreten.)<br/> <br/> Ausführungsschlange:",
"general_event_title": "",
"go_to_device_event_tooltip": "",
Expand Down
5 changes: 5 additions & 0 deletions front/php/templates/language/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href='/maintenance.php#tab_Logging'>error log</a> if you encounter issues). <br/> <br/> Execution queue:",
"general_event_title": "Executing an ad-hoc event",
"go_to_device_event_tooltip": "Navigate to the device",
Expand Down
5 changes: 5 additions & 0 deletions front/php/templates/language/es_es.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href='/maintenance.php#tab_Logging'>registro de errores</a> si encuentra problemas). <br/> <br/> Cola de ejecución:",
"general_event_title": "Ejecutar un evento ad-hoc",
"go_to_device_event_tooltip": "Navegar al dispositivo",
Expand Down
5 changes: 5 additions & 0 deletions front/php/templates/language/fa_fa.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
5 changes: 5 additions & 0 deletions front/php/templates/language/fi_fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
7 changes: 6 additions & 1 deletion front/php/templates/language/fr_fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href='/maintenance.php#tab_Logging'>journaux d'erreur</a> si vous rencontrez des erreurs). <br/> <br/> File d'exécution :",
"general_event_title": "Lancement d'un événement sur mesure",
"go_to_device_event_tooltip": "Naviguer vers cet appareil",
Expand Down Expand Up @@ -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. <b>Il n'y a pas de pas de contrôle.</b>",
"test_event_tooltip": "Enregistrer d'abord vos modifications avant de tester vôtre paramétrage."
}
}
5 changes: 5 additions & 0 deletions front/php/templates/language/he_il.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
5 changes: 5 additions & 0 deletions front/php/templates/language/id_id.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
7 changes: 6 additions & 1 deletion front/php/templates/language/it_it.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href='/maintenance.php#tab_Logging'>log degli errori</a> se riscontri problemi). <br/> <br/> Coda di esecuzione:",
"general_event_title": "Esecuzione di un evento ad-hoc",
"go_to_device_event_tooltip": "Naviga al dispositivo",
Expand Down Expand Up @@ -825,4 +830,4 @@
"settings_system_label": "Sistema",
"settings_update_item_warning": "Aggiorna il valore qui sotto. Fai attenzione a seguire il formato precedente. <b>La convalida non viene eseguita.</b>",
"test_event_tooltip": "Salva le modifiche prima di provare le nuove impostazioni."
}
}
21 changes: 11 additions & 10 deletions front/php/templates/language/ja_jp.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "トリガーとなったデバイスを参照するには、<code>{{trigger.COLUMN}}</code> を使用します(例:<code>{{trigger.devLastIP}}</code>、<code>{{trigger.devMac}}</code>)",
"WF_Action_type": "種別",
"WF_Action_value": "値",
"WF_Actions": "アクション",
Expand Down Expand Up @@ -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": "トリガーされたイベントは、バックグラウンド処理が完了するまで時間がかかる場合があります。以下の実行キューが空になると処理は終了します(問題が発生した場合は <a href='/maintenance.php#tab_Logging'>エラーログ</a> を確認してください)。<br/> <br/> 実行キュー:",
"general_event_title": "アドホックイベントの実行",
"go_to_device_event_tooltip": "デバイスに移動",
Expand Down Expand Up @@ -820,13 +825,9 @@
"settings_publishers_label": "パブリッシャー",
"settings_readonly": "<code>app.conf</code> の読み取りまたは書き込みができません。コンテナを再起動し、<a href=\"https://docs.netalertx.com/FILE_PERMISSIONS\" target=\"_blank\">ファイルの権限に関するドキュメント</a> を参照してください",
"settings_saved": "<br/>設定が保存されました。<br/> 再読込中…<br/><i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i><br/>",
"settings_saved_background": "",
"settings_saved_background": "設定が保存されました。変更はバックグラウンドで反映されます。",
"settings_system_icon": "fa-solid fa-gear",
"settings_system_label": "システム",
"settings_update_item_warning": "以下の値を更新してください。以前のフォーマットに従うよう注意してください。<b>検証は行われません。</b>",
"test_event_tooltip": "設定をテストする前に、まず変更を保存してください。",
"WF_Action_target": "アクションを適用する",
"WF_Action_target_conditions": "対象デバイスの条件",
"WF_Action_token_hint": "トリガーとなったデバイスを参照するには、<code>{{trigger.COLUMN}}</code> を使用します(例:<code>{{trigger.devLastIP}}</code>、<code>{{trigger.devMac}}</code>)",
"settings_saved_background": "設定が保存されました。変更はバックグラウンドで反映されます。"
}
"test_event_tooltip": "設定をテストする前に、まず変更を保存してください。"
}
7 changes: 6 additions & 1 deletion front/php/templates/language/nb_no.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href='/maintenance.php#tab_Logging'>Feillogg</a> Hvis du møter problemer). <br/> <br/> Utførelseskø:",
"general_event_title": "Utfører en ad-hoc hendelse",
"go_to_device_event_tooltip": "",
Expand Down Expand Up @@ -825,4 +830,4 @@
"settings_system_label": "System",
"settings_update_item_warning": "Oppdater verdien nedenfor. Pass på å følge forrige format. <b>Validering etterpå utføres ikke.</b>",
"test_event_tooltip": "Lagre endringene først, før du tester innstillingene dine."
}
}
Loading
Loading