From 8d0209c71db9c955c0e4b9b9c7b534bb98ac74c7 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Wed, 2 Oct 2019 10:41:21 -0700 Subject: [PATCH] Web app tab improvements and set Let's Encrypt cert renew time. --- letsEncrypt.js | 7 +++---- package.json | 2 +- public/styles/style.css | 6 +++--- views/default-min.handlebars | 2 +- views/default.handlebars | 19 +++++++++++-------- views/messenger-min.handlebars | 2 +- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/letsEncrypt.js b/letsEncrypt.js index d4c39c2a..e9448414 100644 --- a/letsEncrypt.js +++ b/letsEncrypt.js @@ -120,10 +120,9 @@ module.exports.CreateLetsEncrypt = function (parent) { email: obj.parent.config.letsencrypt.email, agreeTos: true, rsaKeySize: rsaKeySize, - challengeType: 'http-01' - //renewWithin: 15 * 24 * 60 * 60 * 1000 // 15 days - //renewWithin: 81 * 24 * 60 * 60 * 1000, // 81 days - //renewBy: 80 * 24 * 60 * 60 * 1000 // 80 days + challengeType: 'http-01', + renewWithin: 45 * 24 * 60 * 60 * 1000, // Certificate renewal may begin at this time (45 days) + renewBy: 60 * 24 * 60 * 60 * 1000 // Certificate renewal should happen by this time (60 days) }).then(function (xresults) { obj.parent.performServerCertUpdate(); // Reset the server, TODO: Reset all peers }, function (err) { diff --git a/package.json b/package.json index e5a6aa77..a0d555f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.4.1-p", + "version": "0.4.1-q", "keywords": [ "Remote Management", "Intel AMT", diff --git a/public/styles/style.css b/public/styles/style.css index 581581be..8eb985b6 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -2032,7 +2032,7 @@ a { position: relative; overflow: hidden; width: 100%; - max-height: calc(100vh - 270px); /* + 24px hight of submenu */ + max-height: calc(100vh - 270px); /* + 24px height of submenu */ height: calc(100vh - 270px); } @@ -2043,8 +2043,8 @@ a { .fulldesk #deskarea3x { grid-area: deskarea3; - max-height: none; - height: calc(100vh - 52px); + max-height: 100%; + height: 100%; -ms-grid-column: 1; -ms-grid-row: 3; } diff --git a/views/default-min.handlebars b/views/default-min.handlebars index dbb65a9b..b7bf1f00 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 2965950c..f0bc0e30 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -1223,6 +1223,8 @@ } else { QC('body').add("fullscreen"); if (hide & 16) QC('body').add("arg_hide"); // This is replacement for QV('page_leftbar', !(hide & 16)); + QV('page_leftbar', !(hide & 16)); + QV('MainMenuSpan', !(hide & 16)); if (xxcurrentView >= 10) QC('column_l').remove('room4submenu'); QV('UserDummyMenuSpan', (xxcurrentView < 10) && webPageFullScreen); } @@ -5121,16 +5123,15 @@ fullscreen = !fullscreen; if (fullscreen) { QC('body').add("fulldesk"); - //QS('deskarea3x').height = null; + QS('deskarea3x')['height'] = '100%'; + QS('deskarea3x')['max-height'] = '100%'; // If shift is pressed, enter browser full screen. if (e.shiftKey == true) { enterBrowserFullscreen(Q('deskarea0')); browserfullscreen = true; } } else { QC('body').remove("fulldesk"); - if (browserfullscreen == true) { - exitBrowserFullscreen(); - browserfullscreen = false; - toggleFullScreen(); - } + QS('deskarea3x')['height'] = null; + QS('deskarea3x')['max-height'] = null; + if (browserfullscreen == true) { exitBrowserFullscreen(); browserfullscreen = false; } } deskAdjust(); updateDesktopButtons(); @@ -8979,11 +8980,11 @@ function go(x, event) { setSessionActivity(); - if (xxdialogMode || xxcurrentView == x) return; + if (xxdialogMode) return; QV('uiMenu', false); // If "shift" is pressed, open a new tab. - if (event && (event.shiftKey == true) && (x != 15)) { + if (event && (event.shiftKey == true) && (x != 15) && ('{{currentNode}}' == '')) { // Open the device in a different tab if ((x >= 10) && (x <= 19)) { if (currentNode) { window.open(window.location.origin + '?node=' + currentNode._id.split('/')[2] + '&viewmode=' + x + '&hide=16', 'meshcentral:' + currentNode._id); } @@ -8993,6 +8994,8 @@ return; } + if (xxcurrentView == x) return; + // Edit this line when adding a new screen for (var i = 0; i < 42; i++) { QV('p' + i, i == x); } xxcurrentView = x; diff --git a/views/messenger-min.handlebars b/views/messenger-min.handlebars index d735c54f..a7d98d4f 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