diff --git a/dev/App/User.js b/dev/App/User.js index 2509c1d8d..1a876b0d6 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -1315,26 +1315,6 @@ bTwitter = Settings.settingsGet('AllowTwitterSocial') ; -// Utils.initOnStartOrLangChange(function () { -// -// $.extend(true, $.magnificPopup.defaults, { -// 'tClose': Utils.i18n('PREVIEW_POPUP/CLOSE'), -// 'tLoading': Utils.i18n('PREVIEW_POPUP/LOADING'), -// 'gallery': { -// 'tPrev': Utils.i18n('PREVIEW_POPUP/GALLERY_PREV'), -// 'tNext': Utils.i18n('PREVIEW_POPUP/GALLERY_NEXT'), -// 'tCounter': Utils.i18n('PREVIEW_POPUP/GALLERY_COUNTER') -// }, -// 'image': { -// 'tError': Utils.i18n('PREVIEW_POPUP/IMAGE_ERROR') -// }, -// 'ajax': { -// 'tError': Utils.i18n('PREVIEW_POPUP/AJAX_ERROR') -// } -// }); -// -// }, this); - if (SimplePace) { SimplePace.set(70); @@ -1359,18 +1339,29 @@ { if ($LAB && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP)) { - $LAB.script(window.openpgp ? '' : Links.openPgpJs()).wait(function () { - if (window.openpgp) - { - Data.openpgp = window.openpgp; - Data.openpgpKeyring = new window.openpgp.Keyring(); - Data.capaOpenPGP(true); + var fOpenpgpCallback = function (openpgp) { + Data.openpgp = openpgp; + Data.openpgpKeyring = new openpgp.Keyring(); + Data.capaOpenPGP(true); - Events.pub('openpgp.init'); + Events.pub('openpgp.init'); - self.reloadOpenPgpKeys(); - } - }); + self.reloadOpenPgpKeys(); + }; + + if (window.openpgp) + { + fOpenpgpCallback(window.openpgp); + } + else + { + $LAB.script(Links.openPgpJs()).wait(function () { + if (window.openpgp) + { + fOpenpgpCallback(window.openpgp); + } + }); + } } else { diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js index d2e5cffba..29db43cd7 100644 --- a/dev/Common/Enums.js +++ b/dev/Common/Enums.js @@ -52,6 +52,7 @@ 'Themes': 'THEMES', 'UserBackground': 'USER_BACKGROUND', 'Sieve': 'SIEVE', + 'AttachmentThumbnails': 'ATTACHMENT_THUMBNAILS', 'AdditionalAccounts': 'ADDITIONAL_ACCOUNTS', 'AdditionalIdentities': 'ADDITIONAL_IDENTITIES' }; @@ -304,7 +305,7 @@ 'EqualTo': 'EqualTo', 'NotEqualTo': 'NotEqualTo' }; - + /** * @enum {string} */ diff --git a/dev/Common/Mime.js b/dev/Common/Mime.js new file mode 100644 index 000000000..a29e3ae36 --- /dev/null +++ b/dev/Common/Mime.js @@ -0,0 +1,168 @@ +(function () { + + 'use strict'; + + module.exports = { + + 'eml' : 'message/rfc822', + 'mime' : 'message/rfc822', + 'txt' : 'text/plain', + 'text' : 'text/plain', + 'def' : 'text/plain', + 'list' : 'text/plain', + 'in' : 'text/plain', + 'ini' : 'text/plain', + 'log' : 'text/plain', + 'sql' : 'text/plain', + 'cfg' : 'text/plain', + 'conf' : 'text/plain', + 'asc' : 'text/plain', + 'rtx' : 'text/richtext', + 'vcard' : 'text/vcard', + 'vcf' : 'text/vcard', + 'htm' : 'text/html', + 'html' : 'text/html', + 'csv' : 'text/csv', + 'ics' : 'text/calendar', + 'ifb' : 'text/calendar', + 'xml' : 'text/xml', + 'json' : 'application/json', + 'swf' : 'application/x-shockwave-flash', + 'hlp' : 'application/winhlp', + 'wgt' : 'application/widget', + 'chm' : 'application/vnd.ms-htmlhelp', + 'p10' : 'application/pkcs10', + 'p7c' : 'application/pkcs7-mime', + 'p7m' : 'application/pkcs7-mime', + 'p7s' : 'application/pkcs7-signature', + 'torrent' : 'application/x-bittorrent', + + // scripts + 'js' : 'application/javascript', + 'pl' : 'text/perl', + 'css' : 'text/css', + 'asp' : 'text/asp', + 'php' : 'application/x-httpd-php', + 'php3' : 'application/x-httpd-php', + 'php4' : 'application/x-httpd-php', + 'php5' : 'application/x-httpd-php', + 'phtml' : 'application/x-httpd-php', + + // images + 'png' : 'image/png', + 'jpg' : 'image/jpeg', + 'jpeg' : 'image/jpeg', + 'jpe' : 'image/jpeg', + 'jfif' : 'image/jpeg', + 'gif' : 'image/gif', + 'bmp' : 'image/bmp', + 'cgm' : 'image/cgm', + 'ief' : 'image/ief', + 'ico' : 'image/x-icon', + 'tif' : 'image/tiff', + 'tiff' : 'image/tiff', + 'svg' : 'image/svg+xml', + 'svgz' : 'image/svg+xml', + 'djv' : 'image/vnd.djvu', + 'djvu' : 'image/vnd.djvu', + 'webp' : 'image/webp', + + // archives + 'zip' : 'application/zip', + '7z' : 'application/x-7z-compressed', + 'rar' : 'application/x-rar-compressed', + 'exe' : 'application/x-msdownload', + 'dll' : 'application/x-msdownload', + 'scr' : 'application/x-msdownload', + 'com' : 'application/x-msdownload', + 'bat' : 'application/x-msdownload', + 'msi' : 'application/x-msdownload', + 'cab' : 'application/vnd.ms-cab-compressed', + 'gz' : 'application/x-gzip', + 'tgz' : 'application/x-gzip', + 'bz' : 'application/x-bzip', + 'bz2' : 'application/x-bzip2', + 'deb' : 'application/x-debian-package', + + // fonts + 'psf' : 'application/x-font-linux-psf', + 'otf' : 'application/x-font-otf', + 'pcf' : 'application/x-font-pcf', + 'snf' : 'application/x-font-snf', + 'ttf' : 'application/x-font-ttf', + 'ttc' : 'application/x-font-ttf', + + // audio + 'mp3' : 'audio/mpeg', + 'amr' : 'audio/amr', + 'aac' : 'audio/x-aac', + 'aif' : 'audio/x-aiff', + 'aifc' : 'audio/x-aiff', + 'aiff' : 'audio/x-aiff', + 'wav' : 'audio/x-wav', + 'wma' : 'audio/x-ms-wma', + 'wax' : 'audio/x-ms-wax', + 'midi' : 'audio/midi', + 'mp4a' : 'audio/mp4', + 'ogg' : 'audio/ogg', + 'weba' : 'audio/webm', + 'ra' : 'audio/x-pn-realaudio', + 'ram' : 'audio/x-pn-realaudio', + 'rmp' : 'audio/x-pn-realaudio-plugin', + 'm3u' : 'audio/x-mpegurl', + + // video + 'flv' : 'video/x-flv', + 'qt' : 'video/quicktime', + 'mov' : 'video/quicktime', + 'wmv' : 'video/windows-media', + 'avi' : 'video/x-msvideo', + 'mpg' : 'video/mpeg', + 'mpeg' : 'video/mpeg', + 'mpe' : 'video/mpeg', + 'm1v' : 'video/mpeg', + 'm2v' : 'video/mpeg', + '3gp' : 'video/3gpp', + '3g2' : 'video/3gpp2', + 'h261' : 'video/h261', + 'h263' : 'video/h263', + 'h264' : 'video/h264', + 'jpgv' : 'video/jpgv', + 'mp4' : 'video/mp4', + 'mp4v' : 'video/mp4', + 'mpg4' : 'video/mp4', + 'ogv' : 'video/ogg', + 'webm' : 'video/webm', + 'm4v' : 'video/x-m4v', + 'asf' : 'video/x-ms-asf', + 'asx' : 'video/x-ms-asf', + 'wm' : 'video/x-ms-wm', + 'wmx' : 'video/x-ms-wmx', + 'wvx' : 'video/x-ms-wvx', + 'movie' : 'video/x-sgi-movie', + + // adobe + 'pdf' : 'application/pdf', + 'psd' : 'image/vnd.adobe.photoshop', + 'ai' : 'application/postscript', + 'eps' : 'application/postscript', + 'ps' : 'application/postscript', + + // ms office + 'doc' : 'application/msword', + 'dot' : 'application/msword', + 'rtf' : 'application/rtf', + 'xls' : 'application/vnd.ms-excel', + 'ppt' : 'application/vnd.ms-powerpoint', + 'docx' : 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'xlsx' : 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'dotx' : 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', + 'pptx' : 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + + // open office + 'odt' : 'application/vnd.oasis.opendocument.text', + 'ods' : 'application/vnd.oasis.opendocument.spreadsheet' + + }; + +}()); diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js index 178d8d8f4..2a12a8b31 100644 --- a/dev/Common/Utils.js +++ b/dev/Common/Utils.js @@ -15,6 +15,8 @@ Autolinker = require('Autolinker'), JSEncrypt = require('JSEncrypt'), + Mime = require('Common/Mime'), + Enums = require('Common/Enums'), Consts = require('Common/Consts'), Globals = require('Common/Globals') @@ -1060,6 +1062,7 @@ oData.capaAdditionalIdentities = ko.observable(false); oData.capaGravatar = ko.observable(false); oData.capaSieve = ko.observable(false); + oData.capaAttachmentThumbnails = ko.observable(false); oData.determineUserLanguage = ko.observable(false); oData.determineUserDomain = ko.observable(false); @@ -1256,7 +1259,7 @@ Utils.draggablePlace = function () { return $('
' + - ' ' + + ' ' + '
').appendTo('#rl-hidden'); }; @@ -2029,6 +2032,45 @@ $('#rl-head-viewport').attr('content', aContent.join(', ')); }; + /** + * @param {string} sFileName + * @return {string} + */ + Utils.getFileExtension = function (sFileName) + { + sFileName = Utils.trim(sFileName).toLowerCase(); + + var sResult = sFileName.split('.').pop(); + return (sResult === sFileName) ? '' : sResult; + }; + + /** + * @param {string} sFileName + * @return {string} + */ + Utils.mimeContentType = function (sFileName) + { + var + sExt = '', + sResult = 'application/octet-stream' + ; + + sFileName = Utils.trim(sFileName).toLowerCase(); + + if ('winmail.dat' === sFileName) + { + return 'application/ms-tnef'; + } + + sExt = Utils.getFileExtension(sFileName); + if (sExt && 0 < sExt.length && !Utils.isUnd(Mime[sExt])) + { + sResult = Mime[sExt]; + } + + return sResult; + }; + /** * @param {mixed} mPropOrValue * @param {mixed} mValue diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js index 9d4524f50..00ebb212d 100644 --- a/dev/Model/Attachment.js +++ b/dev/Model/Attachment.js @@ -167,13 +167,21 @@ return Links.attachmentPreview(this.download); }; + /** + * @return {string} + */ + AttachmentModel.prototype.linkThumbnail = function () + { + return this.hasThumbnail() ? Links.attachmentThumbnailPreview(this.download) : ''; + }; + /** * @return {string} */ AttachmentModel.prototype.linkThumbnailPreviewStyle = function () { - return !this.hasThumbnail() ? '' : - 'background:url(' + Links.attachmentThumbnailPreview(this.download) + ')'; + var sLink = this.linkThumbnail(); + return '' === sLink ? '' : 'background:url(' + sLink + ')'; }; /** @@ -211,7 +219,7 @@ sResult = this.linkFramed(); break; } - + return sResult; }; @@ -253,10 +261,14 @@ return true; }; - AttachmentModel.prototype.iconClass = function () + /** + * @param {string} sMimeType + * @returns {string} + */ + AttachmentModel.staticIconClassHelper = function (sMimeType) { var - aParts = this.mimeType.toLocaleString().split('/'), + aParts = sMimeType.toLocaleString().split('/'), sClass = 'icon-file' ; @@ -333,6 +345,14 @@ return sClass; }; + /** + * @returns {string} + */ + AttachmentModel.prototype.iconClass = function () + { + return AttachmentModel.staticIconClassHelper(this.mimeType); + }; + module.exports = AttachmentModel; }()); \ No newline at end of file diff --git a/dev/Model/ComposeAttachment.js b/dev/Model/ComposeAttachment.js index 232be7af5..caae27a9b 100644 --- a/dev/Model/ComposeAttachment.js +++ b/dev/Model/ComposeAttachment.js @@ -9,6 +9,8 @@ Utils = require('Common/Utils'), + AttachmentModel = require('Model/Attachment'), + AbstractModel = require('Knoin/AbstractModel') ; @@ -37,17 +39,37 @@ this.size = ko.observable(Utils.isUnd(nSize) ? null : nSize); this.tempName = ko.observable(''); - this.progress = ko.observable(''); + this.progress = ko.observable(0); this.error = ko.observable(''); this.waiting = ko.observable(true); this.uploading = ko.observable(false); this.enabled = ko.observable(true); + this.complete = ko.observable(false); + + this.progressText = ko.computed(function () { + var iP = this.progress(); + return 0 === iP ? '' : '' + (99 === iP ? 100 : iP) + '%'; + }, this); + + this.progressStyle = ko.computed(function () { + var iP = this.progress(); + return 0 === iP ? '' : 'width:' + (99 === iP ? 100 : iP) + '%'; + }, this); + + this.title = ko.computed(function () { + var sError = this.error(); + return '' !== sError ? sError : this.fileName(); + }, this); this.friendlySize = ko.computed(function () { var mSize = this.size(); return null === mSize ? '' : Utils.friendlySize(this.size()); }, this); + this.mimeType = ko.computed(function () { + return Utils.mimeContentType(this.fileName()); + }, this); + this.regDisposables([this.friendlySize]); } @@ -63,6 +85,7 @@ /** * @param {AjaxJsonComposeAttachment} oJsonAttachment + * @return {boolean} */ ComposeAttachmentModel.prototype.initByUploadJson = function (oJsonAttachment) { @@ -80,6 +103,15 @@ return bResult; }; + /** + * @return {string} + */ + ComposeAttachmentModel.prototype.iconClass = function () + { + return AttachmentModel.staticIconClassHelper(this.mimeType()); + }; + + module.exports = ComposeAttachmentModel; }()); \ No newline at end of file diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js index 74e4b31ec..30968132d 100644 --- a/dev/Screen/User/MailBox.js +++ b/dev/Screen/User/MailBox.js @@ -106,6 +106,7 @@ ; Globals.$html.toggleClass('rl-no-preview-pane', Enums.Layout.NoPreview === Data.layout()); + Globals.$html.toggleClass('rl-bottom-preview-pane', Enums.Layout.BottomPreview === Data.layout()); Data.folderList.subscribe(fResizeFunction); Data.messageList.subscribe(fResizeFunction); @@ -113,6 +114,7 @@ Data.layout.subscribe(function (nValue) { Globals.$html.toggleClass('rl-no-preview-pane', Enums.Layout.NoPreview === nValue); + Globals.$html.toggleClass('rl-bottom-preview-pane', Enums.Layout.BottomPreview === nValue); }); Events.sub('mailbox.inbox-unread-count', function (nCount) { diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js index e1b49c96b..90024fdec 100644 --- a/dev/Settings/Admin/General.js +++ b/dev/Settings/Admin/General.js @@ -32,6 +32,7 @@ this.capaGravatar = Data.capaGravatar; this.capaAdditionalAccounts = Data.capaAdditionalAccounts; this.capaAdditionalIdentities = Data.capaAdditionalIdentities; + this.capaAttachmentThumbnails = Data.capaAttachmentThumbnails; this.weakPassword = Data.weakPassword; @@ -114,6 +115,12 @@ }); }); + self.capaAttachmentThumbnails.subscribe(function (bValue) { + Remote.saveAdminConfig(null, { + 'CapaAttachmentThumbnails': bValue ? '1' : '0' + }); + }); + self.capaThemes.subscribe(function (bValue) { Remote.saveAdminConfig(null, { 'CapaThemes': bValue ? '1' : '0' diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js index fdcd69b0a..547e0c534 100644 --- a/dev/Settings/User/General.js +++ b/dev/Settings/User/General.js @@ -36,13 +36,6 @@ this.useCheckboxesInList = Data.useCheckboxesInList; this.allowLanguagesOnSettings = Data.allowLanguagesOnSettings; - this.usePreviewPaneCheckbox = ko.computed({ - read: this.usePreviewPane, - write: function (bValue) { - this.layout(bValue ? Enums.Layout.SidePreview : Enums.Layout.NoPreview); - } - }, this); - this.isDesktopNotificationsSupported = ko.computed(function () { return Enums.DesktopNotifications.NotSupported !== Data.desktopNotificationsPermisions(); }); @@ -60,6 +53,7 @@ this.mppTrigger = ko.observable(Enums.SaveSettingsStep.Idle); this.editorDefaultTypeTrigger = ko.observable(Enums.SaveSettingsStep.Idle); + this.layoutTrigger = ko.observable(Enums.SaveSettingsStep.Idle); this.isAnimationSupported = Globals.bAnimationSupported; @@ -72,12 +66,16 @@ {'id': Enums.EditorDefaultType.PlainForced, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCED')} ]; }, this); - } - GeneralUserSettings.prototype.toggleLayout = function () - { - this.layout(Enums.Layout.NoPreview === this.layout() ? Enums.Layout.SidePreview : Enums.Layout.NoPreview); - }; + this.layoutTypes = ko.computed(function () { + Globals.langChangeTrigger(); + return [ + {'id': Enums.Layout.NoPreview, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_LAYOUT_NO_SPLIT')}, + {'id': Enums.Layout.SidePreview, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_LAYOUT_VERTICAL_SPLIT')}, + {'id': Enums.Layout.BottomPreview, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_LAYOUT_HORIZONTAL_SPLIT')} + ]; + }, this); + } GeneralUserSettings.prototype.onBuild = function () { @@ -88,6 +86,7 @@ var f0 = Utils.settingsSaveHelperSimpleFunction(self.editorDefaultTypeTrigger, self), f1 = Utils.settingsSaveHelperSimpleFunction(self.mppTrigger, self), + f2 = Utils.settingsSaveHelperSimpleFunction(self.layoutTrigger, self), fReloadLanguageHelper = function (iSaveSettingsStep) { return function() { self.languageTrigger(iSaveSettingsStep); @@ -164,7 +163,7 @@ Data.messageList([]); - Remote.saveSettings(null, { + Remote.saveSettings(f2, { 'Layout': nValue }); }); diff --git a/dev/Storage/AbstractData.js b/dev/Storage/AbstractData.js index 7add1a6d5..bd3148ef4 100644 --- a/dev/Storage/AbstractData.js +++ b/dev/Storage/AbstractData.js @@ -45,6 +45,7 @@ this.capaAdditionalAccounts(Settings.capa(Enums.Capa.AdditionalAccounts)); this.capaAdditionalIdentities(Settings.capa(Enums.Capa.AdditionalIdentities)); this.capaGravatar(Settings.capa(Enums.Capa.Gravatar)); + this.capaAttachmentThumbnails(Settings.capa(Enums.Capa.AttachmentThumbnails)); this.capaSieve(Settings.capa(Enums.Capa.Sieve)); this.determineUserLanguage(!!Settings.settingsGet('DetermineUserLanguage')); this.determineUserDomain(!!Settings.settingsGet('DetermineUserDomain')); @@ -74,6 +75,7 @@ { this.layout(mLayout); } + this.facebookSupported(!!Settings.settingsGet('SupportedFacebookSocial')); this.facebookEnable(!!Settings.settingsGet('AllowFacebookSocial')); this.facebookAppID(Settings.settingsGet('FacebookAppID')); diff --git a/dev/Styles/Compose.less b/dev/Styles/Compose.less index be59d8f7a..cd609d643 100644 --- a/dev/Styles/Compose.less +++ b/dev/Styles/Compose.less @@ -12,8 +12,158 @@ } } - .textAreaParent { + .textAreaParent, .attachmentAreaParent { overflow: hidden; + position: relative; + } + + .attachmentAreaParent { + padding: 10px 10px 6px 10px; + background: #ddd; + border-top: 1px solid #ccc; + + overflow-y: auto; + } + + .attachmentAreaParent { + + .no-attachments-desc { + padding: 50px 10px; + text-align: center; + font-size: 24px; + color: #666; + text-shadow: 0 1px 0 #fff; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + } + + .attachmentList { + + margin: 0; + padding: 10px; + + .attachmentItem { + + display: inline-block; + margin: 3px 6px;; + max-width: 200px; + min-width: 60px; + overflow: hidden; + /*cursor: pointer;*/ + list-style: none; + line-height: 24px; + border: 0; + background-color: #fff; + box-shadow: 0 1px 5px #ccc; + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.04), 0 1px 5px rgba(0, 0, 0, 0.1); + + border-radius: 2px; + + &.waiting { + opacity: 0.6; + } + + &.error { + .attachmentIcon, .attachmentSize, .attachmentName { + color: red; + } + } + + .attachmentIconParent { + + position: relative; + + height: 56px; + width: 60px; + + background: none; + + .iconPreview, .iconBG, .iconMain, .iconProgress { + position: absolute; + top: 0; + left: 0; + + display: inline-block; + width: 100%; + height: 100%; + } + + .iconProgress { + background: #eee; + width: 0%; + } + + .iconBG { + font-size: 18px; + text-align: center; + color: #999; + font-weight: bold; + line-height: 55px; + + text-shadow: 0 1px 0 #FFF; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); + } + + .iconPreview { + display: none; + + background: #555; + background-image: none; + background: rgba(0, 0, 0, .5) !important; + + .attachmentIcon { + color: #fff; + text-shadow: 0 1px 0 #000; + } + } + } + + .attachmentNameParent { + + position: relative; + + margin-left: 60px; + padding: 4px; + padding-left: 6px; + min-width: 90px; + + color: #333; + background: #fafafa; + border-left: 1px solid #ddd; + } + + .attachmentIcon { + margin: 6px 0 0 13px; + font-size: 36px; + width: 36px; + height: 36px; + color: #aaa; + } + + .attachmentIconParent.hasPreview:hover { + .iconPreview { + display: inline-block; + } + .iconMain { + display: none; + } + } + + .showPreview { + display: none; + } + + .attachmentIconParent.hasPreview { + .showPreview { + display: inline; + } + + .hidePreview { + display: none; + } + } + } + } } .b-header-toolbar { diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less index da764aa40..2bd35162d 100644 --- a/dev/Styles/Layout.less +++ b/dev/Styles/Layout.less @@ -230,6 +230,51 @@ html.rl-no-preview-pane { } } +html.rl-bottom-preview-pane { + + #rl-sub-left { + right: @rlBottomMargin !important; + width: inherit; + + .b-message-list-wrapper { + bottom: inherit; + height: 300px; + + box-shadow: none; + } + + .messageList .inputSearch { + width: 300px !important; + } + } + + #rl-sub-right { + + left: 0 !important; + + .messageView .top-toolbar { + display: none; + } + + .b-message-view-wrapper { + top: 356px; + left: 0; + right: 5px; + + + box-shadow: none; + } + + .message-fixed-button-toolbar { + top: 370px; + } + } + + #rl-right .ui-resizable-handle { + display: none !important; + } +} + .visible-on-ctrl, .visible-on-ctrl-btn { display: none; } diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less index 61f2d45b9..aea2a97b5 100644 --- a/dev/Styles/MessageView.less +++ b/dev/Styles/MessageView.less @@ -30,12 +30,11 @@ html.rl-no-preview-pane { top: 50px + @rlLowMargin; bottom: @rlLowMargin + @rlBottomMargin; right: @rlLowMargin; - left: -1px; - overflow: hidden; + left: -2px; + /*overflow: hidden;*/ border: @rlLowBorderSize solid @rlMainDarkColor; - .border-top-right-radius(@rlLowBorderRadius); - .border-bottom-right-radius(@rlLowBorderRadius); + .border-radius(@rlLowBorderRadius); background-color: #fff; @@ -58,8 +57,8 @@ html.rl-no-preview-pane { text-align: center; font-size: 24px; line-height: 30px; - padding-top: 120px; color: #999; + padding: 120px 10px 0 10px; } .b-message-view-desc.error { @@ -70,7 +69,10 @@ html.rl-no-preview-pane { -webkit-overflow-scrolling: touch; } - .messageItemDropdown { + .message-fixed-button-toolbar { + + float: right; + z-index: 100; position: fixed; top: 70px; @@ -155,7 +157,7 @@ html.rl-no-preview-pane { margin: 0 5px 0 0; background: #fff; border: 1px solid #ccc; - border-radius: 10px; + border-radius: 6px; box-sizing: border-box; } @@ -240,10 +242,8 @@ html.rl-no-preview-pane { max-width: 200px; min-width: 60px; overflow: hidden; - cursor: pointer; list-style: none; line-height: 24px; - /*border: 2px solid grey;*/ border: 0; background-color: #fff; box-shadow: 0 1px 5px #ccc; @@ -294,6 +294,8 @@ html.rl-no-preview-pane { padding-left: 6px; min-width: 90px; + cursor: pointer; + color: #333; background: #fafafa; border-left: 1px solid #ddd; @@ -441,7 +443,7 @@ html.rl-no-preview-pane { &.message-focused .b-content { z-index: 102; - box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.3); + box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.2); border-radius: @rlLowBorderRadius; border-color: darken(@rlMainDarkColor, 5%); } @@ -479,26 +481,26 @@ html.rl-message-fullscreen { } .messageView .b-content { - position: fixed; - margin: 5px; - top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 10000; - border: @rlLowBorderSize solid @rlMainDarkColor; - border-radius: @rlLowBorderRadius; + position: fixed !important; + margin: 5px !important; + top: 0 !important; + left: 0 !important; + right: 0 !important; + bottom: 0 !important; + z-index: 10000 !important; + border: @rlLowBorderSize solid @rlMainDarkColor !important; + border-radius: @rlLowBorderRadius !important; - .messageItemDropdown { - top: 20px; + .message-fixed-button-toolbar { + top: 20px !important; } .buttonUnFull { - display: inline-block; + display: inline-block !important; } .buttonFull { - display: none; + display: none !important; } } } diff --git a/dev/Styles/SystemDropDown.less b/dev/Styles/SystemDropDown.less index 8aa437661..882e1238e 100644 --- a/dev/Styles/SystemDropDown.less +++ b/dev/Styles/SystemDropDown.less @@ -34,6 +34,29 @@ vertical-align: middle; } + .accountPlace { + background-color: #000; + background-color: rgba(0, 0, 0, 0.5); + + color: #fff; + text-shadow: 0 1px 0 #000; + + position: absolute; + top: 11px; + right: 70px; + display: inline-block; + height: 28px; + max-width: 250px; + border-radius: 4px; + font-size: 16px; + line-height: 30px; + padding: 1px 8px; + overflow: hidden; + text-overflow: ellipsis; + border-radius: 4px; + font-weight: bold; + } + .account-item { .icon-ok { @@ -57,4 +80,8 @@ .g-ui-menu .e-link.account-item { padding-right: 5px; } +} + +html.ssm-state-mobile .accountPlace { + max-width: 150px !important; } \ No newline at end of file diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index 83ec3d92b..595c716cb 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -135,6 +135,8 @@ html.rgba.textshadow { text-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2); padding: 5px 10px; border-radius: 2px; + overflow: hidden; + text-overflow: ellipsis; } .tooltip-big { diff --git a/dev/Styles/_Values.less b/dev/Styles/_Values.less index a30e71fd4..c81735ba1 100644 --- a/dev/Styles/_Values.less +++ b/dev/Styles/_Values.less @@ -10,7 +10,7 @@ @rlMainBorderRadius: 5px; @rlLowBorderRadius: 3px; -@rlMainShadow: 0px 2px 8px rgba(0, 0, 0, 0.3); +@rlMainShadow: 0px 2px 8px rgba(0, 0, 0, 0.2); @rlLowMargin: 8px; @rlBottomMargin: 5px; diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 6ab63bca4..41317684c 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -51,6 +51,9 @@ var self = this, + fResizeSub = function () { + Utils.windowResize(); + }, fCcAndBccCheckHelper = function (aValue) { if (false === self.showCcAndBcc() && 0 < aValue.length) { @@ -89,6 +92,7 @@ this.emptyToError = ko.observable(false); this.attachmentsInProcessError = ko.observable(false); + this.attachmentsInErrorError = ko.observable(false); this.showCcAndBcc = ko.observable(false); this.cc.subscribe(fCcAndBccCheckHelper, this); @@ -101,21 +105,45 @@ this.attachments = ko.observableArray([]); this.attachmentsInProcess = this.attachments.filter(function (oItem) { - return oItem && '' === oItem.tempName(); + return oItem && !oItem.complete(); }); this.attachmentsInReady = this.attachments.filter(function (oItem) { - return oItem && '' !== oItem.tempName(); + return oItem && oItem.complete(); }); - this.attachments.subscribe(function () { - this.triggerForResize(); + this.attachmentsInError = this.attachments.filter(function (oItem) { + return oItem && '' !== oItem.error(); + }); + + this.attachmentsCount = ko.computed(function () { + return this.attachments().length; + }, this); + + this.attachmentsInErrorCount = ko.computed(function () { + return this.attachmentsInError().length; + }, this); + + this.attachmentsInProcessCount = ko.computed(function () { + return this.attachmentsInProcess().length; }, this); this.isDraftFolderMessage = ko.computed(function () { return '' !== this.draftFolder() && '' !== this.draftUid(); }, this); + this.attachmentsPlace = ko.observable(false); + + this.attachments.subscribe(fResizeSub); + this.attachmentsPlace.subscribe(fResizeSub); + + this.attachmentsInErrorCount.subscribe(function (iN) { + if (0 === iN) + { + this.attachmentsInErrorError(false); + } + }, this); + this.composeUploaderButton = ko.observable(null); this.composeUploaderDropPlace = ko.observable(null); this.dragAndDropEnabled = ko.observable(false); @@ -227,6 +255,7 @@ this.saveMessageResponse = _.bind(this.saveMessageResponse, this); this.sendCommand = Utils.createCommand(this, function () { + var sTo = Utils.trim(this.to()), sSentFolder = Data.sentFolder(), @@ -236,6 +265,12 @@ if (0 < this.attachmentsInProcess().length) { this.attachmentsInProcessError(true); + this.attachmentsPlace(true); + } + else if (0 < this.attachmentsInError().length) + { + this.attachmentsInErrorError(true); + this.attachmentsPlace(true); } else if (0 === sTo.length) { @@ -1111,6 +1146,7 @@ if (oAttachment) { oAttachment.tempName(sTempName); + oAttachment.waiting(false).uploading(false).complete(true); } } } @@ -1118,7 +1154,7 @@ } else { - self.setMessageAttachmentFailedDowbloadText(); + self.setMessageAttachmentFailedDownloadText(); } }, aDownloads); @@ -1480,7 +1516,7 @@ if (oItem) { - oItem.progress(' - ' + window.Math.floor(iLoaded / iTotal * 100) + '%'); + oItem.progress(window.Math.floor(iLoaded / iTotal * 100)); } }, this)) @@ -1499,9 +1535,14 @@ this.attachments.push(oAttachment); + this.attachmentsPlace(true); + if (0 < mSize && 0 < iAttachmentSizeLimit && iAttachmentSizeLimit < mSize) { - oAttachment.error(Utils.i18n('UPLOAD/ERROR_FILE_IS_TOO_BIG')); + oAttachment + .waiting(false).uploading(true).complete(true) + .error(Utils.i18n('UPLOAD/ERROR_FILE_IS_TOO_BIG')); + return false; } @@ -1529,8 +1570,7 @@ if (oItem) { - oItem.waiting(false); - oItem.uploading(true); + oItem.waiting(false).uploading(true).complete(false); } }, this)) @@ -1562,6 +1602,7 @@ oAttachment .waiting(false) .uploading(false) + .complete(true) .error(sError) ; } @@ -1570,6 +1611,7 @@ oAttachment .waiting(false) .uploading(false) + .complete(true) ; oAttachment.initByUploadJson(oAttachmentJson); @@ -1639,7 +1681,7 @@ oAttachment.fromMessage = true; oAttachment.cancel = this.cancelAttachmentHelper(oMessage.requestHash); - oAttachment.waiting(false).uploading(true); + oAttachment.waiting(false).uploading(true).complete(true); this.attachments.push(oAttachment); } @@ -1663,13 +1705,15 @@ oAttachment.fromMessage = false; oAttachment.cancel = this.cancelAttachmentHelper(oDropboxFile['link']); - oAttachment.waiting(false).uploading(true); + oAttachment.waiting(false).uploading(true).complete(false); this.attachments.push(oAttachment); + this.attachmentsPlace(true); + if (0 < mSize && 0 < iAttachmentSizeLimit && iAttachmentSizeLimit < mSize) { - oAttachment.uploading(false); + oAttachment.uploading(false).complete(true); oAttachment.error(Utils.i18n('UPLOAD/ERROR_FILE_IS_TOO_BIG')); return false; } @@ -1677,7 +1721,7 @@ Remote.composeUploadExternals(function (sResult, oData) { var bResult = false; - oAttachment.uploading(false); + oAttachment.uploading(false).complete(true); if (Enums.StorageResultType.Success === sResult && oData && oData.Result) { @@ -1717,13 +1761,15 @@ oAttachment.fromMessage = false; oAttachment.cancel = this.cancelAttachmentHelper(oDriveFile['downloadUrl']); - oAttachment.waiting(false).uploading(true); + oAttachment.waiting(false).uploading(true).complete(false); this.attachments.push(oAttachment); + this.attachmentsPlace(true); + if (0 < mSize && 0 < iAttachmentSizeLimit && iAttachmentSizeLimit < mSize) { - oAttachment.uploading(false); + oAttachment.uploading(false).complete(true); oAttachment.error(Utils.i18n('UPLOAD/ERROR_FILE_IS_TOO_BIG')); return false; } @@ -1731,7 +1777,7 @@ Remote.composeUploadDrive(function (sResult, oData) { var bResult = false; - oAttachment.uploading(false); + oAttachment.uploading(false).complete(true); if (Enums.StorageResultType.Success === sResult && oData && oData.Result) { @@ -1803,7 +1849,7 @@ oAttachment.fromMessage = true; oAttachment.cancel = this.cancelAttachmentHelper(oItem.download); - oAttachment.waiting(false).uploading(true); + oAttachment.waiting(false).uploading(true).complete(false); this.attachments.push(oAttachment); } @@ -1825,7 +1871,7 @@ } }; - ComposePopupView.prototype.setMessageAttachmentFailedDowbloadText = function () + ComposePopupView.prototype.setMessageAttachmentFailedDownloadText = function () { _.each(this.attachments(), function(oAttachment) { if (oAttachment && oAttachment.fromMessage) @@ -1833,6 +1879,7 @@ oAttachment .waiting(false) .uploading(false) + .complete(true) .error(Utils.getUploadErrorDescByCode(Enums.UploadErrorCode.FileNoUploaded)) ; } @@ -1869,6 +1916,8 @@ this.requestReadReceipt(false); this.markAsImportant(false); + this.attachmentsPlace(false); + this.aDraftInfo = null; this.sInReplyTo = ''; this.bFromDraft = false; diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index ebea101b0..e135689cb 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -81,7 +81,7 @@ this.dragOverBodyArea = ko.observable(null); this.messageListItemTemplate = ko.computed(function () { - return Enums.Layout.NoPreview !== Data.layout() ? + return Enums.Layout.SidePreview === Data.layout() ? 'MailMessageListItem' : 'MailMessageListItemNoPreviewPane'; }); diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 1b239c3a3..300564ea3 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -345,27 +345,8 @@ } }, this); -// $('.attachmentsPlace', oDom).magnificPopup({ -// 'delegate': '.attachmentImagePreview:visible', -// 'type': 'image', -// 'gallery': { -// 'enabled': true, -// 'preload': [1, 1], -// 'navigateByImgClick': true -// }, -// 'callbacks': { -// 'open': function() { -// Globals.useKeyboardShortcuts(false); -// }, -// 'close': function() { -// Globals.useKeyboardShortcuts(true); -// } -// }, -// 'mainClass': 'mfp-fade', -// 'removalDelay': 400 -// }); - this.pswpDom = $('.pswp', oDom)[0]; + if (this.pswpDom) { oDom @@ -375,18 +356,31 @@ oPs = null, oEl = oEvent.currentTarget || null, aItems = [] +// fThumbBoundsFn = function (index) { +// var oRes = null, oEl = aItems[index], oPos = null; +// if (oEl && oEl.el) +// { +// oPos = oEl.el.find('.iconBG').offset(); +// oRes = oPos && oPos.top && oPos.left ? +// {x: oPos.left, y: oPos.top, w: 60} : null; +// } +// +// return oRes; +// } ; oDom.find('.attachmentImagePreview[data-index]').each(function (index, oSubElement) { - var $oItem = $(oSubElement); + var + $oItem = $(oSubElement) + ; aItems.push({ - w: 600, h: 400, +// 'el': $oItem, + 'w': 600, 'h': 400, 'src': $oItem.attr('href'), 'title': $oItem.attr('title') || '' }); - }); if (aItems && 0 < aItems.length) @@ -400,6 +394,7 @@ 'errorMsg': '
' + sErrorMessage + '
', 'showHideOpacity': true, 'tapToToggleControls': false, +// 'getThumbBoundsFn': fThumbBoundsFn, 'timeToIdle': 0, 'timeToIdleOutside': 0, 'history': false, @@ -414,7 +409,7 @@ item.w = item.img.width; item.h = item.img.height; - oPs.updateSize(); + oPs.updateSize(true); } }); @@ -434,13 +429,13 @@ // setup maito protocol return !(!!oEvent && 3 !== oEvent['which'] && Utils.mailToHelper($(this).attr('href'), require('View/Popup/Compose'))); }) - .on('click', '.attachmentsPlace .attachmentPreview', function (oEvent) { + .on('click', '.attachmentsPlace .attachmentIconParent', function (oEvent) { if (oEvent && oEvent.stopPropagation) { oEvent.stopPropagation(); } }) - .on('click', '.attachmentsPlace .attachmentItem', function () { + .on('click', '.attachmentsPlace .attachmentItem .attachmentNameParent', function () { var oAttachment = ko.dataFor(this) diff --git a/gulpfile.js b/gulpfile.js index 67b9196ad..5011a3d9e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -95,8 +95,6 @@ cfg.paths.css = { 'vendors/normalize/normalize.css', 'vendors/fontastic/styles.css', 'vendors/jquery-nanoscroller/nanoscroller.css', -// 'vendors/jquery-magnific-popup/magnific-popup.css', -// 'vendors/jquery-magnific-popup/magnific-popup-animations.css', 'vendors/jquery-letterfx/jquery-letterfx.min.css', 'vendors/simple-pace/styles.css', 'vendors/inputosaurus/inputosaurus.css', @@ -390,12 +388,6 @@ regOtherMinTask('other:pace', 'vendors/simple-pace/', 'simple-pace.js', 'simple- 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'); -gulp.task('package-inc-release', function() { - fs.writeFileSync('package.json', - fs.readFileSync('package.json', 'utf8').replace(/"release":\s?"[\d]+",/, '"release": "' + - (1 + parseInt(pkg.release, 10)) + '",')); -}); - gulp.task('fontastic-fonts:clear', function() { return cleanDir('rainloop/v/' + cfg.devVersion + '/static/css/fonts/rainloop.*'); }); @@ -537,8 +529,6 @@ gulp.task('default', ['js:libs', 'js:boot', 'js:openpgp', 'js:min', 'css:main:mi gulp.task('fast', ['js:app', 'js:admin', 'js:chunks', 'css:main']); gulp.task('rainloop', ['js:lint', 'rainloop:copy', 'rainloop:setup', 'rainloop:zip', 'rainloop:md5', 'rainloop:clean']); -gulp.task('rainloop+', ['rainloop', 'package-inc-release']); - gulp.task('owncloud', ['rainloop:owncloud:copy', 'rainloop:owncloud:setup', 'rainloop:owncloud:zip', 'rainloop:owncloud:md5', 'rainloop:owncloud:clean']); //WATCH @@ -547,16 +537,13 @@ gulp.task('watch', ['fast'], function() { gulp.watch(cfg.paths.less.main.watch, {interval: 500}, ['css:main']); }); -// aliases +// ALIASES gulp.task('w', ['watch']); gulp.task('f', ['fast']); gulp.task('rl', ['rainloop']); -gulp.task('rl+', ['rainloop+']); gulp.task('build', ['rainloop']); -gulp.task('build+', ['rainloop+']); gulp.task('b', ['build']); -gulp.task('b+', ['build+']); gulp.task('own', ['owncloud']); gulp.task('js:hint', ['js:lint']); \ No newline at end of file diff --git a/index.php b/index.php index 5ba5d470e..3731a17e7 100644 --- a/index.php +++ b/index.php @@ -7,9 +7,9 @@ if (!defined('APP_VERSION')) define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/')); } -if (file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/index.php')) +if (file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/include.php')) { - include APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/index.php'; + include APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/include.php'; } else { diff --git a/package.json b/package.json index a18856dc0..f14556c78 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.7.2", - "release": "220", + "release": "224", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "gulpfile.js", diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php index 6882f082f..4d258380b 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php @@ -882,7 +882,6 @@ class Utils 'p7c' => 'application/pkcs7-mime', 'p7m' => 'application/pkcs7-mime', 'p7s' => 'application/pkcs7-signature', - 'ttf' => 'application/x-ttf', 'torrent' => 'application/x-bittorrent', // scripts @@ -963,7 +962,6 @@ class Utils 'flv' => 'video/x-flv', 'qt' => 'video/quicktime', 'mov' => 'video/quicktime', - 'wmv' => 'video/windows-media', 'avi' => 'video/x-msvideo', 'mpg' => 'video/mpeg', 'mpeg' => 'video/mpeg', @@ -976,6 +974,7 @@ class Utils 'h263' => 'video/h263', 'h264' => 'video/h264', 'jpgv' => 'video/jpgv', + 'mp4' => 'video/mp4', 'mp4v' => 'video/mp4', 'mpg4' => 'video/mp4', 'ogv' => 'video/ogg', diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php index f59c3576d..fdf0dc35b 100644 --- a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php @@ -2067,7 +2067,7 @@ class Actions } return $this->TrueResponse(__FUNCTION__); - return $this->DefaultResponse(__FUNCTION__, $this->FiltersProvider()->Save($aFilters)); +// return $this->DefaultResponse(__FUNCTION__, $this->FiltersProvider()->Save($aFilters)); } /** @@ -2539,6 +2539,9 @@ class Actions case \RainLoop\Enumerations\Capa::GRAVATAR: $this->setConfigFromParams($oConfig, $sParamName, 'labs', 'allow_gravatar', 'bool'); break; + case \RainLoop\Enumerations\Capa::ATTACHMENT_THUMBNAILS: + $this->setConfigFromParams($oConfig, $sParamName, 'interface', 'show_attachment_thumbnail', 'bool'); + break; case \RainLoop\Enumerations\Capa::THEMES: $this->setConfigFromParams($oConfig, $sParamName, 'webmail', 'allow_themes', 'bool'); break; @@ -2636,6 +2639,7 @@ class Actions $this->setCapaFromParams($oConfig, 'CapaGravatar', \RainLoop\Enumerations\Capa::GRAVATAR); $this->setCapaFromParams($oConfig, 'CapaThemes', \RainLoop\Enumerations\Capa::THEMES); $this->setCapaFromParams($oConfig, 'CapaUserBackground', \RainLoop\Enumerations\Capa::USER_BACKGROUND); + $this->setCapaFromParams($oConfig, 'CapaAttachmentThumbnails', \RainLoop\Enumerations\Capa::ATTACHMENT_THUMBNAILS); $this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool'); $this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool'); @@ -3538,6 +3542,19 @@ class Actions \is_file(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion.'/index.php')) { $bResult = \copy($sTmpFolder.'/index.php', APP_INDEX_ROOT_PATH.'index.php'); + + if ($bResult) + { + if (\MailSo\Base\Utils::FunctionExistsAndEnabled('opcache_invalidate')) + { + @\opcache_invalidate(APP_INDEX_ROOT_PATH.'index.php', true); + } + + if (\MailSo\Base\Utils::FunctionExistsAndEnabled('apc_delete_file')) + { + @\apc_delete_file(APP_INDEX_ROOT_PATH.'index.php'); + } + } } else { @@ -3577,6 +3594,7 @@ class Actions $aDirs = @\array_map('basename', @\array_filter(@\glob($sVPath.'*'), 'is_dir')); $this->Logger()->Write('Versions GC: Count:'.(\is_array($aDirs) ? \count($aDirs) : 0)); + if (\is_array($aDirs) && 5 < \count($aDirs)) { \uasort($aDirs, 'version_compare'); @@ -6945,6 +6963,11 @@ class Actions $aResult[] = \RainLoop\Enumerations\Capa::GRAVATAR; } + if ($oConfig->Get('interface', 'show_attachment_thumbnail', true)) + { + $aResult[] = \RainLoop\Enumerations\Capa::ATTACHMENT_THUMBNAILS; + } + if ($oConfig->Get('labs', 'allow_prefetch', false)) { $aResult[] = \RainLoop\Enumerations\Capa::PREFETCH; @@ -8017,6 +8040,7 @@ class Actions $bHook = true; $sClassName = \get_class($mResponse); $bHasSimpleJsonFunc = \method_exists($mResponse, 'ToSimpleJSON'); + $bThumb = $this->GetCapa(false, \RainLoop\Enumerations\Capa::ATTACHMENT_THUMBNAILS); if ($bHasSimpleJsonFunc) { @@ -8278,7 +8302,7 @@ class Actions 'CID' => $mResponse->Cid(), 'ContentLocation' => $mResponse->ContentLocation(), 'IsInline' => $mResponse->IsInline(), - 'IsThumbnail' => !!$this->Config()->Get('interface', 'show_attachment_thumbnail', true), + 'IsThumbnail' => $bThumb, 'IsLinked' => ($mFoundedCIDs && \in_array(\trim(\trim($mResponse->Cid()), '<>'), $mFoundedCIDs)) || ($mFoundedContentLocationUrls && \in_array(\trim($mResponse->ContentLocation()), $mFoundedContentLocationUrls)) )); @@ -8300,8 +8324,6 @@ class Actions 'FileName' => $mResult['FileName'], 'Framed' => $mResult['Framed'] )); - - $this->Logger()->WriteDump($mResult); } else if ('MailSo\Mail\Folder' === $sClassName) { diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Config/AbstractConfig.php b/rainloop/v/0.0.0/app/src/RainLoop/Config/AbstractConfig.php index 5722e6ce3..6403e7940 100644 --- a/rainloop/v/0.0.0/app/src/RainLoop/Config/AbstractConfig.php +++ b/rainloop/v/0.0.0/app/src/RainLoop/Config/AbstractConfig.php @@ -151,7 +151,7 @@ abstract class AbstractConfig if (\is_int($iMTime) && 0 < $iMTime) { $sKey = $this->cacheKey(); - + \apc_store($sKey.'time', $iMTime); \apc_store($sKey.'data', $this->aData); @@ -161,7 +161,7 @@ abstract class AbstractConfig return false; } - + /** * @return bool */ @@ -192,7 +192,7 @@ abstract class AbstractConfig return true; } - $aData = @\parse_ini_file($this->sFile, true); + $aData = \RainLoop\Utils::CustomParseIniFile($this->sFile, true); if (\is_array($aData) && 0 < count($aData)) { foreach ($aData as $sSectionKey => $aSectionValue) diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Enumerations/Capa.php b/rainloop/v/0.0.0/app/src/RainLoop/Enumerations/Capa.php index 02e9953f8..de98ef967 100644 --- a/rainloop/v/0.0.0/app/src/RainLoop/Enumerations/Capa.php +++ b/rainloop/v/0.0.0/app/src/RainLoop/Enumerations/Capa.php @@ -12,6 +12,7 @@ class Capa const THEMES = 'THEMES'; const USER_BACKGROUND = 'USER_BACKGROUND'; const SIEVE = 'SIEVE'; + const ATTACHMENT_THUMBNAILS = 'ATTACHMENT_THUMBNAILS'; const ADDITIONAL_ACCOUNTS = 'ADDITIONAL_ACCOUNTS'; const ADDITIONAL_IDENTITIES = 'ADDITIONAL_IDENTITIES'; } diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Providers/Domain/DefaultDomain.php b/rainloop/v/0.0.0/app/src/RainLoop/Providers/Domain/DefaultDomain.php index e23a3eed1..3ce150c5e 100644 --- a/rainloop/v/0.0.0/app/src/RainLoop/Providers/Domain/DefaultDomain.php +++ b/rainloop/v/0.0.0/app/src/RainLoop/Providers/Domain/DefaultDomain.php @@ -166,7 +166,7 @@ class DefaultDomain implements \RainLoop\Providers\Domain\DomainAdminInterface if (\file_exists($this->sDomainPath.'/'.$sRealFileName.'.ini') && (!$bCheckDisabled || 0 === \strlen($sDisabled) || false === \strpos(','.$sDisabled.',', ','.\MailSo\Base\Utils::IdnToAscii($sName, true).','))) { - $aDomain = @\parse_ini_file($this->sDomainPath.'/'.$sRealFileName.'.ini'); + $aDomain = \RainLoop\Utils::CustomParseIniFile($this->sDomainPath.'/'.$sRealFileName.'.ini'); // fix misspellings (#119) if (\is_array($aDomain)) { diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Utils.php b/rainloop/v/0.0.0/app/src/RainLoop/Utils.php index 9190c6326..23a1a516a 100644 --- a/rainloop/v/0.0.0/app/src/RainLoop/Utils.php +++ b/rainloop/v/0.0.0/app/src/RainLoop/Utils.php @@ -149,16 +149,16 @@ class Utils } /** - * @param string $FileName + * @param string $sFileName * @param array $aResultLang * * @return void */ - public static function ReadAndAddLang($FileName, &$aResultLang) + public static function ReadAndAddLang($sFileName, &$aResultLang) { - if (\file_exists($FileName)) + if (\file_exists($sFileName)) { - $aLang = @\parse_ini_file($FileName, true); + $aLang = \RainLoop\Utils::CustomParseIniFile($sFileName, true); if (\is_array($aLang)) { foreach ($aLang as $sKey => $mValue) @@ -307,6 +307,23 @@ class Utils @\setcookie($sName, '', \time() - 3600 * 24 * 30, '/'); } + /** + * @param string $sFileName + * @param bool $bProcessSections = false + * + * @return array + */ + public static function CustomParseIniFile($sFileName, $bProcessSections = false) + { + if (\MailSo\Base\Utils::FunctionExistsAndEnabled('parse_ini_file')) + { + return @\parse_ini_file($sFileName, !!$bProcessSections); + } + + $sData = @\file_get_contents($sFileName); + return \is_string($sData) ? @\parse_ini_string($sData, !!$bProcessSections) : null; + } + public static function CustomBaseConvert($sNumberInput, $sFromBaseInput = '0123456789', $sToBaseInput = '0123456789') { if ($sFromBaseInput === $sToBaseInput) diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html index ed2f00833..b11fc30ee 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html +++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html @@ -76,6 +76,14 @@
+
- -
\ No newline at end of file +
  • +
    +
    + +
    +
    +
    +
    +
    + +
    +   +
    +
    +   +
    +
    +
    • \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/User/ComposeAttachmentInProcess.html b/rainloop/v/0.0.0/app/templates/Views/User/ComposeAttachmentInProcess.html deleted file mode 100644 index 12110f313..000000000 --- a/rainloop/v/0.0.0/app/templates/Views/User/ComposeAttachmentInProcess.html +++ /dev/null @@ -1,13 +0,0 @@ -
    - × - - - -    - () - - -
    - -
    -
    \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html index c42dc28cf..794dc5a35 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -1,10 +1,10 @@
    -
    +
    -
    +
    @@ -42,7 +42,7 @@
    -
    +
    @@ -57,124 +57,131 @@
    @@ -295,7 +302,8 @@
    -
    +
    @@ -139,18 +139,33 @@
    -
    -
    -
    - - - -
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html index 668670b66..e5001f7e5 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html @@ -38,6 +38,23 @@ }">
    +
    + +
    +
    +
    +
    @@ -74,13 +91,6 @@ value: useCheckboxesInList } }">
    -
    +
    - - +    diff --git a/rainloop/v/0.0.0/include.php b/rainloop/v/0.0.0/include.php new file mode 100644 index 000000000..b4fbb0b7b --- /dev/null +++ b/rainloop/v/0.0.0/include.php @@ -0,0 +1,212 @@ + +Options -Indexes +'); + + define('APP_START_TIME', time()); + define('APP_REQUEST_RND', md5(APP_START.rand(10000, 99999).APP_START)); + define('APP_VERSION_ROOT_PATH', APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/'); + + define('APP_USE_APC_CACHE', true); + + $sCustomDataPath = ''; + if (file_exists(APP_INDEX_ROOT_PATH.'include.php')) + { + include_once APP_INDEX_ROOT_PATH.'include.php'; + $sCustomDataPath = function_exists('__get_custom_data_full_path') ? rtrim(trim(__get_custom_data_full_path()), '\\/') : ''; + } + + define('APP_DATA_FOLDER_PATH', 0 === strlen($sCustomDataPath) ? APP_INDEX_ROOT_PATH.'data/' : $sCustomDataPath.'/'); + unset($sCustomDataPath); + + if (function_exists('date_default_timezone_set')) + { + date_default_timezone_set('UTC'); + } + + $sSite = strtolower(trim(empty($_SERVER['HTTP_HOST']) ? (empty($_SERVER['SERVER_NAME']) ? '' : $_SERVER['SERVER_NAME']) : $_SERVER['HTTP_HOST'])); + $sSite = 'www.' === substr($sSite, 0, 4) ? substr($sSite, 4) : $sSite; + $sSite = preg_replace('/^.+@/', '', preg_replace('/:[\d]+$/', '', $sSite)); + $sSite = in_array($sSite, array('localhost', '127.0.0.1', '::1', '::1/128', '0:0:0:0:0:0:0:1')) ? 'localhost' : $sSite; + + define('APP_SITE', $sSite); + define('APP_SITE_CLEAR', 0 < strlen(APP_SITE) ? trim(preg_replace('/[^a-zA-Z0-9_.\-]+/', '_', trim(strtolower(APP_SITE))), ' _') : ''); + + define('APP_DEFAULT_PRIVATE_DATA_NAME', '_default_'); + + $sPrivateDataFolderInternalName = @file_exists(APP_INDEX_ROOT_PATH.'MULTIPLY') ? APP_SITE : ''; + define('APP_PRIVATE_DATA_NAME', 0 === strlen($sPrivateDataFolderInternalName) ? APP_DEFAULT_PRIVATE_DATA_NAME : $sPrivateDataFolderInternalName); + define('APP_MULTIPLY', 0 < strlen($sPrivateDataFolderInternalName) && APP_DEFAULT_PRIVATE_DATA_NAME !== APP_PRIVATE_DATA_NAME); + + define('APP_DUMMY', '********'); + define('APP_DEV_VERSION', '0.0.0'); + define('APP_API_PATH', 'http://api.rainloop.net/'); + define('APP_REP_PATH', 'http://repository.rainloop.net/v1/'); + define('APP_REPO_CORE_FILE', 'http://repository.rainloop.net/v2/core.{{channel}}.json'); + define('APP_WEB_PATH', 'rainloop/v/'.APP_VERSION.'/'); + define('APP_WEB_STATIC_PATH', APP_WEB_PATH.'static/'); + define('APP_DATA_FOLDER_PATH_UNIX', str_replace('\\', '/', APP_DATA_FOLDER_PATH)); + + $sSalt = @file_get_contents(APP_DATA_FOLDER_PATH.'SALT.php'); + $sData = @file_get_contents(APP_DATA_FOLDER_PATH.'DATA.php'); + $sInstalled = @file_get_contents(APP_DATA_FOLDER_PATH.'INSTALLED'); + + // installation checking data folder + if (APP_VERSION !== $sInstalled) + { + include APP_VERSION_ROOT_PATH.'check.php'; + + $sCheckName = 'delete_if_you_see_it_after_install'; + $sCheckFolder = APP_DATA_FOLDER_PATH.$sCheckName; + $sCheckFilePath = APP_DATA_FOLDER_PATH.$sCheckName.'/'.$sCheckName.'.file'; + + @unlink($sCheckFilePath); + @rmdir($sCheckFolder); + + if (!@is_dir(APP_DATA_FOLDER_PATH)) + { + @mkdir(APP_DATA_FOLDER_PATH, 0755); + } + else + { + @chmod(APP_DATA_FOLDER_PATH, 0755); + } + + $sTest = ''; + switch (true) + { + case !@is_dir(APP_DATA_FOLDER_PATH): + $sTest = 'is_dir'; + break; + case !@is_readable(APP_DATA_FOLDER_PATH): + $sTest = 'is_readable'; + break; + case !@is_writable(APP_DATA_FOLDER_PATH): + $sTest = 'is_writable'; + break; + case !@mkdir($sCheckFolder, 0755): + $sTest = 'mkdir'; + break; + case false === @file_put_contents($sCheckFilePath, time()): + $sTest = 'file_put_contents'; + break; + case !@unlink($sCheckFilePath): + $sTest = 'unlink'; + break; + case !@rmdir($sCheckFolder): + $sTest = 'rmdir'; + break; + } + + if (!empty($sTest)) + { + echo '[202] Data folder permisions error ['.$sTest.']'; + exit(202); + } + + unset($sCheckName, $sCheckFilePath, $sCheckFolder, $sTest); + } + + if (false === $sSalt || false === $sData) + { + if (false === $sSalt) + { + // random salt + $sSalt = '<'.'?php //' + .md5(microtime(true).rand(1000, 5000)) + .md5(microtime(true).rand(5000, 9999)) + .md5(microtime(true).rand(1000, 5000)); + + @file_put_contents(APP_DATA_FOLDER_PATH.'SALT.php', $sSalt); + } + + if (false === $sData) + { + // random data folder name + $sData = '<'.'?php //'.md5(microtime(true).rand(1000, 9999)); + @file_put_contents(APP_DATA_FOLDER_PATH.'DATA.php', $sData); + } + } + + define('APP_SALT', md5($sSalt.APP_PRIVATE_DATA_NAME.$sSalt)); + define('APP_PRIVATE_DATA', APP_DATA_FOLDER_PATH.'_data_'.md5($sData).'/'.APP_PRIVATE_DATA_NAME.'/'); + define('APP_PLUGINS_PATH', APP_PRIVATE_DATA.'plugins/'); + + if (APP_VERSION !== $sInstalled || (APP_MULTIPLY && !@is_dir(APP_PRIVATE_DATA))) + { + define('APP_INSTALLED_START', true); + define('APP_INSTALLED_VERSION', $sInstalled); + + @file_put_contents(APP_DATA_FOLDER_PATH.'INSTALLED', APP_VERSION); + @file_put_contents(APP_DATA_FOLDER_PATH.'index.html', 'Forbidden'); + @file_put_contents(APP_DATA_FOLDER_PATH.'index.php', 'Forbidden'); + @file_put_contents(APP_DATA_FOLDER_PATH.'.htaccess', APP_DEFAULT_DENY_ALL_HTACCESS); + + if (!@is_dir(APP_PRIVATE_DATA)) + { + @mkdir(APP_PRIVATE_DATA, 0755, true); + } + + foreach (array('logs', 'cache', 'configs', 'plugins', 'storage') as $sName) + { + if (!@is_dir(APP_PRIVATE_DATA.$sName)) + { + @mkdir(APP_PRIVATE_DATA.$sName, 0755, true); + } + } + + if (!@file_exists(APP_PRIVATE_DATA.'domains/disabled')) + { + if (!@is_dir(APP_PRIVATE_DATA.'domains')) + { + @mkdir(APP_PRIVATE_DATA.'domains', 0755); + } + + if (@is_dir(APP_PRIVATE_DATA.'domains')) + { + $sFile = $sNewFile = ''; + $aFiles = @glob(APP_VERSION_ROOT_PATH.'app/domains/*'); + + if (is_array($aFiles) && 0 < \count($aFiles)) + { + foreach ($aFiles as $sFile) + { + if (@is_file($sFile)) + { + $sNewFile = APP_PRIVATE_DATA.'domains/'.basename($sFile); + if (!@file_exists($sNewFile)) + { + @copy($sFile, $sNewFile); + } + } + } + } + + unset($aFiles, $sFile, $sNewFile); + } + } + } + + unset($sSite, $sSalt, $sData, $sInstalled, $sPrivateDataFolderInternalName); + } + + include APP_VERSION_ROOT_PATH.'app/handle.php'; + + if (defined('RAINLOOP_EXIT_ON_END') && RAINLOOP_EXIT_ON_END) + { + exit(0); + } + } diff --git a/rainloop/v/0.0.0/index.php b/rainloop/v/0.0.0/index.php index 0f4c7e430..e69de29bb 100644 --- a/rainloop/v/0.0.0/index.php +++ b/rainloop/v/0.0.0/index.php @@ -1,197 +0,0 @@ - -Options -Indexes -'); - - define('APP_START_TIME', time()); - define('APP_REQUEST_RND', md5(APP_START.rand(10000, 99999).APP_START)); - define('APP_VERSION_ROOT_PATH', APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/'); - - define('APP_USE_APC_CACHE', true); - - $sCustomDataPath = ''; - if (file_exists(APP_INDEX_ROOT_PATH.'include.php')) - { - include_once APP_INDEX_ROOT_PATH.'include.php'; - $sCustomDataPath = function_exists('__get_custom_data_full_path') ? rtrim(trim(__get_custom_data_full_path()), '\\/') : ''; - } - - define('APP_DATA_FOLDER_PATH', 0 === strlen($sCustomDataPath) ? APP_INDEX_ROOT_PATH.'data/' : $sCustomDataPath.'/'); - unset($sCustomDataPath); - - if (function_exists('date_default_timezone_set')) - { - date_default_timezone_set('UTC'); - } - - $sSite = strtolower(trim(empty($_SERVER['HTTP_HOST']) ? (empty($_SERVER['SERVER_NAME']) ? '' : $_SERVER['SERVER_NAME']) : $_SERVER['HTTP_HOST'])); - $sSite = 'www.' === substr($sSite, 0, 4) ? substr($sSite, 4) : $sSite; - $sSite = preg_replace('/^.+@/', '', preg_replace('/:[\d]+$/', '', $sSite)); - $sSite = in_array($sSite, array('localhost', '127.0.0.1', '::1', '::1/128', '0:0:0:0:0:0:0:1')) ? 'localhost' : $sSite; - - define('APP_SITE', $sSite); - define('APP_SITE_CLEAR', 0 < strlen(APP_SITE) ? trim(preg_replace('/[^a-zA-Z0-9_.\-]+/', '_', trim(strtolower(APP_SITE))), ' _') : ''); - - define('APP_DEFAULT_PRIVATE_DATA_NAME', '_default_'); - - $sPrivateDataFolderInternalName = @file_exists(APP_INDEX_ROOT_PATH.'MULTIPLY') ? APP_SITE : ''; - define('APP_PRIVATE_DATA_NAME', 0 === strlen($sPrivateDataFolderInternalName) ? APP_DEFAULT_PRIVATE_DATA_NAME : $sPrivateDataFolderInternalName); - define('APP_MULTIPLY', 0 < strlen($sPrivateDataFolderInternalName) && APP_DEFAULT_PRIVATE_DATA_NAME !== APP_PRIVATE_DATA_NAME); - - define('APP_DUMMY', '********'); - define('APP_DEV_VERSION', '0.0.0'); - define('APP_API_PATH', 'http://api.rainloop.net/'); - define('APP_REP_PATH', 'http://repository.rainloop.net/v1/'); - define('APP_REPO_CORE_FILE', 'http://repository.rainloop.net/v2/core.{{channel}}.json'); - define('APP_WEB_PATH', 'rainloop/v/'.APP_VERSION.'/'); - define('APP_WEB_STATIC_PATH', APP_WEB_PATH.'static/'); - define('APP_DATA_FOLDER_PATH_UNIX', str_replace('\\', '/', APP_DATA_FOLDER_PATH)); - - $sSalt = @file_get_contents(APP_DATA_FOLDER_PATH.'SALT.php'); - $sData = @file_get_contents(APP_DATA_FOLDER_PATH.'DATA.php'); - $sInstalled = @file_get_contents(APP_DATA_FOLDER_PATH.'INSTALLED'); - - // installation checking data folder - if (APP_VERSION !== $sInstalled) - { - include APP_VERSION_ROOT_PATH.'check.php'; - - $sCheckName = 'delete_if_you_see_it_after_install'; - $sCheckFolder = APP_DATA_FOLDER_PATH.$sCheckName; - $sCheckFilePath = APP_DATA_FOLDER_PATH.$sCheckName.'/'.$sCheckName.'.file'; - - @unlink($sCheckFilePath); - @rmdir($sCheckFolder); - - if (!@is_dir(APP_DATA_FOLDER_PATH)) - { - @mkdir(APP_DATA_FOLDER_PATH, 0755); - } - else - { - @chmod(APP_DATA_FOLDER_PATH, 0755); - } - - $sTest = ''; - switch (true) - { - case !@is_dir(APP_DATA_FOLDER_PATH): - $sTest = 'is_dir'; - break; - case !@is_readable(APP_DATA_FOLDER_PATH): - $sTest = 'is_readable'; - break; - case !@is_writable(APP_DATA_FOLDER_PATH): - $sTest = 'is_writable'; - break; - case !@mkdir($sCheckFolder, 0755): - $sTest = 'mkdir'; - break; - case false === @file_put_contents($sCheckFilePath, time()): - $sTest = 'file_put_contents'; - break; - case !@unlink($sCheckFilePath): - $sTest = 'unlink'; - break; - case !@rmdir($sCheckFolder): - $sTest = 'rmdir'; - break; - } - - if (!empty($sTest)) - { - echo '[202] Data folder permisions error ['.$sTest.']'; - exit(202); - } - - unset($sCheckName, $sCheckFilePath, $sCheckFolder, $sTest); - } - - if (false === $sSalt || false === $sData) - { - if (false === $sSalt) - { - // random salt - $sSalt = '<'.'?php //' - .md5(microtime(true).rand(1000, 5000)) - .md5(microtime(true).rand(5000, 9999)) - .md5(microtime(true).rand(1000, 5000)); - - @file_put_contents(APP_DATA_FOLDER_PATH.'SALT.php', $sSalt); - } - - if (false === $sData) - { - // random data folder name - $sData = '<'.'?php //'.md5(microtime(true).rand(1000, 9999)); - @file_put_contents(APP_DATA_FOLDER_PATH.'DATA.php', $sData); - } - } - - define('APP_SALT', md5($sSalt.APP_PRIVATE_DATA_NAME.$sSalt)); - define('APP_PRIVATE_DATA', APP_DATA_FOLDER_PATH.'_data_'.md5($sData).'/'.APP_PRIVATE_DATA_NAME.'/'); - define('APP_PLUGINS_PATH', APP_PRIVATE_DATA.'plugins/'); - - if (APP_VERSION !== $sInstalled || (APP_MULTIPLY && !@is_dir(APP_PRIVATE_DATA))) - { - define('APP_INSTALLED_START', true); - define('APP_INSTALLED_VERSION', $sInstalled); - - @file_put_contents(APP_DATA_FOLDER_PATH.'INSTALLED', APP_VERSION); - @file_put_contents(APP_DATA_FOLDER_PATH.'index.html', 'Forbidden'); - @file_put_contents(APP_DATA_FOLDER_PATH.'index.php', 'Forbidden'); - @file_put_contents(APP_DATA_FOLDER_PATH.'.htaccess', APP_DEFAULT_DENY_ALL_HTACCESS); - - if (!@is_dir(APP_PRIVATE_DATA)) - { - @mkdir(APP_PRIVATE_DATA, 0755, true); - } - - foreach (array('logs', 'cache', 'configs', 'plugins', 'storage') as $sName) - { - if (!@is_dir(APP_PRIVATE_DATA.$sName)) - { - @mkdir(APP_PRIVATE_DATA.$sName, 0755, true); - } - } - - if (!@file_exists(APP_PRIVATE_DATA.'domains/default.ini')) - { - if (!@is_dir(APP_PRIVATE_DATA.'domains')) - { - @mkdir(APP_PRIVATE_DATA.'domains', 0755); - - @copy(APP_VERSION_ROOT_PATH.'app/domains/disabled', APP_PRIVATE_DATA.'domains/disabled'); - @copy(APP_VERSION_ROOT_PATH.'app/domains/gmail.com.ini', APP_PRIVATE_DATA.'domains/gmail.com.ini'); - @copy(APP_VERSION_ROOT_PATH.'app/domains/yahoo.com.ini', APP_PRIVATE_DATA.'domains/yahoo.com.ini'); - @copy(APP_VERSION_ROOT_PATH.'app/domains/outlook.com.ini', APP_PRIVATE_DATA.'domains/outlook.com.ini'); - @copy(APP_VERSION_ROOT_PATH.'app/domains/qq.com.ini', APP_PRIVATE_DATA.'domains/qq.com.ini'); - } - - @copy(APP_VERSION_ROOT_PATH.'app/domains/default.ini.dist', APP_PRIVATE_DATA.'domains/default.ini'); - } - } - - unset($sSite, $sSalt, $sData, $sInstalled, $sPrivateDataFolderInternalName); - } - - include APP_VERSION_ROOT_PATH.'app/handle.php'; - - if (defined('RAINLOOP_EXIT_ON_END') && RAINLOOP_EXIT_ON_END) - { - exit(0); - } - } diff --git a/rainloop/v/0.0.0/langs/bg.ini b/rainloop/v/0.0.0/langs/bg.ini index 821be75e0..1a0eef289 100644 --- a/rainloop/v/0.0.0/langs/bg.ini +++ b/rainloop/v/0.0.0/langs/bg.ini @@ -225,6 +225,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Изпратено" FORWARD_MESSAGE_TOP_SUBJECT = "Заглавие" EMPTY_TO_ERROR_DESC = "Моля, изберте поне един получател" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Все още не са качени всички прикрепени файлове" BUTTON_REQUEST_READ_RECEIPT = "Поискайте разписка за прочитане на съобщението" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -395,6 +397,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "Общи" LABEL_LANGUAGE = "Език" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Текстов редактор по подразбиране" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Обикновен" diff --git a/rainloop/v/0.0.0/langs/de.ini b/rainloop/v/0.0.0/langs/de.ini index ff6a435ee..a3edc1e53 100644 --- a/rainloop/v/0.0.0/langs/de.ini +++ b/rainloop/v/0.0.0/langs/de.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Gesendet" FORWARD_MESSAGE_TOP_SUBJECT = "Betreff" EMPTY_TO_ERROR_DESC = "Geben Sie bitte mindestens einen Empfänger an" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Empfangsbestätigung anfordern" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -395,6 +397,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Wenn Sie keine Codes via Google Authenticator er [SETTINGS_GENERAL] LEGEND_GENERAL = "Allgemein" LABEL_LANGUAGE = "Sprache" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Standard-Text-Editor" LABEL_EDITOR_HTML = "HTML" LABEL_EDITOR_PLAIN = "Text" diff --git a/rainloop/v/0.0.0/langs/en.ini b/rainloop/v/0.0.0/langs/en.ini index f28756085..5f1a4a317 100644 --- a/rainloop/v/0.0.0/langs/en.ini +++ b/rainloop/v/0.0.0/langs/en.ini @@ -225,7 +225,9 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Sent" FORWARD_MESSAGE_TOP_SUBJECT = "Subject" EMPTY_TO_ERROR_DESC = "Please specify at least one recipient" -ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." +ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet." BUTTON_REQUEST_READ_RECEIPT = "Request a read receipt" BUTTON_MARK_AS_IMPORTANT = "Mark as important" BUTTON_OPEN_PGP = "OpenPGP (Plain Text Only)" @@ -409,6 +411,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "General" LABEL_LANGUAGE = "Language" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Default text editor" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Plain" diff --git a/rainloop/v/0.0.0/langs/es.ini b/rainloop/v/0.0.0/langs/es.ini index 0d4ab8859..9c2be23a1 100644 --- a/rainloop/v/0.0.0/langs/es.ini +++ b/rainloop/v/0.0.0/langs/es.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Enviado" FORWARD_MESSAGE_TOP_SUBJECT = "Asunto" EMPTY_TO_ERROR_DESC = "Por favor especifique al menos un destinatario" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Solicitar confirmación de lectura" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Si usted no puede recibir los códigos a través [SETTINGS_GENERAL] LEGEND_GENERAL = "General" LABEL_LANGUAGE = "Idioma" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Editor de texto predeterminado" LABEL_EDITOR_HTML = "HTML" LABEL_EDITOR_PLAIN = "Texto plano" diff --git a/rainloop/v/0.0.0/langs/fr.ini b/rainloop/v/0.0.0/langs/fr.ini index f6e3189c4..e05b25184 100644 --- a/rainloop/v/0.0.0/langs/fr.ini +++ b/rainloop/v/0.0.0/langs/fr.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Envoyé" FORWARD_MESSAGE_TOP_SUBJECT = "Sujet" EMPTY_TO_ERROR_DESC = "Merci de spécifier au minimum un destinataire" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Demander une confirmation de lecture" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Si vous ne pouvez pas recevoir les codes par Goo [SETTINGS_GENERAL] LEGEND_GENERAL = "Général" LABEL_LANGUAGE = "Langue" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Éditeur de texte par défaut" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Brut" diff --git a/rainloop/v/0.0.0/langs/hu.ini b/rainloop/v/0.0.0/langs/hu.ini index 389ebde89..9f31d218d 100644 --- a/rainloop/v/0.0.0/langs/hu.ini +++ b/rainloop/v/0.0.0/langs/hu.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Küldő" FORWARD_MESSAGE_TOP_SUBJECT = "Tárgy" EMPTY_TO_ERROR_DESC = "Please specify at least one recipient" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Request a read receipt" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "General" LABEL_LANGUAGE = "Language" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Default text editor" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Plain" diff --git a/rainloop/v/0.0.0/langs/is.ini b/rainloop/v/0.0.0/langs/is.ini index 7d5f6f96a..67e70b9e7 100644 --- a/rainloop/v/0.0.0/langs/is.ini +++ b/rainloop/v/0.0.0/langs/is.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Sent" FORWARD_MESSAGE_TOP_SUBJECT = "Viðfangsefni" EMPTY_TO_ERROR_DESC = "Vinsamlegast taktu fram að minnsta kosti einn viðtakanda" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Request a read receipt" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "Almennt" LABEL_LANGUAGE = "Tungumál" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Sjálfgefinn textaritill" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Venjulegur" diff --git a/rainloop/v/0.0.0/langs/it.ini b/rainloop/v/0.0.0/langs/it.ini index 999872bb7..edf0ca6a7 100644 --- a/rainloop/v/0.0.0/langs/it.ini +++ b/rainloop/v/0.0.0/langs/it.ini @@ -225,6 +225,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Inviato il" FORWARD_MESSAGE_TOP_SUBJECT = "Oggetto" EMPTY_TO_ERROR_DESC = "Specifica almeno un destinatario" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Richiedi conferma di lettura" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -395,6 +397,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Se non puoi ricevere codici da Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "Generali" LABEL_LANGUAGE = "Lingua" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Editor di testo di default" LABEL_EDITOR_HTML = "HTML" LABEL_EDITOR_PLAIN = "Testo semplice" diff --git a/rainloop/v/0.0.0/langs/ja-jp.ini b/rainloop/v/0.0.0/langs/ja-jp.ini index b1e5c8f29..f4a449a08 100644 --- a/rainloop/v/0.0.0/langs/ja-jp.ini +++ b/rainloop/v/0.0.0/langs/ja-jp.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Sent" FORWARD_MESSAGE_TOP_SUBJECT = "Subject" EMPTY_TO_ERROR_DESC = "Please specify at least one recipient" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "開封確認を要求しますか？" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "全般" LABEL_LANGUAGE = "言語" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "メール形式" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "プレーンテキスト" diff --git a/rainloop/v/0.0.0/langs/ko-kr.ini b/rainloop/v/0.0.0/langs/ko-kr.ini index 832f2e923..c74432895 100644 --- a/rainloop/v/0.0.0/langs/ko-kr.ini +++ b/rainloop/v/0.0.0/langs/ko-kr.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "참조" FORWARD_MESSAGE_TOP_SENT = "보냄" FORWARD_MESSAGE_TOP_SUBJECT = "제목" EMPTY_TO_ERROR_DESC = "수신인을 한 명 이상 선택하세요" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Request a read receipt" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -391,6 +393,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "일반" LABEL_LANGUAGE = "언어" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "기본 본문 편집 도구" LABEL_EDITOR_HTML = "Html 편집기" LABEL_EDITOR_PLAIN = "텍스트 편집기" diff --git a/rainloop/v/0.0.0/langs/lt.ini b/rainloop/v/0.0.0/langs/lt.ini index c2bad1aeb..3912fc94d 100644 --- a/rainloop/v/0.0.0/langs/lt.ini +++ b/rainloop/v/0.0.0/langs/lt.ini @@ -225,6 +225,8 @@ FORWARD_MESSAGE_TOP_CC = "Kopija CC" FORWARD_MESSAGE_TOP_SENT = "Išsiųstas" FORWARD_MESSAGE_TOP_SUBJECT = "Tema" EMPTY_TO_ERROR_DESC = "Prašome nurodyti bent vieną gavėją" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Dar ne visi priedai buvo įkelti" BUTTON_REQUEST_READ_RECEIPT = "Prašyti pranešti kada bus perskaitytas" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -395,6 +397,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Jei negaunate kodo per Google autentifikavimo kl [SETTINGS_GENERAL] LEGEND_GENERAL = "Pagrindiniai" LABEL_LANGUAGE = "Kalba" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Numatytas teksto redaktorius" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Paprastas" diff --git a/rainloop/v/0.0.0/langs/lv.ini b/rainloop/v/0.0.0/langs/lv.ini index 3d989e8d8..ac0d37f7f 100644 --- a/rainloop/v/0.0.0/langs/lv.ini +++ b/rainloop/v/0.0.0/langs/lv.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Nosūtīts" FORWARD_MESSAGE_TOP_SUBJECT = "Tēma" EMPTY_TO_ERROR_DESC = "Pievienojat vismaz vienu saņēmēju" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Request a read receipt" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "Vispārējie" LABEL_LANGUAGE = "Valoda" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Galvenais teksta editors" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Teksts" diff --git a/rainloop/v/0.0.0/langs/nl.ini b/rainloop/v/0.0.0/langs/nl.ini index 24150e117..d380e14f6 100644 --- a/rainloop/v/0.0.0/langs/nl.ini +++ b/rainloop/v/0.0.0/langs/nl.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Verzonden" FORWARD_MESSAGE_TOP_SUBJECT = "Onderwerp" EMPTY_TO_ERROR_DESC = "Kies ten minste één ontvanger voordat u het bericht verstuurd" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Toevoegen van bijlage(n) is nog niet gereed" BUTTON_REQUEST_READ_RECEIPT = "Leesbevestiging vragen" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Als u geen codes ontvangt via de Google Authenti [SETTINGS_GENERAL] LEGEND_GENERAL = "Algemeen" LABEL_LANGUAGE = "Taal" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Standaard tekst editor" LABEL_EDITOR_HTML = "HTML" LABEL_EDITOR_PLAIN = "Platte tekst" diff --git a/rainloop/v/0.0.0/langs/no.ini b/rainloop/v/0.0.0/langs/no.ini index 67cc3fb05..b956846a7 100644 --- a/rainloop/v/0.0.0/langs/no.ini +++ b/rainloop/v/0.0.0/langs/no.ini @@ -223,6 +223,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Sendt" FORWARD_MESSAGE_TOP_SUBJECT = "Emne" EMPTY_TO_ERROR_DESC = "Vennligst oppgi minst én mottaker" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Alle vedleggene er ikke lastet opp ennå" BUTTON_REQUEST_READ_RECEIPT = "Be om en lesebekreftelse når meldingen er lest" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -393,6 +395,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Om du ikke mottar koder fra Google Authenticator [SETTINGS_GENERAL] LEGEND_GENERAL = "Generelt" LABEL_LANGUAGE = "Språk" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Standard teksteditor" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Ren tekst" diff --git a/rainloop/v/0.0.0/langs/pl.ini b/rainloop/v/0.0.0/langs/pl.ini index b102e72f2..2e1ad034c 100644 --- a/rainloop/v/0.0.0/langs/pl.ini +++ b/rainloop/v/0.0.0/langs/pl.ini @@ -225,6 +225,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Wysłany" FORWARD_MESSAGE_TOP_SUBJECT = "Temat" EMPTY_TO_ERROR_DESC = "Wprowadź co najmniej jednego odbiorcę" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Nie przesłano jeszcze wszystkich załączników" BUTTON_REQUEST_READ_RECEIPT = "Żądaj potwierdzenia odbioru" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -409,6 +411,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Jeżeli nie możesz otrzymać kodu poprzez apika [SETTINGS_GENERAL] LEGEND_GENERAL = "Ogólne" LABEL_LANGUAGE = "Język" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Format wiadomości" LABEL_EDITOR_HTML = "HTML" LABEL_EDITOR_PLAIN = "Zwykły tekst" diff --git a/rainloop/v/0.0.0/langs/pt-br.ini b/rainloop/v/0.0.0/langs/pt-br.ini index 23778cb20..7b629809b 100644 --- a/rainloop/v/0.0.0/langs/pt-br.ini +++ b/rainloop/v/0.0.0/langs/pt-br.ini @@ -225,6 +225,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Recebida" FORWARD_MESSAGE_TOP_SUBJECT = "Assunto" EMPTY_TO_ERROR_DESC = "Por favor, especifique pelo menos um destinatário" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Alguns anexos ainda não foram completamente enviados" BUTTON_REQUEST_READ_RECEIPT = "Pedir recibo de leitura" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -395,6 +397,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Se você não puder receber os códigos via Goog [SETTINGS_GENERAL] LEGEND_GENERAL = "Geral" LABEL_LANGUAGE = "Idioma" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Editor de texto padrão" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Texto Simples" diff --git a/rainloop/v/0.0.0/langs/pt-pt.ini b/rainloop/v/0.0.0/langs/pt-pt.ini index 7e1725c79..87432e0d7 100644 --- a/rainloop/v/0.0.0/langs/pt-pt.ini +++ b/rainloop/v/0.0.0/langs/pt-pt.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Enviar" FORWARD_MESSAGE_TOP_SUBJECT = "Assunto" EMPTY_TO_ERROR_DESC = "Por favor, especifique pelo menos um destinatário" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Pedir um recibo de leitura" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "Geral" LABEL_LANGUAGE = "Linguagem" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Editor de texto padrão" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Simples" diff --git a/rainloop/v/0.0.0/langs/ro.ini b/rainloop/v/0.0.0/langs/ro.ini index c6014ee64..650002ec3 100644 --- a/rainloop/v/0.0.0/langs/ro.ini +++ b/rainloop/v/0.0.0/langs/ro.ini @@ -223,6 +223,8 @@ FORWARD_MESSAGE_TOP_CC = "Copie" FORWARD_MESSAGE_TOP_SENT = "Primit la" FORWARD_MESSAGE_TOP_SUBJECT = "Subiect" EMPTY_TO_ERROR_DESC = "Vă rugăm să specificați cel puțin un destinatar" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Cere confirmare de citire" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -393,6 +395,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "Setări de bază" LABEL_LANGUAGE = "Limbă" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Editor de text implicit" LABEL_EDITOR_HTML = "Formatat" LABEL_EDITOR_PLAIN = "Simplu" diff --git a/rainloop/v/0.0.0/langs/ru.ini b/rainloop/v/0.0.0/langs/ru.ini index 902544d4b..264dbc0e9 100644 --- a/rainloop/v/0.0.0/langs/ru.ini +++ b/rainloop/v/0.0.0/langs/ru.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "Копия" FORWARD_MESSAGE_TOP_SENT = "Отправлено" FORWARD_MESSAGE_TOP_SUBJECT = "Тема" EMPTY_TO_ERROR_DESC = "Укажите как минимум одного получателя" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Запрос о прочтении письма" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Если вы не можете получить [SETTINGS_GENERAL] LEGEND_GENERAL = "Основные Настройки" LABEL_LANGUAGE = "Язык" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Редактор текста по умолчанию" LABEL_EDITOR_HTML = "Форматированный" LABEL_EDITOR_PLAIN = "Простой" diff --git a/rainloop/v/0.0.0/langs/sk.ini b/rainloop/v/0.0.0/langs/sk.ini index 5e1f00864..a4cdadb16 100644 --- a/rainloop/v/0.0.0/langs/sk.ini +++ b/rainloop/v/0.0.0/langs/sk.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "Kópia" FORWARD_MESSAGE_TOP_SENT = "Odoslať" FORWARD_MESSAGE_TOP_SUBJECT = "Predmet" EMPTY_TO_ERROR_DESC = "Zadajte prosím aspoň jedného príjemcu" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Vyžiadať potvrdenie o prečítaní" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "Všeobecné" LABEL_LANGUAGE = "Jazyk" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Predvolený editor správ" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Text" diff --git a/rainloop/v/0.0.0/langs/sv.ini b/rainloop/v/0.0.0/langs/sv.ini index 0cc03e4c6..0927d7d24 100644 --- a/rainloop/v/0.0.0/langs/sv.ini +++ b/rainloop/v/0.0.0/langs/sv.ini @@ -225,6 +225,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Skickat" FORWARD_MESSAGE_TOP_SUBJECT = "Ämne" EMPTY_TO_ERROR_DESC = "Ange minst en mottagare" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Alla bilagor är inte uppladddade än" BUTTON_REQUEST_READ_RECEIPT = "Begär mottagningskvitto" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -395,6 +397,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Om du inte kan ta emot koderna med Google Authen [SETTINGS_GENERAL] LEGEND_GENERAL = "Allmänt" LABEL_LANGUAGE = "Språk" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Textredigerare" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Enkel" diff --git a/rainloop/v/0.0.0/langs/tr.ini b/rainloop/v/0.0.0/langs/tr.ini index ba1f6dab2..bc1eb5b43 100644 --- a/rainloop/v/0.0.0/langs/tr.ini +++ b/rainloop/v/0.0.0/langs/tr.ini @@ -225,6 +225,8 @@ FORWARD_MESSAGE_TOP_CC = "CC" FORWARD_MESSAGE_TOP_SENT = "Gönder" FORWARD_MESSAGE_TOP_SUBJECT = "Konu" EMPTY_TO_ERROR_DESC = "En az bir alıcı belirtin" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Okundu bilgisi iste" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -393,6 +395,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Google Şifrematik'te aracılığıyla kodları [SETTINGS_GENERAL] LEGEND_GENERAL = "Genel" LABEL_LANGUAGE = "Dil" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Varsayılan text editör" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Düz" diff --git a/rainloop/v/0.0.0/langs/ua.ini b/rainloop/v/0.0.0/langs/ua.ini index a14b2a00f..1ce80a809 100644 --- a/rainloop/v/0.0.0/langs/ua.ini +++ b/rainloop/v/0.0.0/langs/ua.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "Копія" FORWARD_MESSAGE_TOP_SENT = "Надіслано" FORWARD_MESSAGE_TOP_SUBJECT = "Тема" EMPTY_TO_ERROR_DESC = "Вкажіть як мінімум одного отримувача" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Запит про прочитання листа" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Якщо Ви не можете отримати [SETTINGS_GENERAL] LEGEND_GENERAL = "Основні Налаштування" LABEL_LANGUAGE = "Мова" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "Редактор тексту за змовчуванням" LABEL_EDITOR_HTML = "Форматований" LABEL_EDITOR_PLAIN = "Простий" diff --git a/rainloop/v/0.0.0/langs/zh-cn.ini b/rainloop/v/0.0.0/langs/zh-cn.ini index 45e28dff9..ab7a7a22f 100644 --- a/rainloop/v/0.0.0/langs/zh-cn.ini +++ b/rainloop/v/0.0.0/langs/zh-cn.ini @@ -224,6 +224,8 @@ FORWARD_MESSAGE_TOP_CC = "抄送" FORWARD_MESSAGE_TOP_SENT = "发送" FORWARD_MESSAGE_TOP_SUBJECT = "主题" EMPTY_TO_ERROR_DESC = "请至少选择一位接收人" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Request a read receipt" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -394,6 +396,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "一般设置" LABEL_LANGUAGE = "语言" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "默认格式" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Plain" diff --git a/rainloop/v/0.0.0/langs/zh-tw.ini b/rainloop/v/0.0.0/langs/zh-tw.ini index 12f1ea82d..d13f2dd8d 100644 --- a/rainloop/v/0.0.0/langs/zh-tw.ini +++ b/rainloop/v/0.0.0/langs/zh-tw.ini @@ -225,6 +225,8 @@ FORWARD_MESSAGE_TOP_CC = "複本" FORWARD_MESSAGE_TOP_SENT = "發送" FORWARD_MESSAGE_TOP_SUBJECT = "主題" EMPTY_TO_ERROR_DESC = "請至少選擇一位接收人" +NO_ATTACHMENTS_HERE_DESC = "No attachments here." +ATTACHMENTS_ERROR_DESC = "Warning! Not all attachments have been uploaded." ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet" BUTTON_REQUEST_READ_RECEIPT = "Request a read receipt" BUTTON_MARK_AS_IMPORTANT = "Mark as important" @@ -395,6 +397,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica [SETTINGS_GENERAL] LEGEND_GENERAL = "一般設置" LABEL_LANGUAGE = "語言" +LABEL_LAYOUT = "Layout" +LABEL_LAYOUT_NO_SPLIT = "No Split" +LABEL_LAYOUT_VERTICAL_SPLIT = "Vertical Split" +LABEL_LAYOUT_HORIZONTAL_SPLIT = "Horizontal Split" LABEL_EDITOR = "默認格式" LABEL_EDITOR_HTML = "Html" LABEL_EDITOR_PLAIN = "Plain" diff --git a/vendors/magnific-popup/magnific-popup.css b/vendors/magnific-popup/magnific-popup.css deleted file mode 100644 index 5dfa7d965..000000000 --- a/vendors/magnific-popup/magnific-popup.css +++ /dev/null @@ -1,492 +0,0 @@ -/* Magnific Popup CSS */ -.mfp-bg { - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 502; - overflow: hidden; - position: fixed; - background: #0b0b0b; - opacity: 0.8; - filter: alpha(opacity=80); } - -.mfp-wrap { - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 503; - position: fixed; - outline: none !important; - -webkit-backface-visibility: hidden; } - -.mfp-container { - height: 100%; - text-align: center; - position: absolute; - width: 100%; - height: 100%; - left: 0; - top: 0; - padding: 0 8px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } - -.mfp-container:before { - content: ''; - display: inline-block; - height: 100%; - vertical-align: middle; } - -.mfp-align-top .mfp-container:before { - display: none; } - -.mfp-content { - position: relative; - display: inline-block; - vertical-align: middle; - margin: 0 auto; - text-align: left; - z-index: 505; } - -.mfp-inline-holder .mfp-content, -.mfp-ajax-holder .mfp-content { - width: 100%; - cursor: auto; } - -.mfp-ajax-cur { - cursor: progress; } - -.mfp-zoom-out-cur { - cursor: -moz-zoom-out; - cursor: -webkit-zoom-out; - cursor: zoom-out; } - -.mfp-zoom-out-cur, -.mfp-zoom-out-cur .mfp-image-holder .mfp-close { - cursor: pointer; } - -.mfp-zoom { - cursor: pointer; - cursor: -webkit-zoom-in; - cursor: -moz-zoom-in; - cursor: zoom-in; } - -.mfp-auto-cursor .mfp-content { - cursor: auto; } - -.mfp-close, -.mfp-arrow, -.mfp-preloader, -.mfp-counter { - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; } - -.mfp-loading.mfp-figure { - display: none; } - -.mfp-hide { - display: none !important; } - -.mfp-preloader { - color: #cccccc; - position: absolute; - top: 50%; - width: auto; - text-align: center; - margin-top: -0.8em; - left: 8px; - right: 8px; - z-index: 504; } - -.mfp-preloader a { - color: #cccccc; } - -.mfp-preloader a:hover { - color: white; } - -.mfp-s-ready .mfp-preloader { - display: none; } - -.mfp-s-error .mfp-content { - display: none; } - -button.mfp-close, -button.mfp-arrow { - overflow: visible; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; - display: block; - padding: 0; - z-index: 506; } - -button::-moz-focus-inner { - padding: 0; - border: 0; } - -.mfp-close { - width: 44px; - height: 44px; - line-height: 44px; - position: absolute; - right: 0; - top: 0; - text-decoration: none; - text-align: center; - opacity: 0.65; - padding: 0 0 18px 10px; - color: white; - font-style: normal; - font-size: 28px; - font-family: Arial, Baskerville, monospace; } - .mfp-close:hover, .mfp-close:focus { - opacity: 1; } - .mfp-close:active { - top: 1px; } - -.mfp-close-btn-in .mfp-close { - color: #333333; } - -.mfp-image-holder .mfp-close, -.mfp-iframe-holder .mfp-close { - color: white; - right: -6px; - text-align: right; - padding-right: 6px; - width: 100%; } - -.mfp-counter { - position: absolute; - top: 0; - right: 0; - color: #cccccc; - font-size: 12px; - line-height: 18px; } - -.mfp-arrow { - position: absolute; - top: 0; - opacity: 0.65; - margin: 0; - top: 50%; - margin-top: -55px; - padding: 0; - width: 90px; - height: 110px; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } - -.mfp-arrow:active { - margin-top: -54px; } - -.mfp-arrow:hover, -.mfp-arrow:focus { - opacity: 1; } - -.mfp-arrow:before, .mfp-arrow:after, -.mfp-arrow .mfp-b, -.mfp-arrow .mfp-a { - content: ''; - display: block; - width: 0; - height: 0; - position: absolute; - left: 0; - top: 0; - margin-top: 35px; - margin-left: 35px; - border: solid transparent; } -.mfp-arrow:after, -.mfp-arrow .mfp-a { - opacity: 0.8; - border-top-width: 12px; - border-bottom-width: 12px; - top: 8px; } -.mfp-arrow:before, -.mfp-arrow .mfp-b { - border-top-width: 20px; - border-bottom-width: 20px; } - -.mfp-arrow-left { - left: 0; } - .mfp-arrow-left:after, - .mfp-arrow-left .mfp-a { - border-right: 12px solid black; - left: 5px; } - .mfp-arrow-left:before, - .mfp-arrow-left .mfp-b { - border-right: 20px solid white; } - -.mfp-arrow-right { - right: 0; } - .mfp-arrow-right:after, - .mfp-arrow-right .mfp-a { - border-left: 12px solid black; - left: 3px; } - .mfp-arrow-right:before, - .mfp-arrow-right .mfp-b { - border-left: 20px solid white; } - -.mfp-iframe-holder { - padding-top: 40px; - padding-bottom: 40px; } - -.mfp-iframe-holder .mfp-content { - line-height: 0; - width: 100%; - max-width: 900px; } - -.mfp-iframe-scaler { - width: 100%; - height: 0; - overflow: hidden; - padding-top: 56.25%; } - -.mfp-iframe-scaler iframe { - position: absolute; - display: block; - top: 0; - left: 0; - width: 100%; - height: 100%; - box-shadow: 0 0 8px rgba(0, 0, 0, 0.6); - background: black; } - -.mfp-iframe-holder .mfp-close { - top: -40px; } - -/* Main image in popup */ -img.mfp-img { - width: auto; - max-width: 100%; - height: auto; - display: block; - line-height: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - padding: 40px 0 40px; - margin: 0 auto; } - -/* The shadow behind the image */ -.mfp-figure:after { - content: ''; - position: absolute; - left: 0; - top: 40px; - bottom: 40px; - display: block; - right: 0; - width: auto; - height: auto; - z-index: -1; - box-shadow: 0 0 8px rgba(0, 0, 0, 0.6); } - -.mfp-figure { - line-height: 0; } - -.mfp-bottom-bar { - margin-top: -36px; - position: absolute; - top: 100%; - left: 0; - width: 100%; - cursor: auto; } - -.mfp-title { - text-align: left; - line-height: 18px; - color: #f3f3f3; - word-break: break-word; - padding-right: 36px; } - -.mfp-figure small { - color: #bdbdbd; - display: block; - font-size: 12px; - line-height: 14px; } - -.mfp-image-holder .mfp-content { - max-width: 100%; } - -.mfp-gallery .mfp-image-holder .mfp-figure { - cursor: pointer; } - -@media screen and (max-width: 800px) and (orientation: landscape), screen and (max-height: 300px) { - /** - * Remove all paddings around the image on small screen - */ - .mfp-img-mobile .mfp-image-holder { - padding-left: 0; - padding-right: 0; } - - .mfp-img-mobile img.mfp-img { - padding: 0; } - - /* The shadow behind the image */ - .mfp-img-mobile .mfp-figure:after { - top: 0; - bottom: 0; } - - .mfp-img-mobile .mfp-bottom-bar { - background: rgba(0, 0, 0, 0.6); - bottom: 0; - margin: 0; - top: auto; - padding: 3px 5px; - position: fixed; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } - - .mfp-img-mobile .mfp-bottom-bar:empty { - padding: 0; } - - .mfp-img-mobile .mfp-counter { - right: 5px; - top: 3px; } - - .mfp-img-mobile .mfp-close { - top: 0; - right: 0; - width: 35px; - height: 35px; - line-height: 35px; - background: rgba(0, 0, 0, 0.6); - position: fixed; - text-align: center; - padding: 0; } - - .mfp-img-mobile .mfp-figure small { - display: inline; - margin-left: 5px; } } -@media all and (max-width: 800px) { - .mfp-arrow { - -webkit-transform: scale(0.75); - transform: scale(0.75); } - - .mfp-arrow-left { - -webkit-transform-origin: 0; - transform-origin: 0; } - - .mfp-arrow-right { - -webkit-transform-origin: 100%; - transform-origin: 100%; } - - .mfp-container { - padding-left: 6px; - padding-right: 6px; } } -.mfp-ie7 .mfp-img { - padding: 0; } -.mfp-ie7 .mfp-bottom-bar { - width: 600px; - left: 50%; - margin-left: -300px; - margin-top: 5px; - padding-bottom: 5px; } -.mfp-ie7 .mfp-container { - padding: 0; } -.mfp-ie7 .mfp-content { - padding-top: 44px; } -.mfp-ie7 .mfp-close { - top: 0; - right: 0; - padding-top: 0; } - - -/* overlay at start */ -.mfp-fade.mfp-bg { - opacity: 0; - - -webkit-transition: all 0.15s ease-out; - -moz-transition: all 0.15s ease-out; - transition: all 0.15s ease-out; -} -/* overlay animate in */ -.mfp-fade.mfp-bg.mfp-ready { - opacity: 0.8; -} -/* overlay animate out */ -.mfp-fade.mfp-bg.mfp-removing { - opacity: 0; -} - -/* content at start */ -.mfp-fade.mfp-wrap .mfp-content { - opacity: 0; - - -webkit-transition: all 0.15s ease-out; - -moz-transition: all 0.15s ease-out; - transition: all 0.15s ease-out; -} -/* content animate it */ -.mfp-fade.mfp-wrap.mfp-ready .mfp-content { - opacity: 1; -} -/* content animate out */ -.mfp-fade.mfp-wrap.mfp-removing .mfp-content { - opacity: 0; -} - -/** - * Fade-zoom animation for first dialog - */ - -/* start state */ -.my-mfp-zoom-in .zoom-anim-dialog { - opacity: 0; - - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; - - -webkit-transform: scale(0.8); - -moz-transform: scale(0.8); - -ms-transform: scale(0.8); - -o-transform: scale(0.8); - transform: scale(0.8); -} - -/* animate in */ -.my-mfp-zoom-in.mfp-ready .zoom-anim-dialog { - opacity: 1; - - -webkit-transform: scale(1); - -moz-transform: scale(1); - -ms-transform: scale(1); - -o-transform: scale(1); - transform: scale(1); -} - -/* animate out */ -.my-mfp-zoom-in.mfp-removing .zoom-anim-dialog { - -webkit-transform: scale(0.8); - -moz-transform: scale(0.8); - -ms-transform: scale(0.8); - -o-transform: scale(0.8); - transform: scale(0.8); - - opacity: 0; -} - -/* Dark overlay, start state */ -.my-mfp-zoom-in.mfp-bg { - opacity: 0; - -webkit-transition: opacity 0.3s ease-out; - -moz-transition: opacity 0.3s ease-out; - -o-transition: opacity 0.3s ease-out; - transition: opacity 0.3s ease-out; -} -/* animate in */ -.my-mfp-zoom-in.mfp-ready.mfp-bg { - opacity: 0.8; -} -/* animate out */ -.my-mfp-zoom-in.mfp-removing.mfp-bg { - opacity: 0; -} diff --git a/vendors/magnific-popup/magnific-popup.min.js b/vendors/magnific-popup/magnific-popup.min.js deleted file mode 100644 index 70a2c2ed0..000000000 --- a/vendors/magnific-popup/magnific-popup.min.js +++ /dev/null @@ -1,3 +0,0 @@ -// Magnific Popup v0.8.9 by Dmitry Semenov -// http://bit.ly/magnific-popup#build=inline+image+ajax+iframe+gallery+retina+fastclick -(function(a){var b="Close",c="AfterClose",d="BeforeAppend",e="MarkupParse",f="Open",g="Change",h="mfp",i="."+h,j="mfp-ready",k="mfp-removing",l="mfp-prevent-close",m,n=function(){},o=!!window.jQuery,p,q=a(window),r,s,t,u,v,w=function(a,b){m.ev.on(h+a+i,b)},x=function(b,c,d,e){var f=document.createElement("div");return f.className="mfp-"+b,d&&(f.innerHTML=d),e?c&&c.appendChild(f):(f=a(f),c&&f.appendTo(c)),f},y=function(b,c){m.ev.triggerHandler(h+b,c),m.st.callbacks&&(b=b.charAt(0).toLowerCase()+b.slice(1),m.st.callbacks[b]&&m.st.callbacks[b].apply(m,a.isArray(c)?c:[c]))},z=function(){(m.st.focus?m.content.find(m.st.focus).eq(0):m.wrap).focus()},A=function(b){if(b!==v||!m.currTemplate.closeBtn)m.currTemplate.closeBtn=a(m.st.closeMarkup.replace("%title%",m.st.tClose)),v=b;return m.currTemplate.closeBtn},B=function(){a.magnificPopup.instance||(m=new n,m.init(),a.magnificPopup.instance=m)},C=function(b){if(a(b).hasClass(l))return;var c=m.st.closeOnContentClick,d=m.st.closeOnBgClick;if(c&&d)return!0;if(!m.content||a(b).hasClass("mfp-close")||m.preloader&&b===m.preloader[0])return!0;if(b!==m.content[0]&&!a.contains(m.content[0],b)){if(d)return!0}else if(c)return!0;return!1};n.prototype={constructor:n,init:function(){var b=navigator.appVersion;m.isIE7=b.indexOf("MSIE 7.")!==-1,m.isIE8=b.indexOf("MSIE 8.")!==-1,m.isLowIE=m.isIE7||m.isIE8,m.isAndroid=/android/gi.test(b),m.isIOS=/iphone|ipad|ipod/gi.test(b),m.probablyMobile=m.isAndroid||m.isIOS||/(Opera Mini)|Kindle|webOS|BlackBerry|(Opera Mobi)|(Windows Phone)|IEMobile/i.test(navigator.userAgent),r=a(document.body),s=a(document),m.popupsCache={}},open:function(b){var c;if(b.isObj===!1){m.items=b.items.toArray(),m.index=0;var d=b.items,g;for(c=0;c(a||q.height())},_parseMarkup:function(b,c,d){var f;d.data&&(c=a.extend(d.data,c)),y(e,[b,c,d]),a.each(c,function(a,c){if(c===undefined||c===!1)return!0;f=a.split("_");if(f.length>1){var d=b.find(i+"-"+f[0]);if(d.length>0){var e=f[1];e==="replaceWith"?d[0]!==c[0]&&d.replaceWith(c):e==="img"?d.is("img")?d.attr("src",c):d.replaceWith(''):d.attr(f[1],c)}}else b.find(i+"-"+a).html(c)})},_getScrollbarSize:function(){if(m.scrollbarSize===undefined){var a=document.createElement("div");a.id="mfp-sbm",a.style.cssText="width: 99px; height: 99px; overflow: scroll; position: absolute; top: -9999px;",document.body.appendChild(a),m.scrollbarSize=a.offsetWidth-a.clientWidth,document.body.removeChild(a)}return m.scrollbarSize}},a.magnificPopup={instance:null,proto:n.prototype,modules:[],open:function(a,b){return B(),a||(a={}),a.isObj=!0,a.index=b||0,this.instance.open(a)},close:function(){return a.magnificPopup.instance.close()},registerModule:function(b,c){c.options&&(a.magnificPopup.defaults[b]=c.options),a.extend(this.proto,c.proto),this.modules.push(b)},defaults:{disableOn:0,key:null,midClick:!1,mainClass:"",preloader:!0,focus:"",closeOnContentClick:!1,closeOnBgClick:!0,closeBtnInside:!0,alignTop:!1,removalDelay:0,fixedContentPos:"auto",fixedBgPos:"auto",overflowY:"auto",closeMarkup:'',tClose:"Close (Esc)",tLoading:"Loading..."}},a.fn.magnificPopup=function(b){B();var c=a(this);if(typeof b=="string")if(b==="open"){var d,e=o?c.data("magnificPopup"):c[0].magnificPopup,f=parseInt(arguments[1],10)||0;e.items?d=e.items[f]:(d=c,e.delegate&&(d=d.find(e.delegate)),d=d.eq(f)),m._openClick({mfpEl:d},c,e)}else m.isOpen&&m[b].apply(m,Array.prototype.slice.call(arguments,1));else o?c.data("magnificPopup",b):c[0].magnificPopup=b,m.addGroup(c,b);return c};var D="inline",E,F,G,H=function(){G&&(F.after(G.addClass(E)).detach(),G=null)};a.magnificPopup.registerModule(D,{options:{hiddenClass:"hide",markup:"",tNotFound:"Content not found"},proto:{initInline:function(){m.types.push(D),w(b+"."+D,function(){H()})},getInline:function(b,c){H();if(b.src){var d=m.st.inline,e=a(b.src);if(e.length){var f=e[0].parentNode;f&&f.tagName&&(F||(E=d.hiddenClass,F=x(E),E="mfp-"+E),G=e.after(F).detach().removeClass(E)),m.updateStatus("ready")}else m.updateStatus("error",d.tNotFound),e=a("
    ");return b.inlineElement=e,e}return m.updateStatus("ready"),m._parseMarkup(c,{},b),c}}});var I="ajax",J,K=function(){J&&r.removeClass(J)};a.magnificPopup.registerModule(I,{options:{settings:null,cursor:"mfp-ajax-cur",tError:'The content could not be loaded.'},proto:{initAjax:function(){m.types.push(I),J=m.st.ajax.cursor,w(b+"."+I,function(){K(),m.req&&m.req.abort()})},getAjax:function(b){J&&r.addClass(J),m.updateStatus("loading");var c=a.extend({url:b.src,success:function(c,d,e){var f={data:c,xhr:e};y("ParseAjax",f),m.appendContent(a(f.data),I),b.finished=!0,K(),z(),setTimeout(function(){m.wrap.addClass(j)},16),m.updateStatus("ready"),y("AjaxContentAdded")},error:function(){K(),b.finished=b.loadError=!0,m.updateStatus("error",m.st.ajax.tError.replace("%url%",b.src))}},m.st.ajax.settings);return m.req=a.ajax(c),""}}});var L,M=function(b){if(b.data&&b.data.title!==undefined)return b.data.title;var c=m.st.image.titleSrc;if(c){if(a.isFunction(c))return c.call(m,b);if(b.el)return b.el.attr(c)||""}return""};a.magnificPopup.registerModule("image",{options:{markup:'
    ',cursor:"mfp-zoom-out-cur",titleSrc:"title",verticalFit:!0,tError:'The image could not be loaded.'},proto:{initImage:function(){var a=m.st.image,c=".image";m.types.push("image"),w(f+c,function(){m.currItem.type==="image"&&a.cursor&&r.addClass(a.cursor)}),w(b+c,function(){a.cursor&&r.removeClass(a.cursor),q.off("resize"+i)}),w("Resize"+c,m.resizeImage),m.isLowIE&&w("AfterChange",m.resizeImage)},resizeImage:function(){var a=m.currItem;if(!a.img)return;if(m.st.image.verticalFit){var b=0;m.isLowIE&&(b=parseInt(a.img.css("padding-top"),10)+parseInt(a.img.css("padding-bottom"),10)),a.img.css("max-height",m.wH-b)}},_onImageHasSize:function(a){a.img&&(a.hasSize=!0,L&&clearInterval(L),a.isCheckingImgSize=!1,y("ImageHasSize",a),a.imgHidden&&(m.content&&m.content.removeClass("mfp-loading"),a.imgHidden=!1))},findImageSize:function(a){var b=0,c=a.img[0],d=function(e){L&&clearInterval(L),L=setInterval(function(){if(c.naturalWidth>0){m._onImageHasSize(a);return}b>200&&clearInterval(L),b++,b===3?d(10):b===40?d(50):b===100&&d(500)},e)};d(1)},getImage:function(b,c){var d=0,e=function(){b&&(b.img[0].complete?(b.img.off(".mfploader"),b===m.currItem&&(m._onImageHasSize(b),m.updateStatus("ready")),b.hasSize=!0,b.loaded=!0):(d++,d<200?setTimeout(e,100):f()))},f=function(){b&&(b.img.off(".mfploader"),b===m.currItem&&(m._onImageHasSize(b),m.updateStatus("error",g.tError.replace("%url%",b.src))),b.hasSize=!0,b.loaded=!0,b.loadError=!0)},g=m.st.image,h=c.find(".mfp-img");if(h.length){var i=new Image;i.className="mfp-img",b.img=a(i).on("load.mfploader",e).on("error.mfploader",f),i.src=b.src,h.is("img")&&(b.img=b.img.clone())}return m._parseMarkup(c,{title:M(b),img_replaceWith:b.img},b),m.resizeImage(),b.hasSize?(L&&clearInterval(L),b.loadError?(c.addClass("mfp-loading"),m.updateStatus("error",g.tError.replace("%url%",b.src))):(c.removeClass("mfp-loading"),m.updateStatus("ready")),c):(m.updateStatus("loading"),b.loading=!0,b.hasSize||(b.imgHidden=!0,c.addClass("mfp-loading"),m.findImageSize(b)),c)}}});var N="iframe",O="//about:blank",P=function(a){if(m.currTemplate[N]){var b=m.currTemplate[N].find("iframe");b.length&&(a||(b[0].src=O),m.isIE8&&b.css("display",a?"block":"none"))}};a.magnificPopup.registerModule(N,{options:{markup:'
    ',srcAction:"iframe_src",patterns:{youtube:{index:"youtube.com",id:"v=",src:"//www.youtube.com/embed/%id%?autoplay=1"},vimeo:{index:"vimeo.com/",id:"/",src:"//player.vimeo.com/video/%id%?autoplay=1"},gmaps:{index:"//maps.google.",src:"%id%&output=embed"}}},proto:{initIframe:function(){m.types.push(N),w("BeforeChange",function(a,b,c){b!==c&&(b===N?P():c===N&&P(!0))}),w(b+"."+N,function(){P()})},getIframe:function(b,c){var d=b.src,e=m.st.iframe;a.each(e.patterns,function(){if(d.indexOf(this.index)>-1)return this.id&&(typeof this.id=="string"?d=d.substr(d.lastIndexOf(this.id)+this.id.length,d.length):d=this.id.call(this,d)),d=this.src.replace("%id%",d),!1});var f={};return e.srcAction&&(f[e.srcAction]=d),m._parseMarkup(c,f,b),m.updateStatus("ready"),c}}});var Q=function(a){var b=m.items.length;return a>b-1?a-b:a<0?b+a:a},R=function(a,b,c){return a.replace("%curr%",b+1).replace("%total%",c)};a.magnificPopup.registerModule("gallery",{options:{enabled:!1,arrowMarkup:'',preload:[0,2],navigateByImgClick:!0,arrows:!0,tPrev:"Previous (Left arrow key)",tNext:"Next (Right arrow key)",tCounter:"%curr% of %total%"},proto:{initGallery:function(){var c=m.st.gallery,d=".mfp-gallery",h=Boolean(a.fn.mfpFastClick);m.direction=!0;if(!c||!c.enabled)return!1;u+=" mfp-gallery",w(f+d,function(){c.navigateByImgClick&&m.wrap.on("click"+d,".mfp-img",function(){if(m.items.length>1)return m.next(),!1}),s.on("keydown"+d,function(a){a.keyCode===37?m.prev():a.keyCode===39&&m.next()})}),w("UpdateStatus"+d,function(a,b){b.text&&(b.text=R(b.text,m.currItem.index,m.items.length))}),w(e+d,function(a,b,d,e){var f=m.items.length;d.counter=f>1?R(c.tCounter,e.index,f):""}),w("BuildControls"+d,function(){if(m.items.length>1&&c.arrows&&!m.arrowLeft){var b=c.arrowMarkup,d=m.arrowLeft=a(b.replace("%title%",c.tPrev).replace("%dir%","left")).addClass(l),e=m.arrowRight=a(b.replace("%title%",c.tNext).replace("%dir%","right")).addClass(l),f=h?"mfpFastClick":"click";d[f](function(){m.prev()}),e[f](function(){m.next()}),m.isIE7&&(x("b",d[0],!1,!0),x("a",d[0],!1,!0),x("b",e[0],!1,!0),x("a",e[0],!1,!0)),m.container.append(d.add(e))}}),w(g+d,function(){m._preloadTimeout&&clearTimeout(m._preloadTimeout),m._preloadTimeout=setTimeout(function(){m.preloadNearbyImages(),m._preloadTimeout=null},16)}),w(b+d,function(){s.off(d),m.wrap.off("click"+d),m.arrowLeft&&h&&m.arrowLeft.add(m.arrowRight).destroyMfpFastClick(),m.arrowRight=m.arrowLeft=null})},next:function(){m.direction=!0,m.index=Q(m.index+1),m.updateItemHTML()},prev:function(){m.direction=!1,m.index=Q(m.index-1),m.updateItemHTML()},goTo:function(a){m.direction=a>=m.index,m.index=a,m.updateItemHTML()},preloadNearbyImages:function(){var a=m.st.gallery.preload,b=Math.min(a[0],m.items.length),c=Math.min(a[1],m.items.length),d;for(d=1;d<=(m.direction?c:b);d++)m._preloadItem(m.index+d);for(d=1;d<=(m.direction?b:c);d++)m._preloadItem(m.index-d)},_preloadItem:function(b){b=Q(b);if(m.items[b].preloaded)return;var c=m.items[b];c.parsed||(c=m.parseEl(b)),y("LazyLoad",c),c.type==="image"&&(c.img=a('').on("load.mfploader",function(){c.hasSize=!0}).on("error.mfploader",function(){c.hasSize=!0,c.loadError=!0}).attr("src",c.src)),c.preloaded=!0}}});var S="retina";a.magnificPopup.registerModule(S,{options:{replaceSrc:function(a){return a.src.replace(/\.\w+$/,function(a){return"@2x"+a})},ratio:1},proto:{initRetina:function(){if(window.devicePixelRatio>1){var a=m.st.retina,b=a.ratio;b=isNaN(b)?b():b,b>1&&(w("ImageHasSize."+S,function(a,c){c.img.css({"max-width":c.img[0].naturalWidth/b,width:"100%"})}),w("ElementParse."+S,function(c,d){d.src=a.replaceSrc(d,b)}))}}}}),function(){var b=1e3,c="ontouchstart"in window,d=function(){q.off("touchmove"+f+" touchend"+f)},e="mfpFastClick",f="."+e;a.fn.mfpFastClick=function(e){return a(this).each(function(){var g=a(this),h;if(c){var i,j,k,l,m,n;g.on("touchstart"+f,function(a){l=!1,n=1,m=a.originalEvent?a.originalEvent.touches[0]:a.touches[0],j=m.clientX,k=m.clientY,q.on("touchmove"+f,function(a){m=a.originalEvent?a.originalEvent.touches:a.touches,n=m.length,m=m[0];if(Math.abs(m.clientX-j)>10||Math.abs(m.clientY-k)>10)l=!0,d()}).on("touchend"+f,function(a){d();if(l||n>1)return;h=!0,a.preventDefault(),clearTimeout(i),i=setTimeout(function(){h=!1},b),e()})})}g.on("click"+f,function(){h||e()})})},a.fn.destroyMfpFastClick=function(){a(this).off("touchstart"+f+" click"+f),c&&q.off("touchmove"+f+" touchend"+f)}}()})(window.jQuery||window.Zepto); \ No newline at end of file