From 742bb02f999fd1e73eb70488d5c9318fe25caac8 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Mon, 18 Nov 2013 11:55:52 +0200 Subject: [PATCH] added owl logo & icon --- doc/todo.txt | 3 ++ src/handlers.py | 1 + static/css/main.css | 5 +-- static/img/favicon.ico | Bin 0 -> 90022 bytes static/img/motioneye-icon.svg | 56 ++++++++++++++++++++++++++++++++ static/img/motioneye-logo.svg | 56 ++++++++++++++++++++++++++++++++ static/img/motioneye.svg | 58 ---------------------------------- templates/base.html | 1 + templates/main.html | 2 +- 9 files changed, 121 insertions(+), 61 deletions(-) create mode 100644 static/img/favicon.ico create mode 100644 static/img/motioneye-icon.svg create mode 100644 static/img/motioneye-logo.svg delete mode 100644 static/img/motioneye.svg diff --git a/doc/todo.txt b/doc/todo.txt index 0a24257..1b74edc 100644 --- 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 e41be6a..7fac412 100644 --- 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 96d57df..8fbe63f 100644 --- 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 index 0000000000000000000000000000000000000000..81224841d87613c10dd07ac6913e736adb39498a GIT binary patch literal 90022 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

n>|~;yCNPZ!>%}A9di%9e~DTS=UqE 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 a>1FZ#Tg@-7!S{tUR<*ggXg~Ag@Baa~dtw0q literal 0 HcmV?d00001 diff --git a/static/img/motioneye-icon.svg b/static/img/motioneye-icon.svg new file mode 100644 index 0000000..7e30370 --- /dev/null +++ b/static/img/motioneye-icon.svg @@ -0,0 +1,56 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/static/img/motioneye-logo.svg b/static/img/motioneye-logo.svg new file mode 100644 index 0000000..13e36ea --- /dev/null +++ b/static/img/motioneye-logo.svg @@ -0,0 +1,56 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/static/img/motioneye.svg b/static/img/motioneye.svg deleted file mode 100644 index acc09f4..0000000 --- a/static/img/motioneye.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 76d7b00..ddab2af 100644 --- a/templates/base.html +++ b/templates/base.html @@ -10,6 +10,7 @@ {% block style %} + {% endblock %} {% block script %} diff --git a/templates/main.html b/templates/main.html index 13dad74..481b95c 100644 --- a/templates/main.html +++ b/templates/main.html @@ -26,7 +26,7 @@

-- 2.39.5