diff --git a/definitions/en_CA.js b/definitions/en_CA.js index bc9e4f49..b3a8da58 100644 --- a/definitions/en_CA.js +++ b/definitions/en_CA.js @@ -1413,7 +1413,7 @@ module.exports = function(s,config,lang){ ] }, { - "name": "crf", + "name": "detail=crf", "field": lang.Quality, "description": "Low number means higher quality. Higher number means less quality.", "default": "15", @@ -3058,7 +3058,7 @@ module.exports = function(s,config,lang){ "example": "", "selector": "h_cs", "fieldType": "select", - "form-group-class": "h_control_call_input h_control_call_GET h_control_call_PUT h_control_call_POST", + "form-group-class": "h_control_call_input h_control_call_GET h_control_call_ONVIF h_control_call_PUT h_control_call_POST", "possible": [ { "name": "No", diff --git a/languages/en_CA.json b/languages/en_CA.json index 53b9dc90..d4824bd9 100644 --- a/languages/en_CA.json +++ b/languages/en_CA.json @@ -409,7 +409,7 @@ "opencvCascadesText": "If you see nothing here then just download this package of cascades. Drop them into plugins/opencv/cascades then press refresh .", "noSpecialCharacters": "No spaces or special characters.", "NotesPlacholder": "Comments you want to leave for this cameras settings.", - "InputText1": "This section tells Shinobi how to consume a stream. For optimal performance try tuning your camera's internal settings. Find the following options and set them as shown. To find your camera you can use the built in ONVIF Scanner of Shinobi. Some ONVIF cameras require the use of a management tool to modify their internal settings. If you can't find your cameras you can try ONVIF Device Manager for Windows.", + "InputText1": "This section tells Shinobi how to consume a stream. For optimal performance try tuning your camera's internal settings. Find the following options and set them as shown. To find your camera you can use the built in ONVIF Scanner of Shinobi. Some ONVIF cameras require the use of a management tool to modify their internal settings. If you can't find your cameras you can try ONVIF Device Manager for Windows.", "InputText2": "", "InputText3": "If you need help figuring out what input type your camera is you can take a look in the Camera URLs List on the Shinobi website.", "StreamText": "

This section will designate the primary method of streaming out and its settings. This stream will be displayed in the dashboard. If you choose to use HLS, JPEG, or MJPEG then you can consume the stream through other programs.

Using JPEG stream essentially turns off the primary stream and uses the snapshot bin to get frames.

", diff --git a/libs/monitor.js b/libs/monitor.js index f9bb21e8..a04c8e04 100644 --- a/libs/monitor.js +++ b/libs/monitor.js @@ -520,11 +520,11 @@ module.exports = function(s,config,lang){ stopCamera() }else{ var requestOptions = { - url : controlURL, - method : controlURLOptions.method, - auth : { - user : controlURLOptions.username, - pass : controlURLOptions.password + url: controlURL, + method: controlURLOptions.method, + auth: { + user: controlURLOptions.username, + pass: controlURLOptions.password } } if(monitorConfig.details.control_digest_auth === '1'){ diff --git a/web/pages/blocks/subpermissions.ejs b/web/pages/blocks/subpermissions.ejs index 8faece0e..60aeb77f 100644 --- a/web/pages/blocks/subpermissions.ejs +++ b/web/pages/blocks/subpermissions.ejs @@ -15,32 +15,40 @@
+
+
+
@@ -57,8 +65,8 @@
@@ -76,8 +84,8 @@
@@ -95,8 +103,8 @@
@@ -114,8 +122,8 @@
@@ -129,4 +137,4 @@ - \ No newline at end of file +