fixed media preview wrong media file

diff --git a/doc/todo.txt b/doc/todo.txt
index 1b74edc30d4e72f531d75abfa44e424f361b55e6..c8d562af9652e90cbbe1f83ef5b56950aad68854 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,9 +1,9 @@
--> make camera frames positions configurable
--> add a view log functionality
-
 -> optimize the media list js code:
     * loading many media groups (directories) is painfully slow
     * scroll event could also be optimized for speed
+-> make camera frames positions configurable
+-> add a view log functionality
+
 -> style scroll bars
 -> hint text next to section titles
 -> clickable hints

diff --git a/static/img/favicon.ico b/static/img/favicon.ico
index 81224841d87613c10dd07ac6913e736adb39498a..6cb844d4328deb17cd48b97042d6bc899f07fdc9 100644 (file)
Binary files a/static/img/favicon.ico and b/static/img/favicon.ico differ

diff --git a/static/img/motioneye-icon.svg b/static/img/motioneye-icon.svg
index 7e30370b84e4ec97440b122382fc140b541c9a58..c568d8f7ce4bb441424921dd0c4b4bc68b65cef0 100644 (file)
--- a/static/img/motioneye-icon.svg
+++ b/static/img/motioneye-icon.svg
@@ -15,10 +15,10 @@
    width="64"
    height="64"
    xml:space="preserve"
-   sodipodi:docname="motioneye-logo.svg"
-   inkscape:export-filename="/home/ccrisan/projects/motioneye/static/img/motioneye-logo.png"
-   inkscape:export-xdpi="960"
-   inkscape:export-ydpi="960"><metadata
+   sodipodi:docname="motioneye-icon.svg"
+   inkscape:export-filename="/home/ccrisan/projects/motioneye/static/img/motioneye-icon16.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5"><metadata
      id="metadata8"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
@@ -35,9 +35,9 @@
      inkscape:window-height="1030"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="16.49923"
-     inkscape:cy="31.367776"
+     inkscape:zoom="3.2304687"
+     inkscape:cx="72.528246"
+     inkscape:cy="12.175515"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1"
@@ -48,7 +48,7 @@
      inkscape:groupmode="layer"
      inkscape:label="ink_ext_XXXXXX"
      transform="matrix(1.25,0,0,-1.25,0,64)"><path
-       style="opacity:1;fill:#3498db;fill-opacity:1;stroke:none"
+       style="opacity:1;fill:#515151;fill-opacity:1;stroke:none"
        d="m 32,6 c -5.264933,0 -10.15584,1.684955 -14.25,4.375 4.426748,0.474546 8.794165,1.616509 13.75,4.0625 5.241955,-2.299372 10.152222,-3.621792 14.78125,-4.15625 C 42.179879,7.5768125 37.280255,6 32,6 z m 17,5.59375 c -5.21085,0.03453 -12.330126,1.666208 -17.5,4.03125 -5.435679,-1.964064 -11.012887,-4.147356 -17.3125,-4 -0.419974,0.0099 -0.823167,0.03114 -1.25,0.0625 L 8,12.09375 l 4.6875,1.5625 c 6.020833,2.047755 13.921284,6.20873 17.4375,12.53125 l 0.3125,0.5 0.5625,0 2,0 0.5625,0 0.25,-0.4375 C 37.952221,19.929411 43.981336,16.020443 51.28125,13.65625 l 4.625,-1.5 -4.8125,-0.46875 C 50.437916,11.625136 49.744407,11.588818 49,11.59375 z M 12.65625,14.6875 C 8.5126665,19.293305 6,25.316864 6,32 6,46.359404 17.640596,58 32,58 46.359404,58 58,46.359404 58,32 58,25.341351 55.491547,19.287285 51.375,14.6875 49.406504,15.410957 47.442694,16.253379 45.5,17.34375 49.260018,18.43176 52,21.91463 52,26 c 0,4.945036 -4.027245,9 -9,9 -4.217962,0 -7.765819,-2.914031 -8.75,-6.8125 -1.243768,0 -3.31109,0 -4.5,0 C 28.774204,32.087724 25.219217,35 21,35 c -4.972755,0 -9.03125,-4.054964 -9.03125,-9 0,-4.133444 2.851912,-7.644 6.6875,-8.6875 -1.945667,-1.058808 -3.952016,-1.881003 -6,-2.625 z M 21,23 c -1.656854,0 -3,1.343146 -3,3 0,1.656854 1.343146,3 3,3 1.656854,0 3,-1.343146 3,-3 0,-1.656854 -1.343146,-3 -3,-3 z m 22,0 c -1.656854,0 -3,1.343146 -3,3 0,1.656854 1.343146,3 3,3 1.656854,0 3,-1.343146 3,-3 0,-1.656854 -1.343146,-3 -3,-3 z m -11,8 c 0.618234,2.299881 1.278866,4.581981 4,6 l -4,6 -4,-6 c 2.383634,-1.6888 3.483037,-3.758112 4,-6 z"
        transform="matrix(0.8,0,0,-0.8,0,51.2)"
        id="path3938"

diff --git a/static/js/main.js b/static/js/main.js
index 73a5fc67efc5aca402dc7e5c371115b382a403c4..4d7b2ff5d26d489b0c241364cf7b01e374b3304a 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -1378,7 +1378,7 @@ function runMediaDialog(cameraId, mediaType) {
         keys.forEach(function (key) {
             var entries = groups[key];
             
-            entries.forEach(function (entry, pos) {
+            entries.forEach(function (entry) {
                 var entryDiv = $('<div class="media-list-entry"></div>');
                 
                 var previewImg = $('<img class="media-list-preview" src="' + staticUrl + 'img/modal-progress.gif"/>');
@@ -1401,6 +1401,7 @@ function runMediaDialog(cameraId, mediaType) {
                 };
                 
                 entryDiv[0]._onClick = function () {
+                    var pos = entries.indexOf(entry);
                     runPictureDialog(entries, pos, mediaType);
                 };