diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js index 268d4787a..49bada885 100644 --- a/dev/Settings/Admin/Branding.js +++ b/dev/Settings/Admin/Branding.js @@ -42,42 +42,35 @@ BrandingAdminSetting.prototype.onBuild = function () { - var - self = this, - Remote = require('Storage/Admin/Remote') - ; - - _.delay(function () { - - var - f1 = Utils.settingsSaveHelperSimpleFunction(self.title.trigger, self), - f2 = Utils.settingsSaveHelperSimpleFunction(self.loadingDesc.trigger, self) - ; - - self.title.subscribe(function (sValue) { - Remote.saveAdminConfig(f1, { - 'Title': Utils.trim(sValue) - }); - }); - - self.loadingDesc.subscribe(function (sValue) { - Remote.saveAdminConfig(f2, { - 'LoadingDescription': Utils.trim(sValue) - }); - }); - - }, 50); - if (this.capa) { + var + self = this, + Remote = require('Storage/Admin/Remote') + ; + _.delay(function () { var + f1 = Utils.settingsSaveHelperSimpleFunction(self.title.trigger, self), + f2 = Utils.settingsSaveHelperSimpleFunction(self.loadingDesc.trigger, self), f3 = Utils.settingsSaveHelperSimpleFunction(self.loginLogo.trigger, self), f4 = Utils.settingsSaveHelperSimpleFunction(self.loginDescription.trigger, self), f5 = Utils.settingsSaveHelperSimpleFunction(self.loginCss.trigger, self) ; + self.title.subscribe(function (sValue) { + Remote.saveAdminConfig(f1, { + 'Title': Utils.trim(sValue) + }); + }); + + self.loadingDesc.subscribe(function (sValue) { + Remote.saveAdminConfig(f2, { + 'LoadingDescription': Utils.trim(sValue) + }); + }); + self.loginLogo.subscribe(function (sValue) { Remote.saveAdminConfig(f3, { 'LoginLogo': Utils.trim(sValue) @@ -102,7 +95,7 @@ }); }); - }, 100); + }, 50); } }; diff --git a/dev/Styles/Admin.less b/dev/Styles/Admin.less index ef8adbad4..b27699559 100644 --- a/dev/Styles/Admin.less +++ b/dev/Styles/Admin.less @@ -73,6 +73,7 @@ height: 34px; padding: 8px @rlLowMargin; color: #fff; + text-shadow: 0px 1px 1px #000; } .b-content { diff --git a/package.json b/package.json index 7a036dbc1..94f00b1f3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.6.10", - "release": "184", + "release": "185", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "gulpfile.js", 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 00f35628f..da3aa0390 100644 --- a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php @@ -997,6 +997,7 @@ class Actions 'DevPassword' => '', 'Title' => 'RainLoop Webmail', 'LoadingDescription' => 'RainLoop', + 'LoadingDescriptionEsc' => 'RainLoop', 'LoginLogo' => '', 'LoginDescription' => '', 'LoginCss' => '', @@ -1046,17 +1047,20 @@ class Actions $aResult['AuthAccountHash'] = $sAuthAccountHash; } - $aResult['Title'] = $oConfig->Get('webmail', 'title', ''); - $aResult['LoadingDescription'] = $oConfig->Get('webmail', 'loading_description', ''); if ($this->PremType()) { + $aResult['Title'] = $oConfig->Get('webmail', 'title', ''); + $aResult['LoadingDescription'] = $oConfig->Get('webmail', 'loading_description', ''); + $aResult['LoginLogo'] = $oConfig->Get('branding', 'login_logo', ''); $aResult['LoginDescription'] = $oConfig->Get('branding', 'login_desc', ''); $aResult['LoginCss'] = $oConfig->Get('branding', 'login_css', ''); $aResult['LoginPowered'] = !!$oConfig->Get('branding', 'login_powered', true); } + $aResult['LoadingDescriptionEsc'] = \htmlspecialchars($aResult['LoadingDescription'], ENT_QUOTES|ENT_IGNORE, 'UTF-8'); + $oSettings = null; if (!$bAdmin) { @@ -2469,11 +2473,12 @@ class Actions $this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool'); $this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool'); - $this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string'); - $this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string'); - if ($this->HasOneOfActionParams(array('LoginLogo', 'LoginDescription', 'LoginCss', 'LoginPowered')) && $this->PremType()) + if ($this->HasOneOfActionParams(array('Title', 'LoadingDescription', 'LoginLogo', 'LoginDescription', 'LoginCss', 'LoginPowered')) && $this->PremType()) { + $this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string'); + $this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string'); + $this->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string'); $this->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string'); $this->setConfigFromParams($oConfig, 'LoginCss', 'branding', 'login_css', 'string'); diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Service.php b/rainloop/v/0.0.0/app/src/RainLoop/Service.php index e5d7fc215..d284233bd 100644 --- a/rainloop/v/0.0.0/app/src/RainLoop/Service.php +++ b/rainloop/v/0.0.0/app/src/RainLoop/Service.php @@ -40,7 +40,7 @@ class Service { @\header('Server: '.$sServer, true); } - + $sXFrameOptionsHeader = \trim($this->oActions->Config()->Get('security', 'x_frame_options_header', '')); if (0 < \strlen($sXFrameOptionsHeader)) { @@ -81,7 +81,7 @@ class Service $bOne = $oService->RunResult(); } - + return $bOne; } @@ -220,7 +220,6 @@ class Service $aData = array( 'Language' => $sLanguage, 'Theme' => $sTheme, - 'LoadingDescription' => $this->oActions->Config()->Get('webmail', 'loading_description', 'RainLoop'), 'FaviconIcoLink' => $sStaticPrefix.'favicon.ico', 'FaviconPngLink' => $sStaticPrefix.'favicon.png', 'AppleTouchLink' => $sStaticPrefix.'apple-touch-icon.png', @@ -243,7 +242,6 @@ class Service '{{BaseAppEditorScriptLink}}' => $aData['EditorJsLink'], '{{BaseAppOpenPgpScriptLink}}' => $aData['OpenPgpJsLink'], '{{BaseAppMainScriptLink}}' => $aData['AppJsLink'], - '{{BaseAppLoadingDescription}}' => \htmlspecialchars($aData['LoadingDescription'], ENT_QUOTES|ENT_IGNORE, 'UTF-8'), '{{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 4dd7a6279..a44e38988 100644 --- a/rainloop/v/0.0.0/app/templates/Index.html +++ b/rainloop/v/0.0.0/app/templates/Index.html @@ -37,7 +37,7 @@
- {{BaseAppLoadingDescription}} +
Loading