Merge branch 'Dev' of https://github.com/sagitaz/plugin-frigate into Dev

Author: sagitaz

desktop/modal/editConfiguration.modal.php

@@ -60,11 +60,11 @@
 <div>
 <button id="synchroConfiguration" class="btn btn-success pull-left" title="{{Recharge le fichier de configuration depuis le serveur Frigate}}"><i class="fas fa-cloud-download-alt"></i> {{Récupérer la configuration}}</button>
 <button id="downloadConfiguration" class="btn btn-success pull-left" title="{{Télécharger le fichier de configuration depuis le serveur Frigate}}"><i class="fas fa-save"></i> {{Télécharger la configuration}}</button>
-<button id="sendConfigurationAndRestart" class="btn btn-warning pull-right" title="{{Envoie et remplace le fichier de configuration du serveur Frigate puis redémarre Frigate}}"><i class="fas fa-redo"></i> {{Envoyer la configuration et redémarrer Frigate}}</button>
+<button id="sendConfigurationAndRestart" class="btn btn-warning pull-right" style="margin-right: 0 !important;" title="{{Envoie et remplace le fichier de configuration du serveur Frigate puis redémarre Frigate}}"><i class="fas fa-redo"></i> {{Envoyer la configuration et redémarrer Frigate}}</button>
 <button id="sendConfiguration" class="btn btn-warning pull-right" title="{{Envoie et remplace le fichier de configuration Frigate}}"><i class="fas fa-cloud-upload-alt"></i> {{Envoyer la configuration}}</button>
 <br/>
 <br/>
-<div id='div_yamlAlert' class="alert"></div>
+<div id="div_yamlAlert" class="alert" style="text-align: center"></div>
 </div>
 <div class="bound-config">
     <textarea id="frigateConfiguration" class="boxsizingborder" spellcheck="false"></textarea>

desktop/php/events.php

@@ -80,12 +80,16 @@ function timeElapsedString($datetime, $full = false)
     's' => ['seconde', 'secondes'],
   ];
 
-  $strings = [];
-
-  foreach ($units as $key => [$singular, $plural]) {
-    if ($diff->$key) {
-      $count = $diff->$key;
-      $strings[] = $count . ' ' . ($count > 1 ? $plural : $singular);
+    foreach ($string as $k => &$v) {
+      if ($diff->$k) {
+        $value = $diff->$k;
+        if ($value > 1 && $k !== 'm') {
+            $v .= 's';
+        }
+        $v = $value . ' ' . $v;
+      } else {
+        unset($string[$k]);
+      }
     }
   }
 

desktop/php/panel.php

@@ -120,7 +120,17 @@ function timeElapsedString($datetime, $full = false)
     's' => ['seconde', 'secondes'],
   ];
 
-  $strings = [];
+        foreach ($string as $k => &$v) {
+          if ($diff->$k) {
+            $value = $diff->$k;
+            if ($value > 1 && $k !== 'm') {
+                $v .= 's';
+            }
+            $v = $value . ' ' . $v;
+          } else {
+            unset($string[$k]);
+          }
+        }
 
   foreach ($units as $key => [$singular, $plural]) {
     if ($diff->$key) {