From: Calin Crisan <ccrisan@gmail.com>
Date: Mon, 26 Jan 2015 19:22:45 +0000 (+0200)
Subject: admin username entry is now readonly
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=45498994a15e2d1eda246328e3e89aeebaf5e930;p=motioneye-debian

admin username entry is now readonly
---

diff --git a/static/js/main.js b/static/js/main.js
index a4f28e0..5ecfe6f 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -162,7 +162,7 @@ function addAuthParams(method, url, body) {
         url += '?';
     }
     else {
-        url += '&';;
+        url += '&';
     }
     
     url += '_username=' + window.username;
@@ -3118,7 +3118,7 @@ function refreshCameraFrames() {
     
     cameraFrames.each(function () {
         /* limit the refresh rate to 20 fps */
-        var count = Math.max(1, 1 / this.config['streaming_framerate'] * 1000 / refreshInterval);
+        var count = Math.max(0, 1 / this.config['streaming_framerate'] * 1000 / refreshInterval);
         var serverSideResize = this.config['streaming_server_resize'];
         var img = $(this).find('img.camera')[0];
         
@@ -3132,7 +3132,7 @@ function refreshCameraFrames() {
         }
         else {
             var cameraId = this.id.substring(6);
-            refreshCameraFrame(cameraId, img, serverSideResize); /* count <= 2 means at least 5 fps */
+            refreshCameraFrame(cameraId, img, serverSideResize);
             
             this.refreshDivider = 0;
         }
diff --git a/templates/main.html b/templates/main.html
index 51bbd6a..3a24ecb 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -60,7 +60,7 @@
                     </tr>
                     <tr class="settings-item">
                         <td class="settings-item-label"><span class="settings-item-label">Administrator Username</span></td>
-                        <td class="settings-item-value"><input type="text" class="styled general" id="adminUsernameEntry"></td>
+                        <td class="settings-item-value"><input type="text" class="styled general" id="adminUsernameEntry" readonly="readonly"></td>
                         <td><span class="help-mark" title="the username supplied to configure motionEye">?</span></td>
                     </tr>
                     <tr class="settings-item">