diff --git a/docs/MeshCentral2 Install Guide v0.0.9.docx b/docs/MeshCentral2 Install Guide v0.0.9.docx index f5360c94..f3b74ab5 100644 Binary files a/docs/MeshCentral2 Install Guide v0.0.9.docx and b/docs/MeshCentral2 Install Guide v0.0.9.docx differ diff --git a/meshctrl.js b/meshctrl.js index 133c3545..85f8849e 100644 --- a/meshctrl.js +++ b/meshctrl.js @@ -303,7 +303,9 @@ function displayConfigHelp() { } function performConfigOperations(args) { - var domainValues = ['title', 'title2', 'titlepicture', 'trustedcert', 'welcomepicture', 'welcometext', 'userquota', 'meshquota', 'newaccounts', 'usernameisemail', 'newaccountemaildomains', 'newaccountspass', 'newaccountsrights', 'geolocation', 'lockagentdownload', 'userconsentflags', 'Usersessionidletimeout', 'auth', 'ldapoptions', 'ldapusername', 'ldapuserbinarykey', 'ldapoptions', 'footer', 'certurl', 'loginKey', 'userallowedip', 'agentallowedip', 'agentnoproxy', 'agentconfig', 'orphanagentuser', 'httpheaders', 'yubikey', 'passwordrequirements', 'limits', 'amtacmactivation', 'redirects', 'sessionrecording']; + var domainValues = ['title', 'title2', 'titlepicture', 'trustedcert', 'welcomepicture', 'welcometext', 'userquota', 'meshquota', 'newaccounts', 'usernameisemail', 'newaccountemaildomains', 'newaccountspass', 'newaccountsrights', 'geolocation', 'lockagentdownload', 'userconsentflags', 'Usersessionidletimeout', 'auth', 'ldapoptions', 'ldapusername', 'ldapuserbinarykey', 'ldapoptions', 'footer', 'certurl', 'loginKey', 'userallowedip', 'agentallowedip', 'agentnoproxy', 'agentconfig', 'orphanagentuser', 'httpheaders', 'yubikey', 'passwordrequirements', 'limits', 'amtacmactivation', 'redirects', 'sessionrecording', 'hide', 'loginkey']; + var domainObjectValues = [ 'ldapoptions', 'httpheaders', 'yubikey', 'passwordrequirements', 'limits', 'amtacmactivation', 'redirects', 'sessionrecording' ]; + var domainArrayValues = [ 'newaccountemaildomains', 'newaccountsrights', 'loginkey', 'agentconfig' ]; var configChange = false; var fs = require('fs'); var path = require('path'); @@ -341,15 +343,40 @@ function performConfigOperations(args) { if (args.settodomain != null) { didSomething++; if (config.domains == null) { config.domains = {}; } + if (args.settodomain == true) { args.settodomain = ''; } if (config.domains[args.settodomain] == null) { console.log("Error: Domain \"" + args.settodomain + "\" does not exist"); } else { for (var i in args) { + if ((i == '_') || (i == 'settodomain')) continue; if (domainValues.indexOf(i.toLowerCase()) >= 0) { - if (args[i] == '') { delete config.domains[args.settodomain][i]; configChange = true; } else { - if (args[i] == 'true') { args[i] = true; } else if (args[i] == 'false') { args[i] = false; } else if (parseInt(args[i]) == args[i]) { args[i] = parseInt(args[i]); } - config.domains[args.settodomain][i] = args[i]; - configChange = true; + var isObj = (domainObjectValues.indexOf(i.toLowerCase()) >= 0); + var isArr = (domainArrayValues.indexOf(i.toLowerCase()) >= 0); + if ((isObj == false) && (isArr == false)) { + // Simple value set + if (args[i] == '') { delete config.domains[args.settodomain][i]; configChange = true; } else { + if (args[i] == 'true') { args[i] = true; } else if (args[i] == 'false') { args[i] = false; } else if (parseInt(args[i]) == args[i]) { args[i] = parseInt(args[i]); } + config.domains[args.settodomain][i] = args[i]; + configChange = true; + } + } else if (isObj || isArr) { + // Set an object/array value + if (args[i] == '') { delete config.domains[args.settodomain][i]; configChange = true; } else { + var x = null; + try { x = JSON.parse(args[i]); } catch (ex) { } + if ((x == null) || (typeof x != 'object')) { console.log("Unable to parse JSON for " + i + "."); } else { + if (isArr && Array.isArray(x) == false) { + console.log("Value " + i + " must be an array."); + } else if (!isArr && Array.isArray(x) == true) { + console.log("Value " + i + " must be an object."); + } else { + config.domains[args.settodomain][i] = x; + configChange = true; + } + } + } } + } else { + console.log('Invalid configuration value: ' + i); } } } @@ -376,7 +403,7 @@ function performConfigOperations(args) { if (didSomething == 0) { displayConfigHelp(); } else { - console.log("Done.", didSomething); + console.log("Done."); } } } diff --git a/package.json b/package.json index 429452da..5c8443b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.4.6-f", + "version": "0.4.6-g", "keywords": [ "Remote Management", "Intel AMT", diff --git a/public/styles/style.css b/public/styles/style.css index 1ad4ee95..e5713d4f 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -217,8 +217,8 @@ body { cursor: pointer; color: white; position: absolute; - top: 3px; - right: 6px; + padding: 3px; + right: 3px; } #logoutControlSpan2 { diff --git a/views/default-min.handlebars b/views/default-min.handlebars index 2e15359d..e8949744 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -88,7 +88,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -231,8 +231,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -243,8 +241,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -312,7 +319,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -4491,6 +4498,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/default.handlebars b/views/default.handlebars index ceb1b953..3a443974 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -1141,7 +1141,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -1284,8 +1284,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -1296,8 +1294,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -1365,7 +1372,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -5544,6 +5551,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default-min_cs.handlebars b/views/translations/default-min_cs.handlebars index c9d16ee4..5dd64cfe 100644 --- a/views/translations/default-min_cs.handlebars +++ b/views/translations/default-min_cs.handlebars @@ -88,7 +88,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -231,8 +231,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -243,8 +241,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -312,7 +319,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -4491,6 +4498,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default-min_fr.handlebars b/views/translations/default-min_fr.handlebars index 32596755..cb6de78d 100644 --- a/views/translations/default-min_fr.handlebars +++ b/views/translations/default-min_fr.handlebars @@ -88,7 +88,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -231,8 +231,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -243,8 +241,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -312,7 +319,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -4491,6 +4498,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default-min_ja.handlebars b/views/translations/default-min_ja.handlebars index a1f74529..9fb92779 100644 --- a/views/translations/default-min_ja.handlebars +++ b/views/translations/default-min_ja.handlebars @@ -88,7 +88,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -231,8 +231,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -243,8 +241,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -312,7 +319,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -4491,6 +4498,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default-min_nl.handlebars b/views/translations/default-min_nl.handlebars index aea93332..3a648f7c 100644 --- a/views/translations/default-min_nl.handlebars +++ b/views/translations/default-min_nl.handlebars @@ -88,7 +88,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -231,8 +231,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -243,8 +241,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -312,7 +319,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -4491,6 +4498,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default-min_pt.handlebars b/views/translations/default-min_pt.handlebars index 3b107896..69136f6b 100644 --- a/views/translations/default-min_pt.handlebars +++ b/views/translations/default-min_pt.handlebars @@ -88,7 +88,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -231,8 +231,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -243,8 +241,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -312,7 +319,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -4491,6 +4498,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default_cs.handlebars b/views/translations/default_cs.handlebars index 8288e664..d81364af 100644 --- a/views/translations/default_cs.handlebars +++ b/views/translations/default_cs.handlebars @@ -1139,7 +1139,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -1282,8 +1282,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -1294,8 +1292,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -1363,7 +1370,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -5542,6 +5549,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default_fr.handlebars b/views/translations/default_fr.handlebars index 49310d09..d857bcde 100644 --- a/views/translations/default_fr.handlebars +++ b/views/translations/default_fr.handlebars @@ -1139,7 +1139,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -1282,8 +1282,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -1294,8 +1292,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -1363,7 +1370,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -5542,6 +5549,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default_ja.handlebars b/views/translations/default_ja.handlebars index 3066862d..5f51e25d 100644 --- a/views/translations/default_ja.handlebars +++ b/views/translations/default_ja.handlebars @@ -1139,7 +1139,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -1282,8 +1282,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -1294,8 +1292,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -1363,7 +1370,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -5542,6 +5549,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default_nl.handlebars b/views/translations/default_nl.handlebars index b467080f..2355e802 100644 --- a/views/translations/default_nl.handlebars +++ b/views/translations/default_nl.handlebars @@ -1139,7 +1139,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -1282,8 +1282,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -1294,8 +1292,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -1363,7 +1370,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -5542,6 +5549,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() { diff --git a/views/translations/default_pt.handlebars b/views/translations/default_pt.handlebars index b4f89e85..16414ef8 100644 --- a/views/translations/default_pt.handlebars +++ b/views/translations/default_pt.handlebars @@ -1139,7 +1139,7 @@ QV('autoconnectbutton1', debugmode); // Desktop //QV('DeskClip', debugmode); // Clipboard feature, not completed so show in in debug mode only. - if (nightMode) { QC('body').add('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } toggleFullScreen(); // Setup page visuals @@ -1282,8 +1282,6 @@ var xh2 = (uiMode > 1)?24:0; QS('p3users')['max-height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 QS('p3events')['height'] = 'calc(100vh - ' + (50 + xh) + 'px)'; // 124 - QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; - QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; QS('p5filetable')['height'] = 'calc(100vh - ' + (99 + xh) + 'px)'; // 160 QS('p13filetable')['height'] = 'calc(100vh - ' + (127 + xh + xh2) + 'px)'; // 124 QS('serverMainStats')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; // 110 @@ -1294,8 +1292,17 @@ QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh + xh2) + 'px)'; - QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; - QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + if (fullscreen) { + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + QS('p14iframe')['height'] = null; + QS('p14iframe')['max-height'] = null; + } else { + QS('deskarea3x')['height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (74 + xh + xh2) + 'px)'; + QS('p14iframe')['height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + QS('p14iframe')['max-height'] = 'calc(100vh - ' + (23 + xh + xh2) + 'px)'; + } QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)'; @@ -1363,7 +1370,7 @@ function toggleNightMode() { nightMode = !nightMode; - if (nightMode) { QC('body').add('night'); } else { QC('body').remove('night'); } + if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } putstore('_nightMode', nightMode?'1':'0'); } @@ -5542,6 +5549,7 @@ } deskAdjust(); updateDesktopButtons(); + adjustPanels(); } function deskToggleFocus() {