Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 04:29:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Admin Panel localization (#467)

Browse source
This commit is contained in:
RainLoop Team 2015-03-28 02:06:56 +04:00
parent 470b3645e2
commit 3dac6809d1
46 changed files with 1111 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dev/App/Abstract.js
View file

@ -203,10 +203,11 @@
};
/**
* @param {boolean=} bAdmin = false
* @param {boolean=} bLogout = false
* @param {boolean=} bClose = false
*/
AbstractApp.prototype.loginAndLogoutReload = function (bLogout, bClose)
AbstractApp.prototype.loginAndLogoutReload = function (bAdmin, bLogout, bClose)
{
var
kn = require('Knoin/Knoin'),
@ -227,7 +228,8 @@
window.close();
}
sCustomLogoutLink = sCustomLogoutLink || './';
sCustomLogoutLink = sCustomLogoutLink || (bAdmin ? Links.rootAdmin() : Links.rootUser());
if (bLogout && window.location.href !== sCustomLogoutLink)
{
_.delay(function () {

2
dev/App/User.js
View file

@ -1214,7 +1214,7 @@
{
var self = this;
Remote.logout(function () {
self.loginAndLogoutReload(true,
self.loginAndLogoutReload(false, true,
Settings.settingsGet('ParentEmail') && 0 < Settings.settingsGet('ParentEmail').length);
});
};