1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00

Updated Dutch, improved back button in web app.

This commit is contained in:
Ylian Saint-Hilaire 2019-12-19 12:10:50 -08:00
parent 74187309d3
commit c43228cbff
37 changed files with 906 additions and 749 deletions

View file

@ -1101,6 +1101,7 @@
var pluginHandler = null;
if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
var installedPluginList = null;
var goBackStack = [];
// Console Message Display Timers
var p11DeskConsoleMsgTimer = null;
@ -2718,7 +2719,7 @@
deviceHeaderSet();
var extra = '';
if (view == 2) { r += '<tr><td colspan=5>'; }
if (meshes[node.meshid].mtype == 1) { extra = '<span class=devHeaderx>' + "Intelreg; " + '</span>'; }
if (meshes[node.meshid].mtype == 1) { extra = '<span class=devHeaderx>' + ", Intel&reg; AMT only" + '</span>'; }
if ((view == 1) && (current != null)) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } if (r != '') { r += '</tr></table>'; } }
if (view == 2) { r += '<div>'; }
r += '<div class=DevSt style=width:100%;padding-top:4px><span style=float:right>';
@ -3237,7 +3238,7 @@
x += '</div>';
}
setDialogMode(2, "Adicione Intelreg; ", 2, null, x, 'fileDownload');
setDialogMode(2, "Adicione Intelreg; AMT", 2, null, x, 'fileDownload');
Q('dlgAddCiraSel').focus();
return false;
}
@ -7839,7 +7840,7 @@
var buttons = 1, x = addHtmlValue("Nome de Usuário", EscapeHtml(decodeURIComponent(uname)));
if (xuserid.split('/')[2] != uname) { x += addHtmlValue("Identificador do usuário", EscapeHtml(xuserid.split('/')[2])); }
x += addHtmlValue("Permissões", r.join(","));
x += addHtmlValue("Permissões", r.join(", "));
if (((userinfo._id) != xuserid) && (cmeshrights == 0xFFFFFFFF || (((cmeshrights & 2) != 0) && (meshrights != 0xFFFFFFFF)))) buttons += 4;
setDialogMode(2, "Usuário do grupo de dispositivos", buttons, p20viewuserEx, x, xuserid);
}
@ -9599,11 +9600,10 @@
function goBack() {
setSessionActivity();
if (xxdialogMode) return;
if (xxdialogMode || (goBackStack.length == 0)) return;
if (fullscreen) { deskToggleFull(); }
if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
go(goBackStack.pop());
goBackStack.pop();
}
function go(x, event) {
@ -9622,8 +9622,15 @@
return;
}
// If we are going to the same place, do nothing.
if (xxcurrentView == x) return;
// Set the goback stack, if going to top-level view, clear the stack.
if ((xxcurrentView < 0) || (x < 10)) { goBackStack = []; } else {
// Do not push into the back stack if we are changing tabs at the same level.
if (Math.floor(xxcurrentView / 10) != Math.floor(x / 10)) { goBackStack.push(xxcurrentView); }
}
// Edit this line when adding a new screen
for (var i = 0; i < 44; i++) { QV('p' + i, i == x); }
xxcurrentView = x;
@ -9646,29 +9653,34 @@
var mainMenuActiveClass = (x < 9 ? 'fullselect' : 'semiselect');
var leftMenuActiveClass = (((x < 9) || (x == 115) || (x == 40) || (x == 41) || (x == 42)) ? 'lbbuttonsel2' : 'lbbuttonsel');
var backView = 0;
if (goBackStack.length > 0) { backView = goBackStack[goBackStack.length - 1]; }
// My Devices
if (x == 1 || (x >= 10 && x < 20)) QC('MainMenuMyDevices').add(mainMenuActiveClass);
if (x == 1 || (x >= 10 && x < 20)) QC('LeftMenuMyDevices').add(leftMenuActiveClass);
// My Account
if (x == 2 || (x >= 20 && x < 30)) QC('MainMenuMyAccount').add(mainMenuActiveClass);
if (x == 2 || (x >= 20 && x < 30)) QC('LeftMenuMyAccount').add(leftMenuActiveClass);
// My Events
if (x == 3) QC('MainMenuMyEvents').add(mainMenuActiveClass);
if (x == 3) QC('LeftMenuMyEvents').add(leftMenuActiveClass);
// My Users
if (x == 4 || (x >= 30 && x < 40)) QC('MainMenuMyUsers').add(mainMenuActiveClass);
if (x == 4 || (x >= 30 && x < 40)) QC('LeftMenuMyUsers').add(leftMenuActiveClass);
// My Files
if (x == 5) QC('MainMenuMyFiles').add(mainMenuActiveClass);
if (x == 5) QC('LeftMenuMyFiles').add(leftMenuActiveClass);
// My Server
if ((x == 6) || (x == 115)) QC('MainMenuMyServer').add(mainMenuActiveClass);
if ((x == 6) || (x == 115) || (x == 40) || (x == 41) || (x == 42) || (x == 43)) QC('LeftMenuMyServer').add(leftMenuActiveClass);
if (x == 1 || (backView == 1) || ((backView == 0) && (x >= 10 && x < 20))) {
QC('MainMenuMyDevices').add(mainMenuActiveClass);
QC('LeftMenuMyDevices').add(leftMenuActiveClass);
} else if (x == 2 || (backView == 2) || ((backView == 0) && (x >= 20 && x < 30))) {
// My Account
QC('MainMenuMyAccount').add(mainMenuActiveClass);
QC('LeftMenuMyAccount').add(leftMenuActiveClass);
} else if (x == 3) {
// My Events
QC('MainMenuMyEvents').add(mainMenuActiveClass);
QC('LeftMenuMyEvents').add(leftMenuActiveClass);
} else if (x == 4 || (x >= 30 && x < 40)) {
// My Users
QC('MainMenuMyUsers').add(mainMenuActiveClass);
QC('LeftMenuMyUsers').add(leftMenuActiveClass);
} else if (x == 5) {
// My Files
QC('MainMenuMyFiles').add(mainMenuActiveClass);
QC('LeftMenuMyFiles').add(leftMenuActiveClass);
} else if ((x == 6) || (x == 115) || (x >= 40 && x < 50)) {
// My Server
QC('MainMenuMyServer').add(mainMenuActiveClass);
QC('LeftMenuMyServer').add(leftMenuActiveClass);
}
QV('ServerPlugins', pluginHandler != null);
// column_l max-height