From 86295f6e5b3a6a135afac49e01b3edcf307ed3bd Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Wed, 29 Apr 2015 00:28:30 +0400 Subject: [PATCH] Branding: User logo / logo title --- dev/Settings/Admin/Branding.js | 62 +++++++++++-------- dev/Styles/SystemDropDown.less | 11 +++- dev/View/User/AbstractSystemDropDown.js | 3 + .../0.0.0/app/libraries/RainLoop/Actions.php | 5 +- .../libraries/RainLoop/Config/Application.php | 1 + .../Views/Admin/AdminSettingsBranding.html | 29 +++++++++ .../templates/Views/User/SystemDropDown.html | 5 ++ rainloop/v/0.0.0/langs/admin/de.ini | 1 + rainloop/v/0.0.0/langs/admin/en.ini | 1 + rainloop/v/0.0.0/langs/admin/pt-br.ini | 1 + rainloop/v/0.0.0/langs/admin/ru.ini | 1 + 11 files changed, 92 insertions(+), 28 deletions(-) diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js index b76661ebe..77429cfd7 100644 --- a/dev/Settings/Admin/Branding.js +++ b/dev/Settings/Admin/Branding.js @@ -39,6 +39,9 @@ this.userLogo = ko.observable(Settings.settingsGet('UserLogo') || ''); this.userLogo.trigger = ko.observable(Enums.SaveSettingsStep.Idle); + this.userLogoTitle = ko.observable(Settings.settingsGet('UserLogoTitle') || ''); + this.userLogoTitle.trigger = ko.observable(Enums.SaveSettingsStep.Idle); + this.loginDescription = ko.observable(Settings.settingsGet('LoginDescription')); this.loginDescription.trigger = ko.observable(Enums.SaveSettingsStep.Idle); @@ -78,60 +81,67 @@ _.delay(function () { var - f3 = Utils.settingsSaveHelperSimpleFunction(self.loginLogo.trigger, self), - f4 = Utils.settingsSaveHelperSimpleFunction(self.loginDescription.trigger, self), - f5 = Utils.settingsSaveHelperSimpleFunction(self.loginCss.trigger, self), - f6 = Utils.settingsSaveHelperSimpleFunction(self.userLogo.trigger, self), - f7 = Utils.settingsSaveHelperSimpleFunction(self.loginBackground.trigger, self), - f8 = Utils.settingsSaveHelperSimpleFunction(self.userCss.trigger, self), - f9 = Utils.settingsSaveHelperSimpleFunction(self.welcomePageUrl.trigger, self), - f10 = Utils.settingsSaveHelperSimpleFunction(self.welcomePageDisplay.trigger, self) + f1 = Utils.settingsSaveHelperSimpleFunction(self.loginLogo.trigger, self), + f2 = Utils.settingsSaveHelperSimpleFunction(self.loginDescription.trigger, self), + f3 = Utils.settingsSaveHelperSimpleFunction(self.loginCss.trigger, self), + f4 = Utils.settingsSaveHelperSimpleFunction(self.userLogo.trigger, self), + f5 = Utils.settingsSaveHelperSimpleFunction(self.userLogoTitle.trigger, self), + f6 = Utils.settingsSaveHelperSimpleFunction(self.loginBackground.trigger, self), + f7 = Utils.settingsSaveHelperSimpleFunction(self.userCss.trigger, self), + f8 = Utils.settingsSaveHelperSimpleFunction(self.welcomePageUrl.trigger, self), + f9 = Utils.settingsSaveHelperSimpleFunction(self.welcomePageDisplay.trigger, self) ; self.loginLogo.subscribe(function (sValue) { - Remote.saveAdminConfig(f3, { + Remote.saveAdminConfig(f1, { 'LoginLogo': Utils.trim(sValue) }); }); - self.loginBackground.subscribe(function (sValue) { - Remote.saveAdminConfig(f7, { - 'LoginBackground': Utils.trim(sValue) - }); - }); - - self.userLogo.subscribe(function (sValue) { - Remote.saveAdminConfig(f6, { - 'UserLogo': Utils.trim(sValue) - }); - }); - self.loginDescription.subscribe(function (sValue) { - Remote.saveAdminConfig(f4, { + Remote.saveAdminConfig(f2, { 'LoginDescription': Utils.trim(sValue) }); }); self.loginCss.subscribe(function (sValue) { - Remote.saveAdminConfig(f5, { + Remote.saveAdminConfig(f3, { 'LoginCss': Utils.trim(sValue) }); }); + self.userLogo.subscribe(function (sValue) { + Remote.saveAdminConfig(f4, { + 'UserLogo': Utils.trim(sValue) + }); + }); + + self.userLogoTitle.subscribe(function (sValue) { + Remote.saveAdminConfig(f5, { + 'UserLogoTitle': Utils.trim(sValue) + }); + }); + + self.loginBackground.subscribe(function (sValue) { + Remote.saveAdminConfig(f6, { + 'LoginBackground': Utils.trim(sValue) + }); + }); + self.userCss.subscribe(function (sValue) { - Remote.saveAdminConfig(f8, { + Remote.saveAdminConfig(f7, { 'UserCss': Utils.trim(sValue) }); }); self.welcomePageUrl.subscribe(function (sValue) { - Remote.saveAdminConfig(f9, { + Remote.saveAdminConfig(f8, { 'WelcomePageUrl': Utils.trim(sValue) }); }); self.welcomePageDisplay.subscribe(function (sValue) { - Remote.saveAdminConfig(f10, { + Remote.saveAdminConfig(f9, { 'WelcomePageDisplay': Utils.trim(sValue) }); }); diff --git a/dev/Styles/SystemDropDown.less b/dev/Styles/SystemDropDown.less index 32422839f..4bab81b1b 100644 --- a/dev/Styles/SystemDropDown.less +++ b/dev/Styles/SystemDropDown.less @@ -34,16 +34,25 @@ vertical-align: middle; } + .logoPlace { + margin: -5px 10px 0 0; + font-size: 25px; + line-height: 30px; + height: 40px; + } + .audioPlace { font-size: 25px; line-height: 30px; - margin-right: 15px; + margin-right: 10px; + width: 25px; .playIcon, .stopIcon { cursor: pointer; color: orange; text-shadow: 0 1px 0 #555; + float: right; } .playIcon { diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js index 76c1d5e9e..c67261165 100644 --- a/dev/View/User/AbstractSystemDropDown.js +++ b/dev/View/User/AbstractSystemDropDown.js @@ -30,6 +30,9 @@ { AbstractView.call(this, 'Right', 'SystemDropDown'); + this.logoImg = Utils.trim(Settings.settingsGet('UserLogo')); + this.logoTitle = Utils.trim(Settings.settingsGet('UserLogoTitle')); + this.currentAudio = AppStore.currentAudio; this.accountEmail = AccountStore.email; 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 5f2fdb26d..a1a28f6ab 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1299,6 +1299,7 @@ class Actions 'LoginBackground' => '', 'LoginCss' => '', 'UserLogo' => '', + 'UserLogoTitle' => '', 'UserCss' => '', 'WelcomePageUrl' => '', 'WelcomePageDisplay' => 'none', @@ -1390,6 +1391,7 @@ class Actions $aResult['LoginDescription'] = $oConfig->Get('branding', 'login_desc', ''); $aResult['LoginPowered'] = !!$oConfig->Get('branding', 'login_powered', true); $aResult['UserLogo'] = $oConfig->Get('branding', 'user_logo', ''); + $aResult['UserLogoTitle'] = $oConfig->Get('branding', 'user_logo_title', ''); $aResult['UserCss'] = $oConfig->Get('branding', 'user_css', ''); $aResult['WelcomePageUrl'] = $oConfig->Get('branding', 'welcome_page_url', ''); $aResult['WelcomePageDisplay'] = \strtolower($oConfig->Get('branding', 'welcome_page_display', 'none')); @@ -3531,7 +3533,7 @@ class Actions if ($this->HasOneOfActionParams(array( 'LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss', 'LoginPowered', - 'UserLogo', 'UserCss', + 'UserLogo', 'UserLogoTitle', 'UserCss', 'WelcomePageUrl', 'WelcomePageDisplay' )) && $this->PremType()) { @@ -3542,6 +3544,7 @@ class Actions $this->setConfigFromParams($oConfig, 'LoginPowered', 'branding', 'login_powered', 'bool'); $this->setConfigFromParams($oConfig, 'UserLogo', 'branding', 'user_logo', 'string'); + $this->setConfigFromParams($oConfig, 'UserLogoTitle', 'branding', 'user_logo_title', 'string'); $this->setConfigFromParams($oConfig, 'UserCss', 'branding', 'user_css', 'string'); $this->setConfigFromParams($oConfig, 'WelcomePageUrl', 'branding', 'welcome_page_url', 'string'); diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 644d251e9..2e40f6f89 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -89,6 +89,7 @@ class Application extends \RainLoop\Config\AbstractConfig 'login_css' => array(''), 'login_powered' => array(true), 'user_logo' => array(''), + 'user_logo_title' => array(''), 'user_css' => array(''), 'welcome_page_url' => array(''), 'welcome_page_display' => array('none') 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 2b1f3f84f..12dbad047 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 @@ -126,6 +126,35 @@
+
+ +
+
+
+
+
+ +
+
+
+
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html index eaa27def4..bace6f75b 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html @@ -78,6 +78,11 @@
+
+ +
+
\ No newline at end of file diff --git a/rainloop/v/0.0.0/langs/admin/de.ini b/rainloop/v/0.0.0/langs/admin/de.ini index 0be1bca93..1c16e126b 100644 --- a/rainloop/v/0.0.0/langs/admin/de.ini +++ b/rainloop/v/0.0.0/langs/admin/de.ini @@ -60,6 +60,7 @@ LABEL_LOGIN_CUSTOM_CSS = "Benutzerdefiniertes CSS" LABEL_LOGIN_SHOW_POWERED_LINK = "\"Powered by RainLoop\"-Link anzeigen" LEGEND_USER = "Benutzer" LABEL_USER_LOGO = "Logo" +LABEL_USER_LOGO_TITLE = "Logo Title" LABEL_USER_CUSTOM_CSS = "Benutzerdefiniertes CSS" LEGEND_WELCOME_PAGE = "Willkommensseite" LABEL_WELCOME_PAGE_TITLE = "Titel" diff --git a/rainloop/v/0.0.0/langs/admin/en.ini b/rainloop/v/0.0.0/langs/admin/en.ini index 4ff2f1350..6e50110af 100644 --- a/rainloop/v/0.0.0/langs/admin/en.ini +++ b/rainloop/v/0.0.0/langs/admin/en.ini @@ -61,6 +61,7 @@ LABEL_LOGIN_CUSTOM_CSS = "Custom CSS" LABEL_LOGIN_SHOW_POWERED_LINK = "Show \"Powered by RainLoop\" link" LEGEND_USER = "User" LABEL_USER_LOGO = "Logo" +LABEL_USER_LOGO_TITLE = "Logo Title" LABEL_USER_CUSTOM_CSS = "Custom CSS" LEGEND_WELCOME_PAGE = "Welcome page" LABEL_WELCOME_PAGE_TITLE = "Title" diff --git a/rainloop/v/0.0.0/langs/admin/pt-br.ini b/rainloop/v/0.0.0/langs/admin/pt-br.ini index dfca120f9..5546c4443 100644 --- a/rainloop/v/0.0.0/langs/admin/pt-br.ini +++ b/rainloop/v/0.0.0/langs/admin/pt-br.ini @@ -61,6 +61,7 @@ LABEL_LOGIN_CUSTOM_CSS = "CSS personalizado" LABEL_LOGIN_SHOW_POWERED_LINK = "Mostrar link \"Powered by RainLoop\"" LEGEND_USER = "Internas" LABEL_USER_LOGO = "Logo" +LABEL_USER_LOGO_TITLE = "Logo Title" LABEL_USER_CUSTOM_CSS = "CSS personalizado" LEGEND_WELCOME_PAGE = "Página de boas-vindas" LABEL_WELCOME_PAGE_TITLE = "Título" diff --git a/rainloop/v/0.0.0/langs/admin/ru.ini b/rainloop/v/0.0.0/langs/admin/ru.ini index 4d9516d4c..915c6b9ad 100644 --- a/rainloop/v/0.0.0/langs/admin/ru.ini +++ b/rainloop/v/0.0.0/langs/admin/ru.ini @@ -60,6 +60,7 @@ LABEL_LOGIN_CUSTOM_CSS = "Кастомный CSS" LABEL_LOGIN_SHOW_POWERED_LINK = "Показывать ссылку \"Powered by RainLoop\"" LEGEND_USER = "Экран пользователя" LABEL_USER_LOGO = "Логотип" +LABEL_USER_LOGO_TITLE = "Название логотипа" LABEL_USER_CUSTOM_CSS = "Кастомный CSS" LEGEND_WELCOME_PAGE = "Приветствие" LABEL_WELCOME_PAGE_TITLE = "Название"