From 083485ac33d523ca09e784375efe3b1514b57232 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Thu, 8 Aug 2019 11:15:44 -0700 Subject: [PATCH] Fixed MacOS agent download link on invitation page. --- agents/meshcore.js | 6 ++---- package.json | 2 +- public/styles/style.css | 4 ++++ views/agentinvite.handlebars | 2 +- views/default-min.handlebars | 2 +- views/default.handlebars | 5 ++--- views/messenger-min.handlebars | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/agents/meshcore.js b/agents/meshcore.js index f8ab8d2f..1621ce84 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -709,16 +709,14 @@ function createMeshCore(agent) } catch (e) { } break; } - /* case 'serviceRestart': { - // Start a service + // Restart a service try { var service = require('service-manager').manager.getService(data.serviceName); - if (service != null) { service.stop(); service.start(); } + if (service != null) { service.restart(); } } catch (e) { } break; } - */ case 'openUrl': { // Open a local web browser and return success/fail MeshServerLog('Opening: ' + data.url, data); diff --git a/package.json b/package.json index 2eb2560c..3a2b9fd0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.9-k", + "version": "0.3.9-l", "keywords": [ "Remote Management", "Intel AMT", diff --git a/public/styles/style.css b/public/styles/style.css index a6bd80a5..b2512c44 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -2529,6 +2529,10 @@ a { border-radius: 5px; } + .night .tagSpan { + color: black; + } + .suggestionBox { position:absolute; background-color: #6CC; diff --git a/views/agentinvite.handlebars b/views/agentinvite.handlebars index 5b723386..5fda026a 100644 --- a/views/agentinvite.handlebars +++ b/views/agentinvite.handlebars @@ -250,7 +250,7 @@ Q('win32url').href = url; // MacOS Setup - url = 'meshagents?id=16&meshid=' + meshid; + url = 'meshosxagent?id=16&meshid=' + meshid; Q('macosurl').href = url; // Linux Setup diff --git a/views/default-min.handlebars b/views/default-min.handlebars index e658cd75..f5e0a6a2 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 37ba9c4b..eb34e9dd 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -5245,8 +5245,7 @@ if (service.status.isSharedProcess === true) { serviceTypes.push('SharedProcess'); } if (serviceTypes.length > 0) { x += addHtmlValue('Type', serviceTypes.join(', ')); } } - x += '
'; - // + x += '
'; setDialogMode(2, "Service Details", 8, null, x, name); } } @@ -5258,7 +5257,7 @@ if (service != null) { if (action == 1) { meshserver.send({ action: 'msg', type: 'serviceStart', nodeid: currentNode._id, serviceName: service.name }); } if (action == 2) { meshserver.send({ action: 'msg', type: 'serviceStop', nodeid: currentNode._id, serviceName: service.name }); } - //if (action == 3) { meshserver.send({ action: 'msg', type: 'serviceRestart', nodeid: currentNode._id, serviceName: service.name }); } + if (action == 3) { meshserver.send({ action: 'msg', type: 'serviceRestart', nodeid: currentNode._id, serviceName: service.name }); } setTimeout(function () { refreshDeskTools(1) }, 1000); } } diff --git a/views/messenger-min.handlebars b/views/messenger-min.handlebars index 524dd730..d9fc54dc 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