From e0edef691b83803efb1a70dfdd52056ed5ceea97 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Sat, 4 Dec 2021 11:22:10 -0800
Subject: [PATCH] minor UI cleanup

---
 definitions/en_CA.js                         | 11 +++++----
 web/assets/js/bs5.monitorSettings.js         | 24 ++++++++++++--------
 web/pages/blocks/home/onvifDeviceManager.ejs |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/definitions/en_CA.js b/definitions/en_CA.js
index 670233e9..13c5a5d1 100644
--- a/definitions/en_CA.js
+++ b/definitions/en_CA.js
@@ -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"
                            }
                         ]
diff --git a/web/assets/js/bs5.monitorSettings.js b/web/assets/js/bs5.monitorSettings.js
index 255292ee..21c76581 100644
--- a/web/assets/js/bs5.monitorSettings.js
+++ b/web/assets/js/bs5.monitorSettings.js
@@ -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 = []
diff --git a/web/pages/blocks/home/onvifDeviceManager.ejs b/web/pages/blocks/home/onvifDeviceManager.ejs
index d68be1ff..caa384c0 100644
--- a/web/pages/blocks/home/onvifDeviceManager.ejs
+++ b/web/pages/blocks/home/onvifDeviceManager.ejs
@@ -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