diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less index 2bafb51cb..f2ede1ca0 100644 --- a/dev/Styles/_FontasticToBoot.less +++ b/dev/Styles/_FontasticToBoot.less @@ -8,7 +8,7 @@ font-size: 16px; vertical-align: text-top; - .btn.disabled &, .btn[disabled] &{ + .disabled &, .btn[disabled] &{ color: grey; &.icon-white { color: #fff; diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 2a029efcf..93c0e06b3 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -344,6 +344,8 @@ var sTo = Utils.trim(this.to()), + sCc = Utils.trim(this.cc()), + sBcc = Utils.trim(this.bcc()), sSentFolder = FolderStore.sentFolder(), aFlagsCache = [] ; @@ -363,7 +365,7 @@ this.attachmentsPlace(true); } - if (0 === sTo.length) + if ('' === sTo && '' === sCc && '' === sBcc) { this.emptyToError(true); } diff --git a/dev/View/Popup/ComposeOpenPgp.js b/dev/View/Popup/ComposeOpenPgp.js index 44205c7e4..6aeb160bb 100644 --- a/dev/View/Popup/ComposeOpenPgp.js +++ b/dev/View/Popup/ComposeOpenPgp.js @@ -5,6 +5,7 @@ var _ = require('_'), + $ = require('$'), ko = require('ko'), key = require('key'), @@ -246,7 +247,6 @@ var sKeyId = this.selectedPrivateKey(), oKey = null, - aKeys = this.encryptKeys(), oOption = sKeyId ? _.find(this.privateKeysOptions(), function (oItem) { return oItem && sKeyId === oItem.id; }) : null @@ -317,8 +317,19 @@ }, this); this.sDefaultKeyScope = Enums.KeyState.PopupComposeOpenPGP; + this.defautOptionsAfterRender = Utils.defautOptionsAfterRender; + this.addOptionClass = function (oDomOption, oItem) { + + self.defautOptionsAfterRender(oDomOption, oItem); + + if (oItem && !Utils.isUnd(oItem['class']) && oDomOption) + { + $(oDomOption).addClass(oItem['class']); + } + }; + this.deletePublickKey = _.bind(this.deletePublickKey, this); kn.constructorEnd(this); @@ -327,16 +338,6 @@ kn.extendAsViewModel(['View/Popup/ComposeOpenPgp', 'PopupsComposeOpenPgpViewModel'], ComposeOpenPgpPopupView); _.extend(ComposeOpenPgpPopupView.prototype, AbstractView.prototype); - ComposeOpenPgpPopupView.prototype.addOptionClass = function (oDomOption, oItem) - { - this.defautOptionsAfterRender(oDomOption, oItem); - - if (oItem) - { - oDomOption.classList.add(oItem['class']); - } - }; - ComposeOpenPgpPopupView.prototype.deletePublickKey = function (oKey) { this.encryptKeys.remove(oKey); @@ -405,7 +406,6 @@ aRec = [], sEmail = '', aKeys = [], - oKey = null, oEmail = new EmailModel() ; @@ -438,13 +438,12 @@ sEmail = oIdentity.email(); aRec.unshift(sEmail); aKeys = PgpStore.findAllPrivateKeysByEmailNotNative(sEmail); - if (aKeys) + if (aKeys && aKeys[0]) { - var oKey = aKeys[0]; this.signKey({ - 'users': oKey.users || [sEmail], - 'hash': oKey.id.substr(-8).toUpperCase(), - 'key': oKey + 'users': aKeys[0].users || [sEmail], + 'hash': aKeys[0].id.substr(-8).toUpperCase(), + 'key': aKeys[0] }); } } diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php index df7804a68..c5c74e0d9 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php @@ -133,6 +133,8 @@ class Service } $bIndex = true; + $bMobile = (0 < \count($aPaths) && !empty($aPaths[0]) && 'mobile' === $aPaths[0]); + if (0 < \count($aPaths) && !empty($aPaths[0]) && !$bAdmin && 'index' !== $aPaths[0]) { $bIndex = false; @@ -167,7 +169,7 @@ class Service return $this; } - $aTemplateParameters = $this->indexTemplateParameters($bAdmin); + $aTemplateParameters = $this->indexTemplateParameters($bAdmin, $bMobile); $sCacheFileName = ''; if ($this->oActions->Config()->Get('labs', 'cache_system_data', true)) @@ -223,10 +225,11 @@ class Service /** * @param bool $bAdmin = false + * @param bool $bMobile = false * * @return array */ - private function indexTemplateParameters($bAdmin = false) + private function indexTemplateParameters($bAdmin = false, $bMobile = false) { $sLanguage = 'en'; $sTheme = 'Default'; @@ -255,7 +258,7 @@ class Service 'AppJsLink' => $sStaticPrefix.'js/'.($bAppJsDebug ? '' : 'min/').($bAdmin ? 'admin' : 'app').'.js' ); - $aTemplateParameters = array( + $aTemplateParameters = array( '{{BaseAppDataScriptLink}}' => ($bAdmin ? './?/AdminAppData/' : './?/AppData/'), '{{BaseAppFaviconPngLinkTag}}' => $aData['FaviconPngLink'] ? '' : '', '{{BaseAppFaviconTouchLinkTag}}' => $aData['AppleTouchLink'] ? '' : '', @@ -269,6 +272,8 @@ class Service '{{BaseAppMainCommonScriptLink}}' => $aData['AppJsCommonLink'], '{{BaseAppMainScriptLink}}' => $aData['AppJsLink'], '{{BaseVersion}}' => APP_VERSION, +// '{{BaseViewport}}' => $bMobile ? 'width=device-width,initial-scale=1,user-scalable=no' : 'width=950,maximum-scale=2', + '{{BaseViewport}}' => 'width=950,maximum-scale=2', '{{BaseDir}}' => 'ltr' // '{{BaseDir}}' => \in_array($aData['Language'], array('ar', 'he', 'ur')) ? 'rtl' : 'ltr' ); diff --git a/rainloop/v/0.0.0/app/templates/Index.html b/rainloop/v/0.0.0/app/templates/Index.html index b3d5d9bd2..661c7ecd4 100644 --- a/rainloop/v/0.0.0/app/templates/Index.html +++ b/rainloop/v/0.0.0/app/templates/Index.html @@ -3,7 +3,7 @@
- +