From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 13 Dec 2015 17:53:38 +0000 (+0200)
Subject: fixed simple mjpeg cameras
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=7c1fe771ce25b3f1f38682c2bac38497ddfd141e;p=motioneye-debian

fixed simple mjpeg cameras
---

diff --git a/motioneye/config.py b/motioneye/config.py
index bebafd4..9f73da9 100644
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -866,8 +866,6 @@ def motion_camera_ui_to_dict(ui, old_config=None):
     # event start
     on_event_start = ['%(script)s start %%t' % {'script': meyectl.find_command('relayevent')}]
     if ui['email_notifications_enabled']:
-        send_mail_path = os.path.join(settings.PROJECT_PATH, 'sendmail.py')
-        send_mail_path = os.path.abspath(send_mail_path)
         emails = re.sub('\\s', '', ui['email_notifications_addresses'])
         
         on_event_start.append("%(script)s '%(server)s' '%(port)s' '%(account)s' '%(password)s' '%(tls)s' '%(to)s' 'motion_start' '%%t' '%%Y-%%m-%%dT%%H:%%M:%%S' '%(timespan)s'" % {
@@ -1365,6 +1363,10 @@ def simple_mjpeg_camera_dict_to_ui(data):
         
         ui[name[1:]] = value
     
+    # action commands
+    action_commands = get_action_commands(data['@id'])
+    ui['actions'] = action_commands.keys()
+
     return ui
 
 
diff --git a/motioneye/static/css/main.css b/motioneye/static/css/main.css
index 289ba01..22d0453 100644
--- a/motioneye/static/css/main.css
+++ b/motioneye/static/css/main.css
@@ -924,7 +924,8 @@ div.camera-overlay-top {
 
 div.camera-name {
     display: inline-block;
-    font-size: 1.5em;
+    font-size: 1.2em;
+    font-weight: bold;
     white-space: nowrap;
     width: 33.33%;
     overflow: hidden;
diff --git a/motioneye/static/js/main.js b/motioneye/static/js/main.js
index d458392..957a326 100644
--- a/motioneye/static/js/main.js
+++ b/motioneye/static/js/main.js
@@ -4337,7 +4337,7 @@ function checkCameraErrors() {
         }
 
         /* fps timeout */
-        if (this.fpsTimes.length && (now - this.fpsTimes[this.fpsTimes.length - 1]) > 2000) {
+        if (this.fpsTimes && this.fpsTimes.length && (now - this.fpsTimes[this.fpsTimes.length - 1]) > 2000) {
             $(this).parents('div.camera-frame').find('span.camera-info.fps').html('0 fps');
         }
     });