diff --git a/definitions/en_CA.js b/definitions/en_CA.js index 4a7934cf..f44610c6 100644 --- a/definitions/en_CA.js +++ b/definitions/en_CA.js @@ -2673,16 +2673,16 @@ module.exports = function(s,config,lang){ // }, { "name": "detail=detector_sensitivity", - "field": lang.Indifference, - "description": "This can mean multiple things depending on the detector used. Built-In Motion Detection defines this as \"Percentage Changed in View or Region\"", + "field": lang['Minimum Change'], + "description": "The motion confidence rating must exceed this value to be seen as a trigger. This number correlates directly to the confidence rating returned by the motion detector. This option was previously named \"Indifference\".", "default": "10", "example": "10", "possible": "" }, { "name": "detail=detector_max_sensitivity", - "field": lang["Max Indifference"], - "description": "An upperbound to indifference. Any value over this amount will be ignored.", + "field": lang["Maximum Change"], + "description": "The motion confidence rating must be lower than this value to be seen as a trigger. Leave blank for no maximum. This option was previously named \"Max Indifference\".", "default": "", "example": "75", "possible": "" @@ -2706,7 +2706,7 @@ module.exports = function(s,config,lang){ { "name": "detail=detector_frame", "field": lang["Full Frame Detection"], - "description": "This will read the entire frame for pixel differences.", + "description": "This will read the entire frame for pixel differences. This is the same as creating a region that covers the entire screen.", "default": "1", "example": "", "fieldType": "select", diff --git a/languages/en_CA.json b/languages/en_CA.json index 1b5f6ffa..73b02b16 100644 --- a/languages/en_CA.json +++ b/languages/en_CA.json @@ -254,6 +254,8 @@ "Live Stream Toggle": "Live Stream Toggle", "RegionNote": "Points are only saved when you press Save on the Monitor Settings window.", "Points": "Points When adding points click on the edge of the polygon.", + "Minimum Change": "Minimum Change", + "Maximum Change": "Maximum Change", "Indifference": "Indifference", "Max Indifference": "Max Indifference", "Trigger Threshold": "Trigger Threshold", diff --git a/libs/monitor.js b/libs/monitor.js index de281ce3..05ec6283 100644 --- a/libs/monitor.js +++ b/libs/monitor.js @@ -1877,14 +1877,22 @@ module.exports = function(s,config,lang){ //start drawing files delete(activeMonitor.childNode) //validate port - if( - e.type !== 'socket' && - e.type !== 'dashcam' && - e.protocol !== 'udp' && - e.type !== 'local' && - e.details.skip_ping !== '1' - ){ - e.port = e.port ? e.port : e.protocol === 'https' ? '443' : '80' + if(!e.port){ + switch(e.protocol){ + case'http': + e.port = '80' + break; + case'rtmps': + case'https': + e.port = '443' + break; + case'rtmp': + e.port = '1935' + break; + case'rtsp': + e.port = '554' + break; + } } launchMonitorProcesses(e) break; diff --git a/web/libs/css/dash2.basic.css b/web/libs/css/dash2.basic.css index 55ac997f..7b8d2891 100644 --- a/web/libs/css/dash2.basic.css +++ b/web/libs/css/dash2.basic.css @@ -156,7 +156,35 @@ img{max-width:100%} .follow-list ul{padding:0;margin:0;font-family:"Roboto","Helvetica","Arial",sans-serif;} -.follow-list ul a:not(.btn){color:#fff} +.follow-list ul a:not(.btn){ + color:#fff; + font-weight: 300; +} +/* .follow-list .affix, +.follow-list .affix-top + { + width: 100%; +} */ +.follow-list .dot {margin-right: 15px;} +.dot { + width:10px; + height:10px; + display:inline-block; + border-radius: 50%; +} + +.dot-red {background:#d9534f} +.dot-purple {background:#3f51b5} +.dot-blue {background:#375182} +.dot-navy {background:#0858ab} +.dot-green {background:#449d44} +.dot-forestgreen {background:#1e4046} +.dot-orange {background:#c49a68} +.dot-grey {background:#777} + + + + .os_bars{width:600px;display:inline-block;padding:5px 0 0 10px} @media screen and (max-width: 600px){ .os_bars{width:200px;} diff --git a/web/libs/css/dash2.forms.css b/web/libs/css/dash2.forms.css index 40e7af8c..5f01fc49 100644 --- a/web/libs/css/dash2.forms.css +++ b/web/libs/css/dash2.forms.css @@ -44,8 +44,8 @@ form.modal-body{margin:0} .form-group-group.purple > h4{background:#3f51b5;color:#fff} .form-group-group.blue{border-color:#375182} .form-group-group.blue > h4{background:#375182;color:#fff} -.form-group-group.navy{border-color:#31708f} -.form-group-group.navy > h4{background:#31708f;color:#fff} +.form-group-group.navy{border-color:#0858ab} +.form-group-group.navy > h4{background:#0858ab;color:#fff} .form-group-group.green{border-color:#449d44} .form-group-group.green > h4{background:#449d44;color:#fff} .form-group-group.forestgreen{border-color:#1e4046} diff --git a/web/libs/js/dash2.monitoredit.js b/web/libs/js/dash2.monitoredit.js index 4cd5e2b5..157c71bb 100644 --- a/web/libs/js/dash2.monitoredit.js +++ b/web/libs/js/dash2.monitoredit.js @@ -367,7 +367,10 @@ var getMonitorEditFormFields = function(){ return response } var addSection = function(section){ - sections[section.name] = section.id + sections[section.name] = { + id: section.id, + color: section.color + } if(section.info){ $.each(section.info,function(m,block){ if(block.isFormGroupGroup === true){ @@ -389,10 +392,11 @@ $.each($.ccio.definitions['Monitor Settings'].blocks,function(n,section){ var drawList = function(){ var list = monitorEditorWindow.find('.follow-list ul') var html = '' - $.each(sections,function(sectionName,sectionId){ + $.each(sections,function(sectionName,section){ + var sectionId = section.id var el = $('#' + sectionId + ':visible') if(el.length > 0){ - html += '
  • ' + sectionName + '
    • ' + html += `
  • ${sectionName}
    • ` } }) list.html(html) diff --git a/web/libs/js/dash2.usersettings.js b/web/libs/js/dash2.usersettings.js index 417399a2..df479a8c 100644 --- a/web/libs/js/dash2.usersettings.js +++ b/web/libs/js/dash2.usersettings.js @@ -15,7 +15,10 @@ var addSection = function(section){ var userSettingsId = section.name.replace(/[^a-zA-Z ]/g, '').replace(/[^a-zA-Z ]/g, '').replace(/ /g, '') section.id = userSettingsId } - $.sM.sections[section.name] = section.id + $.sM.sections[section.name] = { + id: section.id, + color: section.color + } if(section.info){ $.each(section.info,function(m,block){ if(block.isFormGroupGroup === true){ @@ -35,10 +38,11 @@ $.each($.ccio.definitions['Account Settings'].blocks,function(n,section){ $.sM.drawList = function(){ var list = $.sM.e.find('.follow-list ul') var html = '' - $.each($.sM.sections,function(sectionName,sectionId){ + $.each($.sM.sections,function(sectionName,section){ + var sectionId = section.id var el = $('#' + sectionId) if(el.length > 0){ - html += '
  • ' + sectionName + '
    • ' + html += `
  • ${sectionName}
    • ` } }) list.html(html) diff --git a/web/pages/blocks/monitoredit.ejs b/web/pages/blocks/monitoredit.ejs index ae71dd8a..2b294280 100644 --- a/web/pages/blocks/monitoredit.ejs +++ b/web/pages/blocks/monitoredit.ejs @@ -244,7 +244,7 @@
    - +