From 6840a2034a98b06f59f74221d2db3f5f7f046783 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Sun, 7 Jul 2019 13:51:24 -0700 Subject: [PATCH] Fixed site embedded options. --- package.json | 2 +- public/styles/style.css | 2 +- views/default-min.handlebars | 2 +- views/default.handlebars | 21 +++++++++++++++++++++ views/messenger-min.handlebars | 2 +- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 99e4d8ff..5f6b2d8f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.7-h", + "version": "0.3.7-i", "keywords": [ "Remote Management", "Intel AMT", diff --git a/public/styles/style.css b/public/styles/style.css index 98dfc517..f1a18784 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -262,7 +262,7 @@ body { #column_l { position: relative; - float: left; + /* float: left; */ width: 100%; box-sizing: border-box; margin: 0; diff --git a/views/default-min.handlebars b/views/default-min.handlebars index 21f9a8a9..0f8754f5 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file + {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file diff --git a/views/default.handlebars b/views/default.handlebars index c4a1405e..9d973936 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -987,6 +987,27 @@ // QV('page_leftbar', false); // QS('page_content').left = '0px'; //} + + // Fix the main grid to zero-height elements we want to hide. + QS('container')['grid-template-rows'] = ((hide & 1) ? '0' : '66') + 'px ' + ((hide & 2) ? '0' : '24') + 'px auto ' + ((hide & 4) ? '0' : '45') + 'px'; + QS('container')['-ms-grid-rows'] = ((hide & 1) ? '0' : '66') + 'px ' + ((hide & 2) ? '0' : '24') + 'px auto ' + ((hide & 4) ? '0' : '45') + 'px'; + + // Adjust height of remote desktop, files and Intel AMT + var xh = (((hide & 1) ? 0 : 66) + ((hide & 2) ? 0 : 24) + ((hide & 4) ? 0 : 45) + ((hide & 8) ? 0 : 60)); // 0 to 195 + QS('p3users')['max-height'] = 'calc(100vh - ' + (124 + xh) + 'px)'; + QS('p3events')['height'] = 'calc(100vh - ' + (124 + xh) + 'px)'; + QS('deskarea3x')['height'] = 'calc(100vh - ' + (75 + xh) + 'px)'; + QS('deskarea3x')['max-height'] = 'calc(100vh - ' + (75 + xh) + 'px)'; + QS('p5filetable')['height'] = 'calc(100vh - ' + (160 + xh) + 'px)'; + QS('p13filetable')['height'] = 'calc(100vh - ' + (124 + xh) + 'px)'; + QS('serverMainStats')['height'] = 'calc(100vh - ' + (110 + xh) + 'px)'; + QS('serverMainStats')['max-height'] = 'calc(100vh - ' + (110 + xh) + 'px)'; + QS('xdevices')['max-height'] = 'calc(100vh - ' + (124 + xh) + 'px)'; + QS('xdevicesmap')['max-height'] = 'calc(100vh - ' + (124 + xh) + 'px)'; + QS('p15agentConsole')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; + QS('p15agentConsole')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)'; + QS('p15agentConsoleText')['height'] = 'calc(100vh - ' + (81 + xh) + 'px)'; + QS('p15agentConsoleText')['max-height'] = 'calc(100vh - ' + (81 + xh) + 'px)'; } // We are looking at a single device, remove all the back buttons diff --git a/views/messenger-min.handlebars b/views/messenger-min.handlebars index 2ad010dc..cbde998a 100644 --- a/views/messenger-min.handlebars +++ b/views/messenger-min.handlebars @@ -1 +1 @@ - MeshMessenger
MeshMessenger
\ No newline at end of file + MeshMessenger
MeshMessenger
\ No newline at end of file