From a3f28b09f633987695de453e9b5d7ffdccd85767 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Thu, 19 Feb 2015 02:14:22 +0400
Subject: [PATCH] Allow some branding settings

---
 .../0.0.0/app/libraries/RainLoop/Actions.php  | 14 ++++----
 .../Views/Admin/AdminSettingsBranding.html    | 32 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 207da5bb9..75798510e 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1315,11 +1315,11 @@ 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['LoginBackground'] = $oConfig->Get('branding', 'login_background', '');
 			$aResult['LoginCss'] = $oConfig->Get('branding', 'login_css', '');
@@ -3198,11 +3198,11 @@ 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', 'LoginBackground', 'LoginDescription', 'LoginCss', 'LoginPowered', 'UserLogo', 'UserCss')) && $this->PremType())
-		{
-			$this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string');
-			$this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string');
+		$this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string');
+		$this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string');
 
+		if ($this->HasOneOfActionParams(array('LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss', 'LoginPowered', 'UserLogo', 'UserCss')) && $this->PremType())
+		{
 			$this->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string');
 			$this->setConfigFromParams($oConfig, 'LoginBackground', 'branding', 'login_background', 'string');
 			$this->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string');
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
index c3989f576..7c58f81c5 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
@@ -1,10 +1,5 @@
 <div class="b-admin-branding">
-	<div class="row" data-bind="visible: !capa()">
-		<div class="alert span8" style="margin-top: 10px;">
-			This functionality is available for <strong><a href="#/licensing">Premium</a></strong> subscribers.
-		</div>
-	</div>
-	<div class="form-horizontal" data-bind="css: {'disabled-form': !capa()}">
+	<div class="form-horizontal">
 		<div class="legend">
 			Branding
 		</div>
@@ -18,8 +13,7 @@
 					params: {
 						value: title,
 						trigger: title.trigger,
-						size: 5,
-						enable: capa
+						size: 5
 					}
 				}"></div>
 			</div>
@@ -34,13 +28,14 @@
 					params: {
 						value: loadingDesc,
 						trigger: loadingDesc.trigger,
-						size: 5,
-						enable: capa
+						size: 5
 					}
 				}"></div>
 			</div>
 		</div>
-		<br />
+	</div>
+	<br />
+	<div class="form-horizontal" data-bind="css: {'disabled-form': !capa()}">
 		<div class="legend">
 			Login
 		</div>
@@ -104,7 +99,7 @@
 					params: {
 						value: loginCss,
 						trigger: loginCss.trigger,
-						width: 530,
+						width: 495,
 						enable: capa,
 						rows: 7
 					}
@@ -126,7 +121,8 @@
 		<div class="legend">
 			User
 		</div>
-<!--		<div class="control-group">
+<!--
+		<div class="control-group">
 			<label class="control-label">
 				Logo
 			</label>
@@ -142,7 +138,8 @@
 					}
 				}"></div>
 			</div>
-		</div>-->
+		</div>
+-->
 		<div class="control-group">
 			<label class="control-label">
 				Custom CSS
@@ -153,12 +150,17 @@
 					params: {
 						value: userCss,
 						trigger: userCss.trigger,
-						width: 530,
+						width: 495,
 						enable: capa,
 						rows: 7
 					}
 				}"></div>
 			</div>
 		</div>
+		<div class="row" data-bind="visible: !capa()">
+			<div class="alert span8" style="margin-top: 10px;">
+				This functionality is available for <strong><a href="#/licensing">Premium</a></strong> subscribers.
+			</div>
+		</div>
 	</div>
 </div>
\ No newline at end of file