Small fixes

Release commit

dev/Settings/Admin/Branding.js

@@ -41,6 +41,8 @@
 	}
 
 	BrandingAdminSetting.prototype.onBuild = function ()
+	{
+		if (this.capa)
 		{
 			var
 				self = this,
@@ -51,7 +53,10 @@
 
 				var
 					f1 = Utils.settingsSaveHelperSimpleFunction(self.title.trigger, self),
-				f2 = Utils.settingsSaveHelperSimpleFunction(self.loadingDesc.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) {
@@ -66,18 +71,6 @@
 					});
 				});
 
-		}, 50);
-
-		if (this.capa)
-		{
-			_.delay(function () {
-
-				var
-					f3 = Utils.settingsSaveHelperSimpleFunction(self.loginLogo.trigger, self),
-					f4 = Utils.settingsSaveHelperSimpleFunction(self.loginDescription.trigger, self),
-					f5 = Utils.settingsSaveHelperSimpleFunction(self.loginCss.trigger, self)
-				;
-
 				self.loginLogo.subscribe(function (sValue) {
 					Remote.saveAdminConfig(f3, {
 						'LoginLogo': Utils.trim(sValue)
@@ -102,7 +95,7 @@
 					});
 				});
 
-			}, 100);
+			}, 50);
 		}
 	};
 

dev/Styles/Admin.less

@@ -73,6 +73,7 @@
 		height: 34px;
 		padding: 8px @rlLowMargin;
 		color: #fff;
+		text-shadow: 0px 1px 1px #000;
 	}
 
 	.b-content {

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",

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');
 
+
+		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');
 
-		if ($this->HasOneOfActionParams(array('LoginLogo', 'LoginDescription', 'LoginCss', 'LoginPowered')) && $this->PremType())
-		{
 			$this->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string');
 			$this->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string');
 			$this->setConfigFromParams($oConfig, 'LoginCss', 'branding', 'login_css', 'string');

rainloop/v/0.0.0/app/src/RainLoop/Service.php

@@ -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'
 		);
 

rainloop/v/0.0.0/app/templates/Index.html

@@ -37,7 +37,7 @@
 	<body>
 		<div id="rl-bg" class="thm-body"></div>
 		<div id="rl-loading" class="thm-loading">
-			{{BaseAppLoadingDescription}}
+			<div id="rl-loading-desc">Loading</div>
 			<div class="e-spinner">
 				<div class="e-bounce bounce1"></div>
 				<div class="e-bounce bounce2"></div>
@@ -45,7 +45,14 @@
 			</div>
 		</div>
 		<script data-cfasync="false">
-			var oE = window.document.getElementById('rl-loading');
+			var
+				oE = window.document.getElementById('rl-loading'),
+				oElDesc = window.document.getElementById('rl-loading-desc')
+			;
+
+			if (oElDesc && window.rainloopAppData['LoadingDescriptionEsc']) {
+				oElDesc.innerHTML = window.rainloopAppData['LoadingDescriptionEsc'];
+			}
 			if (oE && oE.style) {
 				oE.style.opacity = 0;
 				window.setTimeout(function () {

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html

@@ -4,8 +4,7 @@
 			Full functionality available in <strong><a href="#/licensing">Premium version</a></strong> only.
 		</div>
 	</div>
-	<div class="form-horizontal">
+	<div class="form-horizontal" data-bind="css: {'disabled-form': !capa}">
-		<div>
 		<div class="legend">
 			Branding
 		</div>
@@ -15,7 +14,7 @@
 			</label>
 			<div class="controls">
 				<input type="text" class="span5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-						data-bind="value: title, saveTrigger: title.trigger" />
+					data-bind="value: title, saveTrigger: title.trigger, enable: capa" />
 				<div data-bind="saveTrigger: title.trigger"></div>
 			</div>
 		</div>
@@ -25,13 +24,11 @@
 			</label>
 			<div class="controls">
 				<input type="text" class="span5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-						data-bind="value: loadingDesc, saveTrigger: loadingDesc.trigger" />
+					data-bind="value: loadingDesc, saveTrigger: loadingDesc.trigger, enable: capa" />
 				<div data-bind="saveTrigger: loadingDesc.trigger"></div>
 			</div>
 		</div>
-		</div>
 		<br />
-		<div data-bind="css: {'disabled-form': !capa}">
 		<div class="legend">
 			Login Screen
 		</div>
@@ -74,5 +71,4 @@
 			</div>
 		</div>
 	</div>
-	</div>
 </div>