diff --git a/front/css/app.css b/front/css/app.css index f1139253..f0d29e47 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -12,11 +12,26 @@ ----------------------------------------------------------------------------- */ :root { --color-aqua: #00c0ef; + --color-blue: #0060df; --color-green: #00a65a; --color-yellow: #f39c12; --color-red: #dd4b39; } +/* ----------------------------------------------------------------------------- + Helper Classes +----------------------------------------------------------------------------- */ + +.pointer +{ + cursor: pointer; +} + +.question +{ + cursor: help; +} + /* ----------------------------------------------------------------------------- Text Classes ----------------------------------------------------------------------------- */ @@ -778,6 +793,35 @@ height: 50px; display: inline-grid; } +/* --------------------------------------------------------- */ +/* Presence */ +/* --------------------------------------------------------- */ +.presencenceKey +{ + float: right; +} + +.presenceOnlineNow{ + background-color: var(--color-green); +} + +.presenceOnlinePast{ + background-color: var(--color-blue); +} + +.presenceOnlinePastMiss{ + background-color: var(--color-yellow); +} + +.presenceKeyBoxes +{ + width: 10px; + height: 10px; + display: inline-block; + /* background: #fff; */ + opacity: .75; +} + /* --------------------------------------------------------- */ /* report */ /* --------------------------------------------------------- */ @@ -1181,11 +1225,6 @@ input[readonly] { font-size: large; } -.pointer -{ - cursor: pointer; -} - .drag { cursor: move; /* fallback if grab cursor is unsupported */ diff --git a/front/php/templates/language/ar_ar.json b/front/php/templates/language/ar_ar.json index 2dc32d8c..934fe4b5 100755 --- a/front/php/templates/language/ar_ar.json +++ b/front/php/templates/language/ar_ar.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "", "Presence_CalHead_year": "", "Presence_CallHead_Devices": "", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "", "Presence_Shortcut_AllDevices": "", "Presence_Shortcut_Archived": "", diff --git a/front/php/templates/language/cs_cz.json b/front/php/templates/language/cs_cz.json index 2dc32d8c..934fe4b5 100755 --- a/front/php/templates/language/cs_cz.json +++ b/front/php/templates/language/cs_cz.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "", "Presence_CalHead_year": "", "Presence_CallHead_Devices": "", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "", "Presence_Shortcut_AllDevices": "", "Presence_Shortcut_Archived": "", diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json index 1e294995..a8c6801a 100755 --- a/front/php/templates/language/de_de.json +++ b/front/php/templates/language/de_de.json @@ -590,6 +590,12 @@ "Presence_CalHead_week": "Woche", "Presence_CalHead_year": "Jahr", "Presence_CallHead_Devices": "Geräte", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "Laden...", "Presence_Shortcut_AllDevices": "Meine Geräte", "Presence_Shortcut_Archived": "Archiviert", diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index bac41d6f..9bd300d4 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "week", "Presence_CalHead_year": "year", "Presence_CallHead_Devices": "Devices", + "Presence_Key_OnlineNow": "Now online", + "Presence_Key_OnlineNow_desc": "Device detected in the last scan as online.", + "Presence_Key_OnlinePast": "Past online", + "Presence_Key_OnlinePastMiss": "Past online (miss-match)", + "Presence_Key_OnlinePastMiss_desc": "Device online in the past, but currently offline, but the start session might be missing or has conflicting data. (might be a bug - please submit a PR if you know how to fix it - I'm a bit lost in code here)", + "Presence_Key_OnlinePast_desc": "Device online in the past, but currently offline.", "Presence_Loading": "Loading...", "Presence_Shortcut_AllDevices": "My Devices", "Presence_Shortcut_Archived": "Archived", diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json index 58cd4fc2..1e28b8b9 100755 --- a/front/php/templates/language/es_es.json +++ b/front/php/templates/language/es_es.json @@ -588,6 +588,12 @@ "Presence_CalHead_week": "semana", "Presence_CalHead_year": "año", "Presence_CallHead_Devices": "Dispositivos", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "Cargando...", "Presence_Shortcut_AllDevices": "Mis dispositivos", "Presence_Shortcut_Archived": "Archivado(s)", diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json index d3f03c5a..5044f9d2 100755 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "semaine", "Presence_CalHead_year": "année", "Presence_CallHead_Devices": "Appareils", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "Chargement …", "Presence_Shortcut_AllDevices": "Mes appareils", "Presence_Shortcut_Archived": "Archivés", diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json index 1e11f915..f09e5a44 100755 --- a/front/php/templates/language/it_it.json +++ b/front/php/templates/language/it_it.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "settimana", "Presence_CalHead_year": "anno", "Presence_CallHead_Devices": "Dispositivi", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "Caricamento...", "Presence_Shortcut_AllDevices": "Miei dispositivi", "Presence_Shortcut_Archived": "Archiviati", diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json index acbd55e2..7781db32 100755 --- a/front/php/templates/language/nb_no.json +++ b/front/php/templates/language/nb_no.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "uke", "Presence_CalHead_year": "år", "Presence_CallHead_Devices": "Enheter", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "Laster...", "Presence_Shortcut_AllDevices": "Mine enheter", "Presence_Shortcut_Archived": "Arkivert", diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json index 1ff3ea5f..1cc51000 100755 --- a/front/php/templates/language/pl_pl.json +++ b/front/php/templates/language/pl_pl.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "tydzień", "Presence_CalHead_year": "rok", "Presence_CallHead_Devices": "Urządzenia", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "Wczytywanie...", "Presence_Shortcut_AllDevices": "Moje Urządzenia", "Presence_Shortcut_Archived": "Zarchiwizowane", diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json index 0ecf0d21..b98cdec4 100755 --- a/front/php/templates/language/pt_br.json +++ b/front/php/templates/language/pt_br.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "", "Presence_CalHead_year": "", "Presence_CallHead_Devices": "", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "", "Presence_Shortcut_AllDevices": "", "Presence_Shortcut_Archived": "", diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json index d83bdaac..1c6241ed 100755 --- a/front/php/templates/language/ru_ru.json +++ b/front/php/templates/language/ru_ru.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "неделя", "Presence_CalHead_year": "год", "Presence_CallHead_Devices": "Устройства", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "Загрузка...", "Presence_Shortcut_AllDevices": "Мои устройства", "Presence_Shortcut_Archived": "Архив", diff --git a/front/php/templates/language/tr_tr.json b/front/php/templates/language/tr_tr.json index af623528..517ef291 100755 --- a/front/php/templates/language/tr_tr.json +++ b/front/php/templates/language/tr_tr.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "hafta", "Presence_CalHead_year": "yıl", "Presence_CallHead_Devices": "Cihazlar", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "Yükleniyor...", "Presence_Shortcut_AllDevices": "Cihazlarım", "Presence_Shortcut_Archived": "", diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json index 19adeb76..8aa029f9 100755 --- a/front/php/templates/language/zh_cn.json +++ b/front/php/templates/language/zh_cn.json @@ -549,6 +549,12 @@ "Presence_CalHead_week": "星期", "Presence_CalHead_year": "年", "Presence_CallHead_Devices": "设备", + "Presence_Key_OnlineNow": "", + "Presence_Key_OnlineNow_desc": "", + "Presence_Key_OnlinePast": "", + "Presence_Key_OnlinePastMiss": "", + "Presence_Key_OnlinePastMiss_desc": "", + "Presence_Key_OnlinePast_desc": "", "Presence_Loading": "加载中...", "Presence_Shortcut_AllDevices": "我的设备", "Presence_Shortcut_Archived": "已归档", diff --git a/front/presence.php b/front/presence.php index 873b406a..a73e85b3 100755 --- a/front/presence.php +++ b/front/presence.php @@ -170,6 +170,17 @@