diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less index 038b1132c..2bcfd2368 100644 --- a/dev/Styles/Login.less +++ b/dev/Styles/Login.less @@ -118,7 +118,7 @@ line-height: 29px; right: 6px; top: 6px; - z-index: 10; + z-index: 6; } .input-append .add-on * { diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index c2aa7ff5f..49a412b4f 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -57,9 +57,6 @@ class LoginUserView extends AbstractViewCenter { signMeType: LoginSignMeType.Unused }); - this.forgotPasswordLinkUrl = Settings.app('forgotPasswordLinkUrl'); - this.registrationLinkUrl = Settings.app('registrationLinkUrl'); - this.formError = ko.observable(false).extend({ falseTimeout: 500 }); this.allowLanguagesOnLogin = !!SettingsGet('AllowLanguagesOnLogin'); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 844df3b44..efa75da86 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -995,8 +995,6 @@ class Actions 'allowHtmlEditorSourceButton' => (bool)$oConfig->Get('labs', 'allow_html_editor_source_button', false), 'allowHtmlEditorBitiButtons' => (bool)$oConfig->Get('labs', 'allow_html_editor_biti_buttons', false), 'allowCtrlEnterOnCompose' => (bool)$oConfig->Get('labs', 'allow_ctrl_enter_on_compose', false), - 'forgotPasswordLinkUrl' => \trim($oConfig->Get('login', 'forgot_password_link_url', '')), - 'registrationLinkUrl' => \trim($oConfig->Get('login', 'registration_link_url', '')), 'hideSubmitButton' => (bool)$oConfig->Get('login', 'hide_submit_button', true), 'useImapThread' => (bool)$oConfig->Get('labs', 'use_imap_thread', false), 'useImapSubscribe' => (bool)$oConfig->Get('labs', 'use_imap_list_subscribe', true), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index fc86ba406..62188ece5 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -202,9 +202,6 @@ class Application extends \RainLoop\Config\AbstractConfig 'hide_submit_button' => array(true), - 'forgot_password_link_url' => array('', ''), - 'registration_link_url' => array('', ''), - 'login_lowercase' => array(true, ''), 'sign_me_auto' => array(\RainLoop\Enumerations\SignMeType::DEFAULT_OFF, diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json index 05462d4bf..43a40c3ce 100644 --- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json +++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json @@ -43,9 +43,7 @@ "LABEL_DETERMINE_USER_DOMAIN": "Versuche Domain des Benutzers zu ermitteln", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Sprachauswahl bei der Anmeldung zulassen", "LABEL_DETERMINE_USER_LANGUAGE": "Versuche Sprache des Benutzers zu ermitteln", - "LABEL_HIDE_SUBMIT_BUTTON": "Die Schaltfläche 'Anmelden' ausblenden", - "LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url", - "LABEL_REGISTRATION_LINK_URL": "Register url" + "LABEL_HIDE_SUBMIT_BUTTON": "Die Schaltfläche 'Anmelden' ausblenden" }, "TAB_BRANDING": { "LEGEND_BRANDING": "Branding", diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json index c4c0be303..dee727912 100644 --- a/snappymail/v/0.0.0/app/localization/de-DE/user.json +++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json @@ -32,9 +32,7 @@ "LOGIN": { "LABEL_LOGIN": "Login", "LABEL_SIGN_ME": "Anmeldung merken", - "BUTTON_SIGN_IN": "Anmelden", - "LABEL_FORGOT_PASSWORD": "Passwort vergessen", - "LABEL_REGISTRATION": "Registrierung" + "BUTTON_SIGN_IN": "Anmelden" }, "TOP_TOOLBAR": { "BUTTON_ADD_ACCOUNT": "Konto hinzufügen", diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json index 6437812d6..78c38b368 100644 --- a/snappymail/v/0.0.0/app/localization/en/admin.json +++ b/snappymail/v/0.0.0/app/localization/en/admin.json @@ -43,9 +43,7 @@ "LABEL_DETERMINE_USER_DOMAIN": "Try to determine user domain", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Allow language selection on login screen", "LABEL_DETERMINE_USER_LANGUAGE": "Try to determine user language", - "LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button", - "LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url", - "LABEL_REGISTRATION_LINK_URL": "Register url" + "LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button" }, "TAB_BRANDING": { "LEGEND_BRANDING": "Branding", diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json index e403b5921..50bfab349 100644 --- a/snappymail/v/0.0.0/app/localization/en/user.json +++ b/snappymail/v/0.0.0/app/localization/en/user.json @@ -32,9 +32,7 @@ "LOGIN": { "LABEL_LOGIN": "Login", "LABEL_SIGN_ME": "Remember Me", - "BUTTON_SIGN_IN": "Sign In", - "LABEL_FORGOT_PASSWORD": "Forgot password", - "LABEL_REGISTRATION": "Registration" + "BUTTON_SIGN_IN": "Sign In" }, "TOP_TOOLBAR": { "BUTTON_ADD_ACCOUNT": "Add Account", diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json index 2cc06d1d7..0e0a96d39 100644 --- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json +++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json @@ -43,9 +43,7 @@ "LABEL_DETERMINE_USER_DOMAIN": "Intentar encontrar el dominio del usuario", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Permitir la selección de idioma en la pantalla de ingreso", "LABEL_DETERMINE_USER_LANGUAGE": "Intentar definir el idioma del usuari", - "LABEL_HIDE_SUBMIT_BUTTON": "Ocultar el botón 'Acceder'", - "LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url", - "LABEL_REGISTRATION_LINK_URL": "Register url" + "LABEL_HIDE_SUBMIT_BUTTON": "Ocultar el botón 'Acceder'" }, "TAB_BRANDING": { "LEGEND_BRANDING": "Personalización", diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json index 6a5ec4231..b049e203e 100644 --- a/snappymail/v/0.0.0/app/localization/es-ES/user.json +++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json @@ -32,9 +32,7 @@ "LOGIN": { "LABEL_LOGIN": "Login", "LABEL_SIGN_ME": "Recuérdame", - "BUTTON_SIGN_IN": "Acceder", - "LABEL_FORGOT_PASSWORD": "Olvidé mi contraseña", - "LABEL_REGISTRATION": "Registro" + "BUTTON_SIGN_IN": "Acceder" }, "TOP_TOOLBAR": { "BUTTON_ADD_ACCOUNT": "Agregar cuenta", diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json index a1dbf02ce..1a5d60e24 100644 --- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json +++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json @@ -43,9 +43,7 @@ "LABEL_DETERMINE_USER_DOMAIN": "Deviner le domaine de l'utilisateur", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Permettre la sélection de la langue sur l'écran de connexion", "LABEL_DETERMINE_USER_LANGUAGE": "Deviner la langue de l'utilisateur", - "LABEL_HIDE_SUBMIT_BUTTON": "Masquer le bouton 'Se connecter'", - "LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url", - "LABEL_REGISTRATION_LINK_URL": "Register url" + "LABEL_HIDE_SUBMIT_BUTTON": "Masquer le bouton 'Se connecter'" }, "TAB_BRANDING": { "LEGEND_BRANDING": "Logo & Marque", diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json index e8934f001..8abeae966 100644 --- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json +++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json @@ -32,9 +32,7 @@ "LOGIN": { "LABEL_LOGIN": "Identifiant", "LABEL_SIGN_ME": "Se souvenir de moi", - "BUTTON_SIGN_IN": "Se connecter", - "LABEL_FORGOT_PASSWORD": "Mot de passe oublié", - "LABEL_REGISTRATION": "S'enregistrer" + "BUTTON_SIGN_IN": "Se connecter" }, "TOP_TOOLBAR": { "BUTTON_ADD_ACCOUNT": "Ajouter un compte", diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json index 7177f7fb8..eb27e37c2 100644 --- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json +++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json @@ -43,9 +43,7 @@ "LABEL_DETERMINE_USER_DOMAIN": "Próbálja megállapítani a felhasználó domainjét", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Nyel választás engedélyezése a bejelentkező képernyőn", "LABEL_DETERMINE_USER_LANGUAGE": "Próbálja megállapítani a felhasználó nyelvét", - "LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button", - "LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url", - "LABEL_REGISTRATION_LINK_URL": "Register url" + "LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button" }, "TAB_BRANDING": { "LEGEND_BRANDING": "Arculat", diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json index e8653da11..afbe9e719 100644 --- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json +++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json @@ -32,9 +32,7 @@ "LOGIN": { "LABEL_LOGIN": "Bejelentkezés", "LABEL_SIGN_ME": "Megjegyzés", - "BUTTON_SIGN_IN": "Belépés", - "LABEL_FORGOT_PASSWORD": "Elfelejtett jelszó", - "LABEL_REGISTRATION": "Regisztráció" + "BUTTON_SIGN_IN": "Belépés" }, "TOP_TOOLBAR": { "BUTTON_ADD_ACCOUNT": "Fiók hozzáadás", diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json index 1b2bc39a2..44009401b 100644 --- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json +++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json @@ -43,9 +43,7 @@ "LABEL_DETERMINE_USER_DOMAIN": "Probeer gebruikersdomein te bepalen", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Sta taal selectie toe in het login scherm", "LABEL_DETERMINE_USER_LANGUAGE": "Probeer gebruiker taal te bepalen", - "LABEL_HIDE_SUBMIT_BUTTON": "Verberg de 'Aanmelden' knop", - "LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url", - "LABEL_REGISTRATION_LINK_URL": "Register url" + "LABEL_HIDE_SUBMIT_BUTTON": "Verberg de 'Aanmelden' knop" }, "TAB_BRANDING": { "LEGEND_BRANDING": "Huisstijl", diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json index 67497af19..2a0394b43 100644 --- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json +++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json @@ -32,9 +32,7 @@ "LOGIN": { "LABEL_LOGIN": "Inlognaam", "LABEL_SIGN_ME": "Aangemeld blijven", - "BUTTON_SIGN_IN": "Aanmelden", - "LABEL_FORGOT_PASSWORD": "Wachtwoord vergeten", - "LABEL_REGISTRATION": "Registratie" + "BUTTON_SIGN_IN": "Aanmelden" }, "TOP_TOOLBAR": { "BUTTON_ADD_ACCOUNT": "Account toevoegen", diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json index f547fa587..fccff1674 100644 --- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json +++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json @@ -43,9 +43,7 @@ "LABEL_DETERMINE_USER_DOMAIN": "Försök att bestämma användardomän", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Tillåt språkändringar på inloggningsskärmen", "LABEL_DETERMINE_USER_LANGUAGE": "Försök att bestämma användarens språk", - "LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button", - "LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url", - "LABEL_REGISTRATION_LINK_URL": "Register url" + "LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button" }, "TAB_BRANDING": { "LEGEND_BRANDING": "Branding", diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json index e56d693a6..1de6806b3 100644 --- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json +++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json @@ -32,9 +32,7 @@ "LOGIN": { "LABEL_LOGIN": "Användarnamn", "LABEL_SIGN_ME": "Kom ihåg mig", - "BUTTON_SIGN_IN": "Logga in", - "LABEL_FORGOT_PASSWORD": "Glömt lösenord", - "LABEL_REGISTRATION": "Registrera" + "BUTTON_SIGN_IN": "Logga in" }, "TOP_TOOLBAR": { "BUTTON_ADD_ACCOUNT": "Lägg till konto", diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json index eef9a67bd..7351a9e5a 100644 --- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json +++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json @@ -43,9 +43,7 @@ "LABEL_DETERMINE_USER_DOMAIN": "尝试判断用户使用的域名", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "允许在登录界面选择语言", "LABEL_DETERMINE_USER_LANGUAGE": "尝试判断用户使用语言", - "LABEL_HIDE_SUBMIT_BUTTON": "隐藏“登录”按钮", - "LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url", - "LABEL_REGISTRATION_LINK_URL": "Register url" + "LABEL_HIDE_SUBMIT_BUTTON": "隐藏“登录”按钮" }, "TAB_BRANDING": { "LEGEND_BRANDING": "Logo", diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json index 470f8db46..37ce60eca 100644 --- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json +++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json @@ -32,9 +32,7 @@ "LOGIN": { "LABEL_LOGIN": "登录", "LABEL_SIGN_ME": "记住我", - "BUTTON_SIGN_IN": "登录", - "LABEL_FORGOT_PASSWORD": "忘记密码", - "LABEL_REGISTRATION": "注册" + "BUTTON_SIGN_IN": "登录" }, "TOP_TOOLBAR": { "BUTTON_ADD_ACCOUNT": "添加账户", diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html index 41f727b19..8836b452a 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html @@ -54,22 +54,6 @@ }"> -
-
- -
-   -
- -
-