From 2cab5c30633541be686e9f23bd2d5be2c8b451a9 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Tue, 23 Nov 2021 15:32:35 -0800
Subject: [PATCH] re-arrange power video

---
 definitions/en_CA.js              | 106 ++++++++++++++----------------
 web/assets/css/bs5.powerVideo.css |   4 ++
 2 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/definitions/en_CA.js b/definitions/en_CA.js
index f695b47a..5393c5cc 100644
--- a/definitions/en_CA.js
+++ b/definitions/en_CA.js
@@ -7710,61 +7710,6 @@ module.exports = function(s,config,lang){
       "Power Viewer": {
            "section": lang["Power Viewer"],
            "blocks": {
-              "Search Settings": {
-                  id: "powerVideoTabs",
-                 "color": "blue",
-                 noHeader: true,
-                 noDefaultSectionClasses: true,
-                 attribute: `tab-chooser-parent`,
-                 "section-pre-class": "col-md-4",
-                 "info": [
-                     {
-                         "color": "blue",
-                         noHeader: true,
-                         isSection: true,
-                         isFormGroupGroup: true,
-                         "info": [
-                             {
-                                 "field": lang['Monitors'],
-                                 "id": "powerVideoMonitorsList",
-                                 "form-group-attribute": 'tab-section=monitors',
-                                 "attribute": "multiple",
-                                 "fieldType": "select",
-                             },
-                             {
-                                "id": "powerVideoDateRange",
-                                "field": lang['Date Range'],
-                             },
-                             {
-                                "id": "powerVideoVideoLimit",
-                                "field": lang['Video Limit'] + ` (${lang['Per Monitor']})`,
-                                "placeholder": "0",
-                             },
-                             {
-                                "id": "powerVideoEventLimit",
-                                "field": lang['Event Limit'] + ` (${lang['Per Monitor']})`,
-                                "placeholder": "500",
-                             },
-                             {
-                                 id:'powerVideoSet',
-                                 field: lang['Video Set'],
-                                 default:'h264',
-                                 "fieldType": "select",
-                                 possible:[
-                                   {
-                                       "name": lang.Local,
-                                      "value": "local"
-                                   },
-                                   {
-                                      "name": lang.Cloud,
-                                      "value": "cloud"
-                                   },
-                                ]
-                             },
-                         ]
-                     },
-                 ]
-            },
             "Video Playback": {
                 id: "powerVideoVideoPlayback",
                 noHeader: true,
@@ -7856,13 +7801,60 @@ module.exports = function(s,config,lang){
                            },
                        ]
                    },
+                   {
+                       id: "powerVideoTabs",
+                       attribute: `tab-chooser-parent`,
+                       "color": "blue",
+                       noHeader: true,
+                       isSection: true,
+                       isFormGroupGroup: true,
+                       "info": [
+                           {
+                               "field": lang['Monitors'],
+                               "id": "powerVideoMonitorsList",
+                               "form-group-attribute": 'tab-section=monitors',
+                               "attribute": "multiple",
+                               "fieldType": "select",
+                           },
+                           {
+                              "id": "powerVideoDateRange",
+                              "field": lang['Date Range'],
+                           },
+                           {
+                              "id": "powerVideoVideoLimit",
+                              "field": lang['Video Limit'] + ` (${lang['Per Monitor']})`,
+                              "placeholder": "0",
+                           },
+                           {
+                              "id": "powerVideoEventLimit",
+                              "field": lang['Event Limit'] + ` (${lang['Per Monitor']})`,
+                              "placeholder": "500",
+                           },
+                           {
+                               id:'powerVideoSet',
+                               field: lang['Video Set'],
+                               default:'h264',
+                               "fieldType": "select",
+                               possible:[
+                                 {
+                                     "name": lang.Local,
+                                    "value": "local"
+                                 },
+                                 {
+                                    "name": lang.Cloud,
+                                    "value": "cloud"
+                                 },
+                              ]
+                           },
+                       ]
+                   },
                ]
            },
            "Time Strip": {
                id: "powerVideoTimelineStripsContainer",
                noHeader: true,
               "color": "bg-gradient-blue text-white",
-              "section-pre-class": "col-md-12 mt-3",
+              "section-pre-class": "col-md-4",
               "info": [
                   {
                      "id": "powerVideoTimelineStrips",
@@ -7870,7 +7862,7 @@ module.exports = function(s,config,lang){
                      "divContent": `<div class="loading"><i class="fa fa-hand-pointer-o"></i><div class="epic-text">${lang['Select a Monitor']}</div></div>`,
                   },
               ]
-          }
+          },
          }
       },
       "Calendar": {
diff --git a/web/assets/css/bs5.powerVideo.css b/web/assets/css/bs5.powerVideo.css
index 7572f261..42f23544 100644
--- a/web/assets/css/bs5.powerVideo.css
+++ b/web/assets/css/bs5.powerVideo.css
@@ -179,3 +179,7 @@
 #powerVideo .vis-item.vis-box {
     border-radius: 5px;
 }
+
+#powerVideo .vis-labelset .vis-label {
+        color: #fff;
+}