Added "forgot_password_link_url" and "registration_link_url" settings

dev/View/User/Login.js

@@ -44,6 +44,9 @@
 		this.logoCss = Utils.trim(Settings.settingsGet('LoginCss'));
 		this.logoPowered = !!Settings.settingsGet('LoginPowered');
 
+		this.forgotPasswordLinkUrl = Settings.settingsGet('ForgotPasswordLinkUrl');
+		this.registrationLinkUrl = Settings.settingsGet('RegistrationLinkUrl');
+
 		this.emailError = ko.observable(false);
 		this.passwordError = ko.observable(false);
 

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

@@ -1039,6 +1039,8 @@ class Actions
 			'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
 			'DetermineUserLanguage' => (bool) $oConfig->Get('login', 'determine_user_language', true),
 			'DetermineUserDomain' => (bool) $oConfig->Get('login', 'determine_user_domain', false),
+			'ForgotPasswordLinkUrl' => \trim($oConfig->Get('login', 'forgot_password_link_url', '')),
+			'RegistrationLinkUrl' => \trim($oConfig->Get('login', 'registration_link_url', '')),
 			'ContactsIsAllowed' => false,
 			'ChangePasswordIsAllowed' => false,
 			'JsHash' => \md5(\RainLoop\Utils::GetConnectionToken()),

rainloop/v/0.0.0/app/src/RainLoop/Config/Application.php

@@ -131,6 +131,9 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'determine_user_language' => array(true, ''),
 				'determine_user_domain' => array(false, ''),
 
+				'forgot_password_link_url' => array('', ''),
+				'registration_link_url' => array('', ''),
+
 				'sign_me_auto'	=> array(\RainLoop\Enumerations\SignMeType::DEFAILT_OFF,
 					'This option allows webmail to remember the logged in user
 once they closed the browser window.

rainloop/v/0.0.0/app/templates/Views/User/Login.html

@@ -83,6 +83,16 @@
 						</a>
 					</div>
 				</div>
+				<div class="control-group" data-bind="visible: '' !== forgotPasswordLinkUrl || '' !== registrationLinkUrl">
+					<div class="forgot-link thm-forgot" data-bind="visible: '' !== forgotPasswordLinkUrl" style="text-align: center">
+						<a href="#" target="_blank" class="g-ui-link" data-bind="attr: {href: forgotPasswordLinkUrl}, css: {'pull-right': '' !== registrationLinkUrl}"
+							><span class="i18n" data-i18n-text="LOGIN/LABEL_FORGOT_PASSWORD"></span></a>
+					</div>
+					<div class="registration-link thm-registration" data-bind="visible: '' !== registrationLinkUrl" style="text-align: center">
+						<a href="#" target="_blank" class="g-ui-link" data-bind="attr: {href: registrationLinkUrl}, css: {'pull-left': '' !== forgotPasswordLinkUrl}"
+							><span class="i18n" data-i18n-text="LOGIN/LABEL_REGISTRATION"></span></a>
+					</div>
+				</div>
 			</form>
 			<div class="e-powered thm-powered" data-bind="visible: logoPowered">
 				Powered by <a href="http://rainloop.net" target="_blank">RainLoop</a>

rainloop/v/0.0.0/langs/bg.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Вход"
 TITLE_SIGN_IN_GOOGLE = "Вход с Google"
 TITLE_SIGN_IN_FACEBOOK = "Вход с Facebook"
 TITLE_SIGN_IN_TWITTER = "Вход с Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Добави акаунт"

rainloop/v/0.0.0/langs/de.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Anmelden"
 TITLE_SIGN_IN_GOOGLE = "Mit Google anmelden"
 TITLE_SIGN_IN_FACEBOOK = "Mit Facebook anmelden"
 TITLE_SIGN_IN_TWITTER = "Mit Twitter anmelden"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Konto hinzufügen"

rainloop/v/0.0.0/langs/en.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Sign In"
 TITLE_SIGN_IN_GOOGLE = "Sign In using Google"
 TITLE_SIGN_IN_FACEBOOK = "Sign In using Facebook"
 TITLE_SIGN_IN_TWITTER = "Sign In using Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Add Account"

rainloop/v/0.0.0/langs/es.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Ingresar"
 TITLE_SIGN_IN_GOOGLE = "Ingresar usando Google"
 TITLE_SIGN_IN_FACEBOOK = "Ingresar usando Facebook"
 TITLE_SIGN_IN_TWITTER = "Ingresar usando Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Agregar cuenta"

rainloop/v/0.0.0/langs/fr.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Se connecter"
 TITLE_SIGN_IN_GOOGLE = "Se connecter avec Google"
 TITLE_SIGN_IN_FACEBOOK = "Se connecter avec Facebook"
 TITLE_SIGN_IN_TWITTER = "Se connecter avec Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Ajouter un compte"

rainloop/v/0.0.0/langs/hu.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Belépés"
 TITLE_SIGN_IN_GOOGLE = "Belépés Google használatával"
 TITLE_SIGN_IN_FACEBOOK = "Belépés Facebook használatával"
 TITLE_SIGN_IN_TWITTER = "Belépés Twitter használatával"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Új fiók"

rainloop/v/0.0.0/langs/is.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Innskrá"
 TITLE_SIGN_IN_GOOGLE = "Innskráning með Google"
 TITLE_SIGN_IN_FACEBOOK = "Innskráning með Facebook"
 TITLE_SIGN_IN_TWITTER = "Innskráning með Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Bæta við aðgangi"

rainloop/v/0.0.0/langs/it.ini

@@ -10,6 +10,8 @@ BUTTON_SIGN_IN = "Accedi"
 TITLE_SIGN_IN_GOOGLE = "Accedi usando Google"
 TITLE_SIGN_IN_FACEBOOK = "Accedi usando Facebook"
 TITLE_SIGN_IN_TWITTER = "Accedi usando Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Aggiungi account"

rainloop/v/0.0.0/langs/ja-jp.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "サインイン"
 TITLE_SIGN_IN_GOOGLE = "Googleアカウントでログイン"
 TITLE_SIGN_IN_FACEBOOK = "Facebookアカウントでログイン"
 TITLE_SIGN_IN_TWITTER = "Twitterアカウントでログイン"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "アカウントを追加"

rainloop/v/0.0.0/langs/ko-kr.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "로그인"
 TITLE_SIGN_IN_GOOGLE = "구글 계정으로 로그인"
 TITLE_SIGN_IN_FACEBOOK = "페이스북 계정으로 로그인"
 TITLE_SIGN_IN_TWITTER = "트위터 계정으로 로그인"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "계정 추가"

rainloop/v/0.0.0/langs/lt.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Prisijungti"
 TITLE_SIGN_IN_GOOGLE = "Prisijungti naudojant Google paskyrą"
 TITLE_SIGN_IN_FACEBOOK = "Prisijungti naudojant Facebook paskyrą"
 TITLE_SIGN_IN_TWITTER = "Prisijungti naudojant Twitter paskyrą"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Pridėti paskyrą"

rainloop/v/0.0.0/langs/lv.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Ielogoties"
 TITLE_SIGN_IN_GOOGLE = "Ielogoties izmantojot Google"
 TITLE_SIGN_IN_FACEBOOK = "Ielogoties izmantojot Facebook"
 TITLE_SIGN_IN_TWITTER = "Ielogoties izmantojot Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Pievienot kontu"

rainloop/v/0.0.0/langs/nl.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Aanmelden"
 TITLE_SIGN_IN_GOOGLE = "Aanmelden met Google"
 TITLE_SIGN_IN_FACEBOOK = "Aanmelden met Facebook"
 TITLE_SIGN_IN_TWITTER = "Aanmelden met Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Account toevoegen"

rainloop/v/0.0.0/langs/no.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Logg inn"
 TITLE_SIGN_IN_GOOGLE = "Logg inn med Google"
 TITLE_SIGN_IN_FACEBOOK = "Logg inn med Facebook"
 TITLE_SIGN_IN_TWITTER = "Logg inn med Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Legg til konto"

rainloop/v/0.0.0/langs/pl.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Zaloguj"
 TITLE_SIGN_IN_GOOGLE = "Zaloguj się przez Google"
 TITLE_SIGN_IN_FACEBOOK = "Zaloguj się przez Facebook"
 TITLE_SIGN_IN_TWITTER = "Zaloguj się przez Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Dodaj konto"

rainloop/v/0.0.0/langs/pt-br.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Entrar"
 TITLE_SIGN_IN_GOOGLE = "Entrar com a conta do Google"
 TITLE_SIGN_IN_FACEBOOK = "Entrar com a conta do Facebook"
 TITLE_SIGN_IN_TWITTER = "Entrar com a conta do Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Adicionar Conta"

rainloop/v/0.0.0/langs/pt-pt.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Entre"
 TITLE_SIGN_IN_GOOGLE = "Entre com a conta do Google"
 TITLE_SIGN_IN_FACEBOOK = "Entre com a conta do Facebook"
 TITLE_SIGN_IN_TWITTER = "Entre com a conta do Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Adicionar Conta"

rainloop/v/0.0.0/langs/ro.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Conectare"
 TITLE_SIGN_IN_GOOGLE = "Войти, используя Google"
 TITLE_SIGN_IN_FACEBOOK = "Войти, используя Facebook"
 TITLE_SIGN_IN_TWITTER = "Войти, используя Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Adaugă un cont"

rainloop/v/0.0.0/langs/ru.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Войти"
 TITLE_SIGN_IN_GOOGLE = "Войти, используя Google"
 TITLE_SIGN_IN_FACEBOOK = "Войти, используя Facebook"
 TITLE_SIGN_IN_TWITTER = "Войти, используя Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Добавить ещё аккаунт"

rainloop/v/0.0.0/langs/sk.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Prihlásiť"
 TITLE_SIGN_IN_GOOGLE = "Prihlásiť pomocu Google"
 TITLE_SIGN_IN_FACEBOOK = "Prihlásiť pomocou Facebook"
 TITLE_SIGN_IN_TWITTER = "Prihlásiť pomocou Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Pridať Účet"

rainloop/v/0.0.0/langs/sv.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Logga in"
 TITLE_SIGN_IN_GOOGLE = "Logga in med Google"
 TITLE_SIGN_IN_FACEBOOK = "Logga in med Facebook"
 TITLE_SIGN_IN_TWITTER = "Logga in med Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Lägg till konto"

rainloop/v/0.0.0/langs/tr.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Giriş Yap"
 TITLE_SIGN_IN_GOOGLE = "Google İle Giriş Yap"
 TITLE_SIGN_IN_FACEBOOK = "Facebook ile Giriş yap"
 TITLE_SIGN_IN_TWITTER = "Twitter İle Giriş Yap"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Hesap Ekle"

rainloop/v/0.0.0/langs/ua.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "Увійти"
 TITLE_SIGN_IN_GOOGLE = "Увійти, використовуючи Google"
 TITLE_SIGN_IN_FACEBOOK = "Увійти, використовуючи Facebook"
 TITLE_SIGN_IN_TWITTER = "Увійти, використовуючи Twitter"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "Додати ще акаунт"

rainloop/v/0.0.0/langs/zh-cn.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "登入"
 TITLE_SIGN_IN_GOOGLE = "使用Google帐号登陆"
 TITLE_SIGN_IN_FACEBOOK = "使用Facebook帐号登陆"
 TITLE_SIGN_IN_TWITTER = "使用Twitter帐号登陆"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "添加账户"

rainloop/v/0.0.0/langs/zh-tw.ini

@@ -9,6 +9,8 @@ BUTTON_SIGN_IN = "登入"
 TITLE_SIGN_IN_GOOGLE = "使用Google帳號登錄"
 TITLE_SIGN_IN_FACEBOOK = "使用Facebook帳號登錄"
 TITLE_SIGN_IN_TWITTER = "使用Twitter帳號登錄"
+LABEL_FORGOT_PASSWORD = "Forgot password"
+LABEL_REGISTRATION = "Registration"
 
 [TOP_TOOLBAR]
 BUTTON_ADD_ACCOUNT = "添加帳戶"