ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor UI cleanup

montage-api
Moe 2021-12-04 11:22:10 -08:00
parent c9940e6bf6
commit e0edef691b
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
definitions/en_CA.js
View File

@ -120,6 +120,7 @@ module.exports = function(s,config,lang){
{
"fieldType": 'div',
"id": "monitorPresetsSelection",
"style": "max-height:400px;overflow:auto;",
"class": "mdl-list"
},
{
@ -497,23 +498,23 @@ module.exports = function(s,config,lang){
"form-group-class": "input-mapping",
"possible": [
{
"name": lang['All streams in first feed'] + '(0, ' + lang.Default + ')',
"name": lang['All streams in first feed'] + ' (0, ' + lang.Default + ')',
"value": "0"
},
{
"name": lang['First stream in feed'] + '(0:0)',
"name": lang['First stream in feed'] + ' (0:0)',
"value": "0:0"
},
{
"name": lang['Second stream in feed'] + "(0:1)",
"name": lang['Second stream in feed'] + " (0:1)",
"value": "0:1"
},
{
"name": lang['Video streams only'] + "(0:v)",
"name": lang['Video streams only'] + " (0:v)",
"value": "0:v"
},
{
"name": lang['Video stream only from first feed'] + "(0:v:0)",
"name": lang['Video stream only from first feed'] + " (0:v:0)",
"value": "0:v:0"
}
]

24
web/assets/js/bs5.monitorSettings.js
View File

@ -435,20 +435,24 @@ function drawStreamChannelHtml(options){
monitorStreamChannels.find('.stream-channel').last().find('[channel-detail="stream_vcodec"]').change()
return tempID;
}
function replaceMap(string,mapNumber){
var newString = string.split(':')
newString[0] = `${mapNumber}`
return newString.join(':')
}
function replaceMapInName(string,mapNumber){
var newString = string.split('(')
newString[1] = replaceMap(newString[1],mapNumber)
var lastIndex = newString.length - 1
if(!newString[lastIndex].endsWith(')')){
newString[lastIndex] = newString + ')'
}
return newString.join('(')
}
function buildMapSelectorOptionsBasedOnAddedMaps(){
var baseOptionSet = definitions['Monitor Settings'].blocks.Input.info.find((item) => {return item.name === 'detail=primary_input'}).possible
var newOptGroup = [baseOptionSet]
var addedInputMaps = monitorEditorWindow.find('.input-map')
function replaceMap(string,mapNumber){
var newString = string.split(':')
newString[0] = `${mapNumber}`
return newString.join(':')
}
function replaceMapInName(string,mapNumber){
var newString = string.split('(')
newString[1] = replaceMap(newString[1],mapNumber)
return newString.join('(')
}
$.each(addedInputMaps,function(n){
var mapNumber = n + 1
var newOptionSet = []

2
web/pages/blocks/home/onvifDeviceManager.ejs
View File

@ -1,4 +1,4 @@
<main class="page-tab pt-3" id="tab-onvifDeviceManager">
<main class="container page-tab pt-3" id="tab-onvifDeviceManager">
<form class="dark row">
<%
var drawBlock