From 9922d25cf58c8dd43ccd3345cc8f9328423396b9 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Fri, 31 May 2019 15:29:57 -0700 Subject: [PATCH] Terminal fixes, added clipboard links to agent install dialog. --- package.json | 2 +- public/scripts/amt-terminal-0.0.2.js | 8 ++++++++ public/styles/style.css | 5 +---- views/default-min.handlebars | 2 +- views/default.handlebars | 28 +++++++++++++++------------- views/messenger-min.handlebars | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 157ff7e9..98259547 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.5-s", + "version": "0.3.5-u", "keywords": [ "Remote Management", "Intel AMT", diff --git a/public/scripts/amt-terminal-0.0.2.js b/public/scripts/amt-terminal-0.0.2.js index 2e9b0b10..d93b7881 100644 --- a/public/scripts/amt-terminal-0.0.2.js +++ b/public/scripts/amt-terminal-0.0.2.js @@ -21,6 +21,7 @@ var CreateAmtRemoteTerminal = function (divid) { obj.width = 80; // 80 or 100 obj.height = 25; // 25 or 30 + obj.heightLock = 0; var _Terminal_CellHeight = 21; var _Terminal_CellWidth = 13; @@ -749,6 +750,13 @@ var CreateAmtRemoteTerminal = function (divid) { for (var i in scrollBackBuffer) { backbuffer += scrollBackBuffer[i]; } obj.DivElement.innerHTML = "" + backbuffer + buf + closetag + ""; obj.DivElement.scrollTop = obj.DivElement.scrollHeight; + if (obj.heightLock == 0) { setTimeout(obj.TermLockHeight, 10); } + } + + obj.TermLockHeight = function () { + obj.heightLock = obj.DivElement.clientHeight; + obj.DivElement.style['height'] = obj.DivElement.parentNode.style['height'] = obj.heightLock + 'px'; + obj.DivElement.style['overflow-y'] = 'scroll'; } obj.TermInit = function () { obj.TermResetScreen(); } diff --git a/public/styles/style.css b/public/styles/style.css index 492da359..fd44482b 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -2140,14 +2140,11 @@ a { #termarea3x { background: black; text-align: center; - height: 450px; + height: 500px; position: relative; } #Term { - height: 450px; - max-height: 450px; - overflow-y: scroll; background: black; margin: 0; padding: 0; diff --git a/views/default-min.handlebars b/views/default-min.handlebars index 278b9cc5..2f957771 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 b9c5a317..6cb95015 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -2676,7 +2676,7 @@ var x = "Invite someone to install the mesh agent. An email with be sent with the link to the mesh agent installation for " + EscapeHtml(mesh.name) + ".

"; x += addHtmlValue('Name (optional)', ''); x += addHtmlValue('Email', ''); - x += addHtmlValue('Operating System', ''); + x += addHtmlValue('Operating System', ''); x += addHtmlValue('Installation Type', ''); x += addHtmlValue('Message
(optional)', ''); setDialogMode(2, "Invite", 3, performAgentInvite, x, meshid); @@ -2694,7 +2694,7 @@ function addAgentToMesh(meshid) { if (xxdialogMode) return; var mesh = meshes[meshid], x = '', installType = 0; - x += addHtmlValue('Operating System', ''); + x += addHtmlValue('Operating System', ''); x += '
'; x += addHtmlValue('Installation Type', ''); x += '
'; @@ -2705,11 +2705,11 @@ // Windows agent install //x += "
To add a new computer to device group \"" + EscapeHtml(mesh.name) + "\", download the mesh agent and configuration file and install the agent on the computer to manage.

"; - x += "
To add a new computer to device group \"" + EscapeHtml(mesh.name) + "\", download the mesh agent and install it the computer to manage. This agent has server and mesh information embedded within it.

"; + x += "
To add a new computer to device group \"" + EscapeHtml(mesh.name) + "\", download the mesh agent and install it the computer to manage. This agent has server and device group information embedded within it.

"; //x += addHtmlValue('Mesh Agent', 'Windows (.exe)'); //x += addHtmlValue('Mesh Agent', 'Windows x64 (.exe)'); - x += addHtmlValue('Mesh Agent', 'Windows (.exe) Windows x64 (.exe) Windows (.exe) Windows x64 (.exe) ' + EscapeHtml(mesh.name) + ' settings (.msh)'); } x += "
"; @@ -2718,17 +2718,17 @@ x += ''; x += "
"; - // OSX agent install - x += "