Web app tab improvements and set Let's Encrypt cert renew time.

This commit is contained in:
Ylian Saint-Hilaire 2019-10-02 10:41:21 -07:00
parent 4094daf58f
commit 131581937a
6 changed files with 20 additions and 18 deletions

View File

@ -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) {

View File

@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "0.4.1-p",
"version": "0.4.1-q",
"keywords": [
"Remote Management",
"Intel AMT",

View File

@ -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;
}

File diff suppressed because one or more lines are too long

View File

@ -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;

File diff suppressed because one or more lines are too long