mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-28 19:49:20 +03:00
1.10 beta
This commit is contained in:
parent
116de6fd45
commit
ecf23a4f6d
27 changed files with 259 additions and 158 deletions
|
|
@ -204,6 +204,7 @@ class AbstractApp extends AbstractBoot
|
|||
|
||||
const
|
||||
kn = require('Knoin/Knoin'),
|
||||
mobile = Settings.appSettingsGet('mobile'),
|
||||
inIframe = !!Settings.appSettingsGet('inIframe')
|
||||
;
|
||||
|
||||
|
|
@ -219,7 +220,7 @@ class AbstractApp extends AbstractBoot
|
|||
window.close();
|
||||
}
|
||||
|
||||
customLogoutLink = customLogoutLink || (admin ? Links.rootAdmin() : Links.rootUser());
|
||||
customLogoutLink = customLogoutLink || (admin ? Links.rootAdmin(mobile) : Links.rootUser(mobile));
|
||||
|
||||
if (logout && window.location.href !== customLogoutLink)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@ class Links
|
|||
/**
|
||||
* @return {string}
|
||||
*/
|
||||
rootUser() {
|
||||
return './';
|
||||
rootUser(mobile = false) {
|
||||
return mobile ? './?/Mobile/' : './';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@
|
|||
LanguageStore.prototype.populate = function ()
|
||||
{
|
||||
var
|
||||
aLanguages = Settings.settingsGet('Languages'),
|
||||
aLanguagesAdmin = Settings.settingsGet('LanguagesAdmin')
|
||||
aLanguages = Settings.appSettingsGet('languages'),
|
||||
aLanguagesAdmin = Settings.appSettingsGet('languagesAdmin')
|
||||
;
|
||||
|
||||
this.languages(Utils.isArray(aLanguages) ? aLanguages : []);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
ThemeStore.prototype.populate = function ()
|
||||
{
|
||||
var aThemes = Settings.settingsGet('Themes');
|
||||
var aThemes = Settings.appSettingsGet('themes');
|
||||
|
||||
this.themes(Utils.isArray(aThemes) ? aThemes : []);
|
||||
this.theme(Settings.settingsGet('Theme'));
|
||||
|
|
|
|||
|
|
@ -37,3 +37,10 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
html.rl-mobile {
|
||||
.b-languages-content .lang-item {
|
||||
width: calc(~'100% - 40px');
|
||||
}
|
||||
}
|
||||
|
|
@ -175,9 +175,14 @@ html.rl-no-preview-pane {
|
|||
}
|
||||
|
||||
.listSearchDesc {
|
||||
font-size: 20px;
|
||||
padding: 20px;
|
||||
font-size: 18px;
|
||||
padding: 15px;
|
||||
border-bottom: 1px solid #eee;
|
||||
|
||||
html.rl-mobile &{
|
||||
font-size: 16px;
|
||||
padding: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
.listThreadUidDesc {
|
||||
|
|
|
|||
|
|
@ -81,6 +81,10 @@ select {
|
|||
padding: 4px 9px;
|
||||
}
|
||||
|
||||
.btn.btn-thin-2 {
|
||||
padding: 4px 7px;
|
||||
}
|
||||
|
||||
.btn.btn-nowrap {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
|
@ -411,4 +415,25 @@ html.rl-mobile {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.close-input-wrp {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
|
||||
input {
|
||||
padding-right: 15px;
|
||||
}
|
||||
|
||||
.close {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 5px;
|
||||
margin: 0 7px;
|
||||
z-index: 100;
|
||||
vertical-align: middle;
|
||||
opacity: .4;
|
||||
&:hover {
|
||||
opacity: .6;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -198,6 +198,7 @@
|
|||
this.submitRequest(true);
|
||||
|
||||
var
|
||||
self = this,
|
||||
sPassword = this.password(),
|
||||
|
||||
fLoginRequest = _.bind(function (sPassword) {
|
||||
|
|
@ -212,9 +213,11 @@
|
|||
{
|
||||
this.additionalCode('');
|
||||
this.additionalCode.visibility(true);
|
||||
this.additionalCode.focused(true);
|
||||
|
||||
this.submitRequest(false);
|
||||
|
||||
_.delay(function(){
|
||||
self.additionalCode.focused(true);
|
||||
}, 100);
|
||||
}
|
||||
else if (oData.Admin)
|
||||
{
|
||||
|
|
@ -400,7 +403,7 @@
|
|||
self = this,
|
||||
sSignMeLocal = Local.get(Enums.ClientSideKeyName.LastSignMe),
|
||||
sSignMe = (Settings.settingsGet('SignMe') || 'unused').toLowerCase(),
|
||||
sJsHash = Settings.settingsGet('JsHash'),
|
||||
sJsHash = Settings.appSettingsGet('jsHash'),
|
||||
fSocial = function (iErrorCode) {
|
||||
iErrorCode = Utils.pInt(iErrorCode);
|
||||
if (0 === iErrorCode)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue