structure cleanups

diff --git a/artwork/validation-error.svg b/artwork/validation-error.svg
index c140f3b5223df0754e80e7e6e59b3d8c582fd834..6c4d5da151de68109240a86008621979d585f0cb 100644 (file)
--- a/artwork/validation-error.svg
+++ b/artwork/validation-error.svg
@@ -27,9 +27,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="12.498395"
-     inkscape:cy="8.3540951"
+     inkscape:zoom="11.390625"
+     inkscape:cx="-0.48299409"
+     inkscape:cy="28.256052"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -71,7 +71,7 @@
      id="layer1"
      transform="translate(0,-1032.3622)">
     <path
-       style="fill:#aa1900;fill-opacity:1;stroke:none"
+       style="fill:#c11c00;fill-opacity:1;stroke:none"
        d="M 7 3 C 3.1340068 3 0 6.1340067 0 10 C -5.9211895e-16 13.865993 3.1340068 17 7 17 C 10.865993 17 14 13.865993 14 10 C 14 6.1340067 10.865993 3 7 3 z M 6 5.25 L 8.125 5.25 L 8.125 8.625 L 7.8125 11.0625 L 6.3125 11.0625 L 6 8.625 L 6 5.25 z M 6 11.90625 L 8.125 11.90625 L 8.125 14 L 6 14 L 6 11.90625 z "
        transform="translate(0,1032.3622)"
        id="path3751" />

diff --git a/doc/requirements.txt b/doc/requirements.txt
index a146d4fb451b7b396f22a945b7afccd67aacaad2..12bb981bf1f84fb93210a8901d1874272d77c7d0 100644 (file)
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -6,3 +6,4 @@ ffmpeg
 motion
 nginx
 v4l-utils
+smbclient

diff --git a/src/handlers.py b/src/handlers.py
index 889687f46fca3c8e7cbb8120df8fff2b7ec631d8..cd84cbfe1cec6afcbfc02157d3a5dfb38e066505 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -12,6 +12,6 @@ class BaseHandler(RequestHandler):
         self.finish(content)
 
 
-class HomeHandler(BaseHandler):
+class MainHandler(BaseHandler):
     def get(self):
-        self.render('home.html')
+        self.render('main.html')

diff --git a/src/server.py b/src/server.py
index 4a99e11f7d7c83ff099c1d0f61d04a9cacaed7ee..6c5507c748803df15ef82695191e02b51adcacff 100644 (file)
--- a/src/server.py
+++ b/src/server.py
@@ -8,7 +8,7 @@ import template
 
 application = Application(
     [
-        (r'^/$', handlers.HomeHandler),
+        (r'^/$', handlers.MainHandler),
     ],
     debug=settings.DEBUG,
     static_path=settings.STATIC_PATH,

diff --git a/static/css/home.css b/static/css/home.css
deleted file mode 100644 (file)
index 36d7284..0000000
--- a/static/css/home.css
+++ /dev/null
@@ -1,45 +0,0 @@
-
-div.video-list {
-    text-align: center;
-}
-
-div.video-frame {
-    width: 48%;
-    text-align: left;
-    background-color: #313131;
-    display: inline-block;
-    padding: 0px 5px;
-    border-radius: 3px;
-    transition: all 0.2s;
-    margin-bottom: 10px;
-}
-
-div.video-frame:HOVER {
-    background-color: #414141;
-}
-
-div.video-top-bar,
-div.video-bottom-bar {
-    padding: 3px;
-    font-size: 0.75em;
-}
-
-div.video-container {
-    padding: 0px;
-}
-
-img.video {
-    width: 100%;
-    display: block;
-}
-
-
-    /* media queries */
-
-@media all and (max-width: 1600px) {
-    /* smaller screens */
-    
-    div.video-frame {
-        width: 98%;
-    }
-}

diff --git a/static/css/main.css b/static/css/main.css
new file mode 100644 (file)
index 0000000..36d7284
--- /dev/null
+++ b/static/css/main.css
@@ -0,0 +1,45 @@
+
+div.video-list {
+    text-align: center;
+}
+
+div.video-frame {
+    width: 48%;
+    text-align: left;
+    background-color: #313131;
+    display: inline-block;
+    padding: 0px 5px;
+    border-radius: 3px;
+    transition: all 0.2s;
+    margin-bottom: 10px;
+}
+
+div.video-frame:HOVER {
+    background-color: #414141;
+}
+
+div.video-top-bar,
+div.video-bottom-bar {
+    padding: 3px;
+    font-size: 0.75em;
+}
+
+div.video-container {
+    padding: 0px;
+}
+
+img.video {
+    width: 100%;
+    display: block;
+}
+
+
+    /* media queries */
+
+@media all and (max-width: 1600px) {
+    /* smaller screens */
+    
+    div.video-frame {
+        width: 98%;
+    }
+}

diff --git a/static/img/validation-error.png b/static/img/validation-error.png
index b67d5768b37cfcb8eb97cae4056105f791b4fa1f..57e02c39fa4bff7763e619f4951c9f64dbf8812d 100644 (file)
Binary files a/static/img/validation-error.png and b/static/img/validation-error.png differ

diff --git a/static/js/base-site.js b/static/js/base-site.js
new file mode 100644 (file)
index 0000000..ba57deb
--- /dev/null
+++ b/static/js/base-site.js
@@ -0,0 +1,56 @@
+
+function initUI() {
+    $('input[type=checkbox].styled').each(function () {
+        makeCheckBox($(this));
+    });
+
+    makeSlider($('#brightnessSlider'), 0, 100, 0, null, 5, 0, '%');
+    makeSlider($('#contrastSlider'), 0, 100, 0, null, 5, 0, '%');
+    makeSlider($('#saturationSlider'), 0, 100, 0, null, 5, 0, '%');
+    makeSlider($('#hueSlider'), 0, 100, 0, null, 5, 0, '%');
+    makeSlider($('#framerateSlider'), 1, 30, 0, [
+        {value: 1, label: '1'},
+        {value: 5, label: '5'},
+        {value: 10, label: '10'},
+        {value: 15, label: '15'},
+        {value: 20, label: '20'},
+        {value: 25, label: '25'},
+        {value: 30, label: '30'}
+    ], null, 0);
+    makeSlider($('#streamingFramerateSlider'), 1, 30, 0, [
+        {value: 1, label: '1'},
+        {value: 5, label: '5'},
+        {value: 10, label: '10'},
+        {value: 15, label: '15'},
+        {value: 20, label: '20'},
+        {value: 25, label: '25'},
+        {value: 30, label: '30'}
+    ], null, 0);
+    makeSlider($('#streamingQualitySlider'), 0, 100, 0, null, 5, 0, '%');
+    makeSlider($('#imageQualitySlider'), 0, 100, 0, null, 5, 0, '%');
+    makeSlider($('#movieQualitySlider'), 0, 100, 0, null, 5, 0, '%');
+    makeSlider($('#frameChangeThresholdSlider'), 0, 10000, 0, null, 3, 0, 'px');
+    makeSlider($('#noiseLevelSlider'), 0, 100, 0, null, 5, 0, '%');
+    
+    makeNumberValidator($('#snapshotIntervalEntry'), 1, 86400, false, false);
+    makeNumberValidator($('#gapEntry'), 1, 86400, false, false);
+    makeNumberValidator($('#preCaptureEntry'), 0, 100, false, false);
+    makeNumberValidator($('#postCaptureEntry'), 0, 100, false, false);
+}
+
+$(document).ready(function () {
+    $('img.settings-button').click(function () {
+        if ($('div.settings').hasClass('open')) {
+            $('div.settings').removeClass('open');
+            $('div.page-container').removeClass('stretched');
+            $('div.settings-top-bar').removeClass('open');
+        }
+        else {
+            $('div.settings').addClass('open');
+            $('div.page-container').addClass('stretched');
+            $('div.settings-top-bar').addClass('open');
+        }
+    });
+    
+    initUI();
+});

diff --git a/static/js/base.js b/static/js/base.js
index 46a272a6bcb527c2593b178e359d6f009c4890dc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -1,56 +0,0 @@
-
-function initUI() {
-    $('input[type=checkbox].styled').each(function () {
-        makeCheckBox($(this));
-    });
-
-    makeSlider($('#brightnessSlider'), 0, 100, 0, null, 5, 0, '%');
-    makeSlider($('#contrastSlider'), 0, 100, 0, null, 5, 0, '%');
-    makeSlider($('#saturationSlider'), 0, 100, 0, null, 5, 0, '%');
-    makeSlider($('#hueSlider'), 0, 100, 0, null, 5, 0, '%');
-    makeSlider($('#framerateSlider'), 1, 30, 0, [
-        {value: 1, label: '1'},
-        {value: 5, label: '5'},
-        {value: 10, label: '10'},
-        {value: 15, label: '15'},
-        {value: 20, label: '20'},
-        {value: 25, label: '25'},
-        {value: 30, label: '30'}
-    ], null, 0);
-    makeSlider($('#streamingFramerateSlider'), 1, 30, 0, [
-        {value: 1, label: '1'},
-        {value: 5, label: '5'},
-        {value: 10, label: '10'},
-        {value: 15, label: '15'},
-        {value: 20, label: '20'},
-        {value: 25, label: '25'},
-        {value: 30, label: '30'}
-    ], null, 0);
-    makeSlider($('#streamingQualitySlider'), 0, 100, 0, null, 5, 0, '%');
-    makeSlider($('#imageQualitySlider'), 0, 100, 0, null, 5, 0, '%');
-    makeSlider($('#movieQualitySlider'), 0, 100, 0, null, 5, 0, '%');
-    makeSlider($('#frameChangeThresholdSlider'), 0, 10000, 0, null, 3, 0, 'px');
-    makeSlider($('#noiseLevelSlider'), 0, 100, 0, null, 5, 0, '%');
-    
-    makeNumberValidator($('#snapshotIntervalEntry'), 1, 86400, false, false);
-    makeNumberValidator($('#gapEntry'), 1, 86400, false, false);
-    makeNumberValidator($('#preCaptureEntry'), 0, 100, false, false);
-    makeNumberValidator($('#postCaptureEntry'), 0, 100, false, false);
-}
-
-function handleDocumentReady() {
-    $('img.settings-button').click(function () {
-        if ($('div.settings').hasClass('open')) {
-            $('div.settings').removeClass('open');
-            $('div.page-container').removeClass('stretched');
-            $('div.settings-top-bar').removeClass('open');
-        }
-        else {
-            $('div.settings').addClass('open');
-            $('div.page-container').addClass('stretched');
-            $('div.settings-top-bar').addClass('open');
-        }
-    });
-    
-    initUI();
-}

diff --git a/templates/base-site.html b/templates/base-site.html
index baddc6b1abf9927aa2b544a9fe8a1964aa0fb463..a65d764ab8fc32639facbec1941e3678097c527b 100644 (file)
--- a/templates/base-site.html
+++ b/templates/base-site.html
@@ -10,6 +10,7 @@
     {{super()}}
     <script type="text/javascript" src="{{STATIC_URL}}js/css-browser-selector.js"></script>
     <script type="text/javascript" src="{{STATIC_URL}}js/ui.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}js/base-site.js"></script>
 {% endblock %}
 
 {% block body %}

diff --git a/templates/base.html b/templates/base.html
index 7b55bf013a081d6e07b4887ee318261410661525..9cf8dfa208fa628073a3a95008b75fce7afff0f5 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -15,7 +15,6 @@
             <script type="text/javascript" src="{{STATIC_URL}}js/base.js"></script>
             <script type="text/javascript">
                 var staticUrl = '{{STATIC_URL}}';
-                $(document).ready(handleDocumentReady);
             </script>
         {% endblock %}
     </head>

diff --git a/templates/home.html b/templates/home.html
deleted file mode 100644 (file)
index ee88861..0000000
--- a/templates/home.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "base-site.html" %}
-{% import "macros.html" as macros %}
-
-{% block style %}
-    {{super()}}
-    <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}css/home.css" />
-{% endblock %}
-
-{% block page_content %}
-    <div class="video-list">
-        {{macros.video("/static/img/video1.jpg")}}
-        {{macros.video("/static/img/video2.jpg")}}
-        {{macros.video("/static/img/video1.jpg")}}
-        {{macros.video("/static/img/video2.jpg")}}
-    </div>
-{% endblock %}

diff --git a/templates/main.html b/templates/main.html
new file mode 100644 (file)
index 0000000..fd8a865
--- /dev/null
+++ b/templates/main.html
@@ -0,0 +1,16 @@
+{% extends "base-site.html" %}
+{% import "macros.html" as macros %}
+
+{% block style %}
+    {{super()}}
+    <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}css/main.css" />
+{% endblock %}
+
+{% block page_content %}
+    <div class="video-list">
+        {{macros.video("/static/img/video1.jpg")}}
+        {{macros.video("/static/img/video2.jpg")}}
+        {{macros.video("/static/img/video1.jpg")}}
+        {{macros.video("/static/img/video2.jpg")}}
+    </div>
+{% endblock %}