From: Mrnt <github@maurent.com>
Date: Wed, 14 Mar 2018 01:10:50 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/dev' into html5-video-playback
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=2ba8430a84582780b814938e72d6f86871ddba47;p=motioneye-debian

Merge remote-tracking branch 'upstream/dev' into html5-video-playback

 - fix conflicts
 - use js video playback from upstream/dev but try to preload video to better support of remote cameras
 - some css tweaks

Missed these two
---

diff --git a/motioneye/mediafiles.py b/motioneye/mediafiles.py
index fc548cc..4d025da 100644
--- a/motioneye/mediafiles.py
+++ b/motioneye/mediafiles.py
@@ -21,7 +21,6 @@ import fcntl
 import functools
 import hashlib
 import logging
-import mimetypes
 import multiprocessing
 import os.path
 import pipes
diff --git a/motioneye/static/css/main.css b/motioneye/static/css/main.css
index 04d472a..694d727 100644
--- a/motioneye/static/css/main.css
+++ b/motioneye/static/css/main.css
@@ -767,7 +767,8 @@ div.picture-dialog-content {
 
 div.picture-dialog-prev-arrow,
 div.picture-dialog-next-arrow,
-div.picture-dialog-play {
+div.picture-dialog-play,
+div.picture-dialog-progress {
     position: absolute;
     top: 50%;
     margin-top: -1.5em;
@@ -791,8 +792,7 @@ div.picture-dialog-play {
     background-image: url(../img/camera-top-buttons.svg);
     background-position: -300% 0px;
     left: 50%;
-    right: 50%;
-    transform: translate(-1.5em,0);
+    margin-left: -1.5em;
 }
 
 div.picture-dialog-prev-arrow {
@@ -811,29 +811,15 @@ video.picture-dialog-content {
     border: 1px solid #292929;
 }
 
-img.picture-dialog-progress {
-    position: absolute;
-    background-color: #313131;
-    padding: 10px;
+div.picture-dialog-progress {
+    left: 50%;
+    margin: -32px 0 0 -32px;
+    width: 64px;
+    height: 64px;
     border-radius: 10px;
+    background-image: url(../img/modal-progress.gif);
     opacity: 0.7;
 }
-.video-loading {
-    position: absolute;
-    top: 0;
-    left: 0;
-    margin-top: -5px;
-    height: 2.5em;
-    width: 2.5em;
-    background-image: url(../img/small-progress.gif);
-    background-position: center;
-    background-repeat: no-repeat;
-}
-.video-loaderror {
-    background-image: url(../img/validation-error.svg);
-    background-position: center;
-    cursor: pointer;
-}
 
 table.timelapse-dialog select {
     width: 10em;