mirror of
https://github.com/the-djmaze/snappymail.git
synced 2025-10-05 11:24:24 +08:00
Release commit
This commit is contained in:
parent
bce962328d
commit
43f19e29e8
18 changed files with 70 additions and 35 deletions
|
@ -326,5 +326,7 @@ html.rl-ctrl-key-pressed {
|
|||
display: none;
|
||||
}
|
||||
|
||||
/*html.rl-changing-language {
|
||||
}*/
|
||||
#rl-loading-error-additional {
|
||||
margin-top: 20px;
|
||||
font-size: 20px;
|
||||
}
|
||||
|
|
|
@ -51,19 +51,11 @@
|
|||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.control-group {
|
||||
.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
|
||||
font-size: 18px;
|
||||
height: 30px;
|
||||
line-height: 29px;
|
||||
}
|
||||
}
|
||||
|
||||
.controls {
|
||||
.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
|
||||
font-size: 18px;
|
||||
height: 40px;
|
||||
line-height: 39px;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -362,6 +362,12 @@ html.rl-no-preview-pane .messageView {
|
|||
}
|
||||
}
|
||||
|
||||
html.rl-bottom-preview-pane .messageView {
|
||||
.b-content {
|
||||
bottom: @rlBottomMargin;
|
||||
}
|
||||
}
|
||||
|
||||
html.cssanimations.rl-anim .messageItem .line-loading {
|
||||
height: 5px !important;
|
||||
}
|
||||
|
|
|
@ -55,6 +55,8 @@
|
|||
text-overflow: ellipsis;
|
||||
border-radius: 4px;
|
||||
font-weight: bold;
|
||||
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.account-item {
|
||||
|
|
|
@ -25,4 +25,8 @@
|
|||
|
||||
.pswp__img--placeholder {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
#rl-content {
|
||||
display: block;
|
||||
}
|
||||
|
|
5
dev/bootstrap.js
vendored
5
dev/bootstrap.js
vendored
|
@ -51,6 +51,11 @@
|
|||
|
||||
$(function () {
|
||||
|
||||
if (!$('#rl-content').is(':visible'))
|
||||
{
|
||||
Globals.$html.addClass('no-css');
|
||||
}
|
||||
|
||||
if (window['rainloopTEMPLATES'] && window['rainloopTEMPLATES'][0])
|
||||
{
|
||||
$('#rl-templates').html(window['rainloopTEMPLATES'][0]);
|
||||
|
|
|
@ -113,7 +113,7 @@ cfg.paths.js = {
|
|||
'vendors/json2.min.js',
|
||||
'vendors/labjs/LAB.min.js',
|
||||
'vendors/simple-pace/simple-pace-1.0.min.js',
|
||||
'vendors/rl/rl-1.3.min.js'
|
||||
'vendors/rl/rl-1.4.min.js'
|
||||
]
|
||||
},
|
||||
openpgp: {
|
||||
|
@ -386,8 +386,8 @@ regOtherMinTask('other:inputosaurus', 'vendors/inputosaurus/', 'inputosaurus.js'
|
|||
regOtherMinTask('other:pace', 'vendors/simple-pace/', 'simple-pace.js', 'simple-pace-1.0.min.js',
|
||||
'/*! RainLoop Simple Pace v1.0 (c) 2014 RainLoop Team; Licensed under MIT */\n');
|
||||
|
||||
regOtherMinTask('other:rl', 'vendors/rl/', 'rl.js', 'rl-1.3.min.js',
|
||||
'/*! RainLoop Index Helper v1.3 (c) 2014 RainLoop Team; Licensed under MIT */\n');
|
||||
regOtherMinTask('other:rl', 'vendors/rl/', 'rl.js', 'rl-1.4.min.js',
|
||||
'/*! RainLoop Index Helper v1.4 (c) 2014 RainLoop Team; Licensed under MIT */\n');
|
||||
|
||||
gulp.task('fontastic-fonts:clear', function() {
|
||||
return cleanDir('rainloop/v/' + cfg.devVersion + '/static/css/fonts/rainloop.*');
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"name": "RainLoop",
|
||||
"title": "RainLoop Webmail",
|
||||
"version": "1.7.2",
|
||||
"release": "226",
|
||||
"release": "229",
|
||||
"description": "Simple, modern & fast web-based email client",
|
||||
"homepage": "http://rainloop.net",
|
||||
"main": "gulpfile.js",
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
<meta name="robots" content="noindex, nofollow, noodp" />
|
||||
<meta name="google" content="notranslate" />
|
||||
<title></title>
|
||||
<style>#rl-content{display:none;}</style>
|
||||
<link rel="shortcut icon" href="{{BaseAppFaviconPngFile}}" type="image/png" />
|
||||
<link rel="apple-touch-icon" href="{{BaseAppAppleTouchFile}}" type="image/png" />
|
||||
<link type="text/css" rel="stylesheet" href="{{BaseAppMainCssLink}}" />
|
||||
|
@ -66,6 +67,7 @@
|
|||
An Error occurred,
|
||||
<br />
|
||||
please refresh the page and try again.
|
||||
<div id="rl-loading-error-additional"></div>
|
||||
</div>
|
||||
<div id="rl-content">
|
||||
<div id="rl-popups"></div>
|
||||
|
|
|
@ -183,3 +183,27 @@
|
|||
.thm-message-view-background-color {
|
||||
.thm-rgba-background-color(@message-background-color, @message-rgba-background-color);
|
||||
}
|
||||
|
||||
|
||||
html.no-css {
|
||||
|
||||
.thm-body {
|
||||
color: #333;
|
||||
background-color: #aaa;
|
||||
background-image: none;
|
||||
}
|
||||
|
||||
.thm-loading {
|
||||
color: #333 !important;
|
||||
text-shadow: none !important;
|
||||
|
||||
.e-spinner .e-bounce {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
.thm-login-desc .desc {
|
||||
color: #333 !important;
|
||||
text-shadow: none !important;
|
||||
}
|
||||
}
|
|
@ -87,13 +87,13 @@
|
|||
<span class="i18n i18n-animation" data-i18n-text="LOGIN/LABEL_SIGN_ME"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="controls" data-bind="visible: '' !== forgotPasswordLinkUrl || '' !== registrationLinkUrl">
|
||||
<div class="forgot-link thm-forgot" data-bind="visible: '' !== forgotPasswordLinkUrl" style="text-align: center">
|
||||
<div class="controls clearfix" data-bind="visible: '' !== forgotPasswordLinkUrl || '' !== registrationLinkUrl">
|
||||
<div class="forgot-link thm-forgot pull-left" data-bind="visible: '' !== forgotPasswordLinkUrl" style="text-align: center">
|
||||
<a href="#" target="_blank" class="g-ui-link" data-bind="attr: {href: forgotPasswordLinkUrl}, css: {'pull-right': '' !== registrationLinkUrl}"
|
||||
><span class="i18n" data-i18n-text="LOGIN/LABEL_FORGOT_PASSWORD"></span></a>
|
||||
</div>
|
||||
|
||||
<div class="registration-link thm-registration" data-bind="visible: '' !== registrationLinkUrl" style="text-align: center">
|
||||
<div class="registration-link thm-registration pull-right" data-bind="visible: '' !== registrationLinkUrl" style="text-align: center">
|
||||
<a href="#" target="_blank" class="g-ui-link" data-bind="attr: {href: registrationLinkUrl}, css: {'pull-left': '' !== forgotPasswordLinkUrl}"
|
||||
><span class="i18n" data-i18n-text="LOGIN/LABEL_REGISTRATION"></span></a>
|
||||
</div>
|
||||
|
|
|
@ -4,9 +4,8 @@
|
|||
<div class="accountPlace" data-bind="text: emailTitle()"></div>
|
||||
<div class="btn-group pull-right dropdown colored-toggle" data-bind="registrateBootstrapDropdown: true, openDropdownTrigger: accountMenuDropdownTrigger">
|
||||
<a id="top-system-dropdown-id" href="#" tabindex="-1" class="btn btn-ellipsis btn-block dropdown-toggle system-dropdown" data-toggle="dropdown">
|
||||
<i data-bind="css: {'icon-user': !loading(), 'icon-spinner animated': loading()}"></i>
|
||||
|
||||
<span class="caret"></span>
|
||||
<i data-bind="css: {'icon-user': !loading(), 'icon-spinner animated': loading()}"
|
||||
></i> <span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu g-ui-menu" tabindex="-1" role="menu" aria-labelledby="top-system-dropdown-id">
|
||||
|
||||
|
|
|
@ -206,7 +206,7 @@ Options -Indexes
|
|||
if (@file_exists(APP_VERSION_ROOT_PATH.'app/domains/default.ini.dist') &&
|
||||
!file_exists(APP_PRIVATE_DATA.'domains/'.APP_SITE.'.ini'))
|
||||
{
|
||||
$sClearedSiteName = preg_replace('/^(webmail|email|mail||imap|smtp)\./i', '', trim(APP_SITE));
|
||||
$sClearedSiteName = preg_replace('/^(webmail|email|mail|imap|smtp)\./i', '', trim(APP_SITE));
|
||||
|
||||
$sConfigTemplate = @file_get_contents(APP_VERSION_ROOT_PATH.'app/domains/default.ini.dist');
|
||||
|
||||
|
|
5
vendors/labjs/LAB-debug.min.js
vendored
5
vendors/labjs/LAB-debug.min.js
vendored
File diff suppressed because one or more lines are too long
2
vendors/rl/LICENSE
vendored
2
vendors/rl/LICENSE
vendored
|
@ -1,4 +1,4 @@
|
|||
Copyright 2013 RainLoop Team
|
||||
Copyright 2014 RainLoop Team
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
|
|
2
vendors/rl/rl-1.3.min.js
vendored
2
vendors/rl/rl-1.3.min.js
vendored
|
@ -1,2 +0,0 @@
|
|||
/*! RainLoop Index Helper v1.3 (c) 2014 RainLoop Team; Licensed under MIT */
|
||||
!function(t,n,e){function s(){}s.prototype.s=t.sessionStorage,s.prototype.t=t.top||t,s.prototype.getHash=function(){var t=null;if(this.s)t=this.s.getItem("__rlA")||null;else if(this.t){var n=this.t.name&&e&&"{"===this.t.name.toString().substr(0,1)?e.parse(this.t.name.toString()):null;t=n?n.__rlA||null:null}return t},s.prototype.setHash=function(){var n=t.rainloopAppData,s=null;this.s?this.s.setItem("__rlA",n&&n.AuthAccountHash?n.AuthAccountHash:""):this.t&&e&&(s={},s.__rlA=n&&n.AuthAccountHash?n.AuthAccountHash:"",this.t.name=e.stringify(s))},s.prototype.clearHash=function(){this.s?this.s.setItem("__rlA",""):this.t&&(this.t.name="")},t._rlhh=new s,t.__rlah=function(){return t._rlhh?t._rlhh.getHash():null},t.__rlah_set=function(){t._rlhh&&t._rlhh.setHash()},t.__rlah_clear=function(){t._rlhh&&t._rlhh.clearHash()},t.__includeScr=function(t){n.write(unescape('%3Cscript data-cfasync="false" type="text/javascript" src="'+t+'"%3E%3C/script%3E'))},t.__showError=function(){var e=n.getElementById("rl-loading"),s=n.getElementById("rl-loading-error");e&&(e.style.display="none"),s&&(s.style.display="block"),t.SimplePace&&t.SimplePace.set(100)},t.__simplePace=function(n){t.SimplePace&&t.SimplePace.add(n)},t.__runBoot=function(n){t.__APP_BOOT&&!n?t.__APP_BOOT(function(t){t||__showError()}):__showError()}}(window,window.document,window.JSON);
|
2
vendors/rl/rl-1.4.min.js
vendored
Normal file
2
vendors/rl/rl-1.4.min.js
vendored
Normal file
|
@ -0,0 +1,2 @@
|
|||
/*! RainLoop Index Helper v1.4 (c) 2014 RainLoop Team; Licensed under MIT */
|
||||
!function(t,n,e){function r(){}r.prototype.s=t.sessionStorage,r.prototype.t=t.top||t,r.prototype.getHash=function(){var t=null;if(this.s)t=this.s.getItem("__rlA")||null;else if(this.t){var n=this.t.name&&e&&"{"===this.t.name.toString().substr(0,1)?e.parse(this.t.name.toString()):null;t=n?n.__rlA||null:null}return t},r.prototype.setHash=function(){var n=t.rainloopAppData,r=null;this.s?this.s.setItem("__rlA",n&&n.AuthAccountHash?n.AuthAccountHash:""):this.t&&e&&(r={},r.__rlA=n&&n.AuthAccountHash?n.AuthAccountHash:"",this.t.name=e.stringify(r))},r.prototype.clearHash=function(){this.s?this.s.setItem("__rlA",""):this.t&&(this.t.name="")},t._rlhh=new r,t.__rlah=function(){return t._rlhh?t._rlhh.getHash():null},t.__rlah_set=function(){t._rlhh&&t._rlhh.setHash()},t.__rlah_clear=function(){t._rlhh&&t._rlhh.clearHash()},t.__includeScr=function(t){n.write(unescape('%3Cscript data-cfasync="false" type="text/javascript" src="'+t+'"%3E%3C/script%3E'))},t.__showError=function(e){var r=n.getElementById("rl-loading"),s=n.getElementById("rl-loading-error"),l=n.getElementById("rl-loading-error-additional");r&&(r.style.display="none"),s&&(s.style.display="block"),l&&e&&(l.style.display="block",l.innerHTML=e),t.SimplePace&&t.SimplePace.set(100)},t.__simplePace=function(n){t.SimplePace&&t.SimplePace.add(n)},t.__runBoot=function(n,e){t.__APP_BOOT&&!n?t.__APP_BOOT(function(t){t||__showError(e)}):__showError(e)}}(window,window.document,window.JSON);
|
12
vendors/rl/rl.js
vendored
12
vendors/rl/rl.js
vendored
|
@ -69,12 +69,14 @@
|
|||
document.write(unescape('%3Csc' + 'ript data-cfasync="false" type="text/jav' + 'ascr' + 'ipt" sr' + 'c="' + sSrc + '"%3E%3C/' + 'scr' + 'ipt%3E'));
|
||||
};
|
||||
|
||||
window['__showError'] = function () {
|
||||
window['__showError'] = function (sAdditionalError) {
|
||||
var oR = document.getElementById('rl-loading'),
|
||||
oL = document.getElementById('rl-loading-error');
|
||||
oL = document.getElementById('rl-loading-error'),
|
||||
oLA = document.getElementById('rl-loading-error-additional');
|
||||
|
||||
if (oR) {oR.style.display = 'none';}
|
||||
if (oL) {oL.style.display = 'block';}
|
||||
if (oLA && sAdditionalError) { oLA.style.display = 'block'; oLA.innerHTML = sAdditionalError; }
|
||||
if (window.SimplePace) {window.SimplePace.set(100);}
|
||||
};
|
||||
|
||||
|
@ -84,15 +86,15 @@
|
|||
}
|
||||
};
|
||||
|
||||
window['__runBoot'] = function (bWithError) {
|
||||
window['__runBoot'] = function (bWithError, sAdditionalError) {
|
||||
if (window.__APP_BOOT && !bWithError) {
|
||||
window.__APP_BOOT(function (bV) {
|
||||
if (!bV) {
|
||||
__showError();
|
||||
__showError(sAdditionalError);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
__showError();
|
||||
__showError(sAdditionalError);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue