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

fix power video positioning

p2p-v2
Moe 2022-02-12 22:09:28 -08:00
parent b894c1c7eb
commit 5508eb1813
2 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
definitions/en_CA.js
View File

@ -7720,6 +7720,7 @@ module.exports = function(s,config,lang){
"info": [
{
"fieldType": "btn-group",
"normalWidth": true,
"btns": [
{
"fieldType": "btn",
@ -7731,6 +7732,7 @@ module.exports = function(s,config,lang){
},
{
"fieldType": "btn-group",
"normalWidth": true,
"btns": [
{
"fieldType": "btn",
@ -7761,6 +7763,7 @@ module.exports = function(s,config,lang){
{
"fieldType": "btn-group",
"style": "font-family: monospace;",
"normalWidth": true,
"btns": [
{
"fieldType": "btn",
@ -7790,60 +7793,58 @@ 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"
},
]
},
]
},
]
},
"Container2": {
id: "powerVideoTabs",
noHeader: true,
"section-pre-class": "col-md-4",
attribute: `tab-chooser-parent`,
"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-4",
"section-pre-class": "col-md-12",
"info": [
{
"id": "powerVideoTimelineStrips",

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

@ -173,7 +173,7 @@ drawBlock = function(monitorSettings){
}
fieldBtnContent += `<${btnBaseElement} class="btn ${btnClass.join(' ')}" ${btnAttributes.join(' ')}>${btn.btnContent}</${btnBaseElement}>`
})
fieldElement = `<div class="btn-group btn-group-justified ${fieldClass.join(' ')}" ${attributes.join(' ')}>${fieldBtnContent}</div>`
fieldElement = `<div class="btn-group ${field.normalWidth ? '' : 'btn-group-justified'} ${fieldClass.join(' ')}" ${attributes.join(' ')}>${fieldBtnContent}</div>`
break;
case'btn':
baseElement = field.forForm ? 'button' : 'a'