added owl logo & icon

diff --git a/doc/todo.txt b/doc/todo.txt
index 0a2425708e98304029dcc49e6bfafd8919fa8169..1b74edc30d4e72f531d75abfa44e424f361b55e6 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,6 +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
 -> style scroll bars
 -> hint text next to section titles
 -> clickable hints

diff --git a/src/handlers.py b/src/handlers.py
index e41be6a31b932a171b7133f561427f9946adc7e7..7fac412553be37157ecc28a3e0bed47adea33921 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -27,6 +27,7 @@ import mediafiles
 import mjpgclient
 import motionctl
 import remote
+import settings
 import template
 import update
 import v4l2ctl

diff --git a/static/css/main.css b/static/css/main.css
index 96d57dfda7e0d61d32ee470a094409e5c8c22e52..8fbe63f713a7953c39b84e766ffb1d951f5db734 100644 (file)
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -127,8 +127,9 @@ span.logo {
 }
 
 img.logo {
-    width: 48px;
-    height: 48px;
+    width: 36px;
+    height: 36px;
+    padding: 7px 3px;
     vertical-align: middle;
 }
 

diff --git a/static/img/favicon.ico b/static/img/favicon.ico
new file mode 100644 (file)
index 0000000..8122484
Binary files /dev/null and b/static/img/favicon.ico differ

diff --git a/static/img/motioneye-icon.svg b/static/img/motioneye-icon.svg
new file mode 100644 (file)
index 0000000..7e30370
--- /dev/null
+++ b/static/img/motioneye-icon.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   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
+     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
+     id="defs6" /><sodipodi:namedview
+     pagecolor="#969696"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="1"
+     inkscape:cx="16.49923"
+     inkscape:cy="31.367776"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="true"
+     inkscape:guide-bbox="true" /><g
+     id="g10"
+     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"
+       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"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scccssccccccccccccccscsssccssccssccssssssssssccccc" /></g></svg>
\ No newline at end of file

diff --git a/static/img/motioneye-logo.svg b/static/img/motioneye-logo.svg
new file mode 100644 (file)
index 0000000..13e36ea
--- /dev/null
+++ b/static/img/motioneye-logo.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   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
+     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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6" /><sodipodi:namedview
+     pagecolor="#969696"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0.41176471"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="4.8457031"
+     inkscape:cx="-0.86669632"
+     inkscape:cy="22.459614"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="true"
+     inkscape:guide-bbox="true" /><g
+     id="g10"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,0,64)"><path
+       style="opacity:1;fill:#ffffff;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"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scccssccccccccccccccscsssccssccssccssssssssssccccc" /></g></svg>
\ No newline at end of file

diff --git a/static/img/motioneye.svg b/static/img/motioneye.svg
deleted file mode 100644 (file)
index acc09f4..0000000
--- a/static/img/motioneye.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="48"
-   height="48"
-   xml:space="preserve"
-   sodipodi:docname="motioneye.svg"><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 /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><sodipodi:namedview
-     pagecolor="#969696"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0.70196078"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1030"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="16.354248"
-     inkscape:cx="47.677361"
-     inkscape:cy="27.810209"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g10" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="ink_ext_XXXXXX"
-     transform="matrix(1.25,0,0,-1.25,0,48)"><path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#ffffff;stroke-width:9.05973721;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3789"
-       sodipodi:cx="164.74074"
-       sodipodi:cy="96.59259"
-       sodipodi:rx="63.407406"
-       sodipodi:ry="60.444443"
-       d="m 228.14814,96.59259 c 0,33.38254 -28.38846,60.44444 -63.4074,60.44444 -35.01895,0 -63.40741,-27.0619 -63.40741,-60.44444 0,-33.382544 28.38846,-60.444442 63.40741,-60.444442 35.01894,0 63.4074,27.061898 63.4074,60.444442 z"
-       transform="matrix(0.25864487,0,0,-0.27132354,-23.409347,-2.592158)" /><path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8.06000042;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 19.344,27.142 c -2.295613,0 -4.348358,-0.983485 -5.661,-2.502 l -6.363,0 C 5.92392,24.64 4.8,23.51608 4.8,22.12 l 0,-10.8 C 4.8,9.92392 5.92392,8.8 7.32,8.8 l 23.76,0 c 1.39608,0 2.52,1.12392 2.52,2.52 l 0,10.8 c 0,1.39608 -1.12392,2.52 -2.52,2.52 l -0.936,0 0,0.324 a 1.440144,1.440144 0 1 1 -2.88,0 l 0,-0.324 -2.259,0 c -1.308955,1.518515 -3.365386,2.502 -5.661,2.502 z m -1.152,-1.062 2.304,0 c 0.39888,0 0.72,-0.32112 0.72,-0.72 l 0,-0.288 c 0,-0.39888 -0.32112,-0.72 -0.72,-0.72 l -2.304,0 c -0.39888,0 -0.72,0.32112 -0.72,0.72 l 0,0.288 c 0,0.39888 0.32112,0.72 0.72,0.72 z m 1.152,-4.32 c 2.942573,0 5.328,-2.385427 5.328,-5.328 0,-2.942573 -2.385427,-5.328 -5.328,-5.328 -2.942573,0 -5.328,2.385427 -5.328,5.328 0,2.942573 2.385427,5.328 5.328,5.328 z"
-       id="path3803"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file

diff --git a/templates/base.html b/templates/base.html
index 76d7b00de2830dda01a54cb1bd9f05ea012424fd..ddab2afaefdb6b00fc2f718e719f064771ec04f1 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -10,6 +10,7 @@
         {% block style %}
             <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}css/jquery.timepicker.css" />
             <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}css/base.css" />
+            <link rel="shortcut icon" href="/static/img/favicon.ico" />
         {% endblock %}
         {% block script %}
             <script type="text/javascript" src="{{STATIC_URL}}js/css-browser-selector.js"></script>

diff --git a/templates/main.html b/templates/main.html
index 13dad7489b57773d9a50f7d1155af999a42cbb60..481b95c8c0ca1af74116201a2880d9f8c6d463b9 100644 (file)
--- a/templates/main.html
+++ b/templates/main.html
@@ -26,7 +26,7 @@
             <div class="logo">
                 <a href="/">
                     <span class="logo">motionEye</span>
-                    <img class="logo" src="{{STATIC_URL}}img/motioneye.svg">
+                    <img class="logo" src="{{STATIC_URL}}img/motioneye-logo.svg">
                 </a>
             </div>
         </div>