Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 00:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move login forgotPasswordLinkUrl/registrationLinkUrl to plugin

Browse source
This commit is contained in:
djmaze 2021-04-22 13:59:22 +02:00
parent 1b4277c9db
commit 8af35f7d39
21 changed files with 17 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/Styles/Login.less
View file

@ -118,7 +118,7 @@
line-height: 29px; line-height: 29px;
right: 6px; right: 6px;
top: 6px; top: 6px;
z-index: 10; z-index: 6;
} }
.input-append .add-on * { .input-append .add-on * {

3
dev/View/User/Login.js
View file

@ -57,9 +57,6 @@ class LoginUserView extends AbstractViewCenter {
signMeType: LoginSignMeType.Unused signMeType: LoginSignMeType.Unused
}); });
this.forgotPasswordLinkUrl = Settings.app('forgotPasswordLinkUrl');
this.registrationLinkUrl = Settings.app('registrationLinkUrl');
this.formError = ko.observable(false).extend({ falseTimeout: 500 }); this.formError = ko.observable(false).extend({ falseTimeout: 500 });
this.allowLanguagesOnLogin = !!SettingsGet('AllowLanguagesOnLogin'); this.allowLanguagesOnLogin = !!SettingsGet('AllowLanguagesOnLogin');

2
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -995,8 +995,6 @@ class Actions
'allowHtmlEditorSourceButton' => (bool)$oConfig->Get('labs', 'allow_html_editor_source_button', false), 'allowHtmlEditorSourceButton' => (bool)$oConfig->Get('labs', 'allow_html_editor_source_button', false),
'allowHtmlEditorBitiButtons' => (bool)$oConfig->Get('labs', 'allow_html_editor_biti_buttons', false), 'allowHtmlEditorBitiButtons' => (bool)$oConfig->Get('labs', 'allow_html_editor_biti_buttons', false),
'allowCtrlEnterOnCompose' => (bool)$oConfig->Get('labs', 'allow_ctrl_enter_on_compose', 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), 'hideSubmitButton' => (bool)$oConfig->Get('login', 'hide_submit_button', true),
'useImapThread' => (bool)$oConfig->Get('labs', 'use_imap_thread', false), 'useImapThread' => (bool)$oConfig->Get('labs', 'use_imap_thread', false),
'useImapSubscribe' => (bool)$oConfig->Get('labs', 'use_imap_list_subscribe', true), 'useImapSubscribe' => (bool)$oConfig->Get('labs', 'use_imap_list_subscribe', true),

3
snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -202,9 +202,6 @@ class Application extends \RainLoop\Config\AbstractConfig
'hide_submit_button' => array(true), 'hide_submit_button' => array(true),
'forgot_password_link_url' => array('', ''),
'registration_link_url' => array('', ''),
'login_lowercase' => array(true, ''), 'login_lowercase' => array(true, ''),
'sign_me_auto' => array(\RainLoop\Enumerations\SignMeType::DEFAULT_OFF, 'sign_me_auto' => array(\RainLoop\Enumerations\SignMeType::DEFAULT_OFF,

4
snappymail/v/0.0.0/app/localization/de-DE/admin.json
View file

@ -43,9 +43,7 @@
"LABEL_DETERMINE_USER_DOMAIN": "Versuche Domain des Benutzers zu ermitteln", "LABEL_DETERMINE_USER_DOMAIN": "Versuche Domain des Benutzers zu ermitteln",
"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Sprachauswahl bei der Anmeldung zulassen", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Sprachauswahl bei der Anmeldung zulassen",
"LABEL_DETERMINE_USER_LANGUAGE": "Versuche Sprache des Benutzers zu ermitteln", "LABEL_DETERMINE_USER_LANGUAGE": "Versuche Sprache des Benutzers zu ermitteln",
"LABEL_HIDE_SUBMIT_BUTTON": "Die Schaltfläche 'Anmelden' ausblenden", "LABEL_HIDE_SUBMIT_BUTTON": "Die Schaltfläche 'Anmelden' ausblenden"
"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
"LABEL_REGISTRATION_LINK_URL": "Register url"
}, },
"TAB_BRANDING": { "TAB_BRANDING": {
"LEGEND_BRANDING": "Branding", "LEGEND_BRANDING": "Branding",

4
snappymail/v/0.0.0/app/localization/de-DE/user.json
View file

@ -32,9 +32,7 @@
"LOGIN": { "LOGIN": {
"LABEL_LOGIN": "Login", "LABEL_LOGIN": "Login",
"LABEL_SIGN_ME": "Anmeldung merken", "LABEL_SIGN_ME": "Anmeldung merken",
"BUTTON_SIGN_IN": "Anmelden", "BUTTON_SIGN_IN": "Anmelden"
"LABEL_FORGOT_PASSWORD": "Passwort vergessen",
"LABEL_REGISTRATION": "Registrierung"
}, },
"TOP_TOOLBAR": { "TOP_TOOLBAR": {
"BUTTON_ADD_ACCOUNT": "Konto hinzufügen", "BUTTON_ADD_ACCOUNT": "Konto hinzufügen",

4
snappymail/v/0.0.0/app/localization/en/admin.json
View file

@ -43,9 +43,7 @@
"LABEL_DETERMINE_USER_DOMAIN": "Try to determine user domain", "LABEL_DETERMINE_USER_DOMAIN": "Try to determine user domain",
"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Allow language selection on login screen", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Allow language selection on login screen",
"LABEL_DETERMINE_USER_LANGUAGE": "Try to determine user language", "LABEL_DETERMINE_USER_LANGUAGE": "Try to determine user language",
"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button", "LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
"LABEL_REGISTRATION_LINK_URL": "Register url"
}, },
"TAB_BRANDING": { "TAB_BRANDING": {
"LEGEND_BRANDING": "Branding", "LEGEND_BRANDING": "Branding",

4
snappymail/v/0.0.0/app/localization/en/user.json
View file

@ -32,9 +32,7 @@
"LOGIN": { "LOGIN": {
"LABEL_LOGIN": "Login", "LABEL_LOGIN": "Login",
"LABEL_SIGN_ME": "Remember Me", "LABEL_SIGN_ME": "Remember Me",
"BUTTON_SIGN_IN": "Sign In", "BUTTON_SIGN_IN": "Sign In"
"LABEL_FORGOT_PASSWORD": "Forgot password",
"LABEL_REGISTRATION": "Registration"
}, },
"TOP_TOOLBAR": { "TOP_TOOLBAR": {
"BUTTON_ADD_ACCOUNT": "Add Account", "BUTTON_ADD_ACCOUNT": "Add Account",

4
snappymail/v/0.0.0/app/localization/es-ES/admin.json
View file

@ -43,9 +43,7 @@
"LABEL_DETERMINE_USER_DOMAIN": "Intentar encontrar el dominio del usuario", "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_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_DETERMINE_USER_LANGUAGE": "Intentar definir el idioma del usuari",
"LABEL_HIDE_SUBMIT_BUTTON": "Ocultar el botón 'Acceder'", "LABEL_HIDE_SUBMIT_BUTTON": "Ocultar el botón 'Acceder'"
"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
"LABEL_REGISTRATION_LINK_URL": "Register url"
}, },
"TAB_BRANDING": { "TAB_BRANDING": {
"LEGEND_BRANDING": "Personalización", "LEGEND_BRANDING": "Personalización",

4
snappymail/v/0.0.0/app/localization/es-ES/user.json
View file

@ -32,9 +32,7 @@
"LOGIN": { "LOGIN": {
"LABEL_LOGIN": "Login", "LABEL_LOGIN": "Login",
"LABEL_SIGN_ME": "Recuérdame", "LABEL_SIGN_ME": "Recuérdame",
"BUTTON_SIGN_IN": "Acceder", "BUTTON_SIGN_IN": "Acceder"
"LABEL_FORGOT_PASSWORD": "Olvidé mi contraseña",
"LABEL_REGISTRATION": "Registro"
}, },
"TOP_TOOLBAR": { "TOP_TOOLBAR": {
"BUTTON_ADD_ACCOUNT": "Agregar cuenta", "BUTTON_ADD_ACCOUNT": "Agregar cuenta",

4
snappymail/v/0.0.0/app/localization/fr-FR/admin.json
View file

@ -43,9 +43,7 @@
"LABEL_DETERMINE_USER_DOMAIN": "Deviner le domaine de l'utilisateur", "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_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_DETERMINE_USER_LANGUAGE": "Deviner la langue de l'utilisateur",
"LABEL_HIDE_SUBMIT_BUTTON": "Masquer le bouton 'Se connecter'", "LABEL_HIDE_SUBMIT_BUTTON": "Masquer le bouton 'Se connecter'"
"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
"LABEL_REGISTRATION_LINK_URL": "Register url"
}, },
"TAB_BRANDING": { "TAB_BRANDING": {
"LEGEND_BRANDING": "Logo & Marque", "LEGEND_BRANDING": "Logo & Marque",

4
snappymail/v/0.0.0/app/localization/fr-FR/user.json
View file

@ -32,9 +32,7 @@
"LOGIN": { "LOGIN": {
"LABEL_LOGIN": "Identifiant", "LABEL_LOGIN": "Identifiant",
"LABEL_SIGN_ME": "Se souvenir de moi", "LABEL_SIGN_ME": "Se souvenir de moi",
"BUTTON_SIGN_IN": "Se connecter", "BUTTON_SIGN_IN": "Se connecter"
"LABEL_FORGOT_PASSWORD": "Mot de passe oublié",
"LABEL_REGISTRATION": "S'enregistrer"
}, },
"TOP_TOOLBAR": { "TOP_TOOLBAR": {
"BUTTON_ADD_ACCOUNT": "Ajouter un compte", "BUTTON_ADD_ACCOUNT": "Ajouter un compte",

4
snappymail/v/0.0.0/app/localization/hu-HU/admin.json
View file

@ -43,9 +43,7 @@
"LABEL_DETERMINE_USER_DOMAIN": "Próbálja megállapítani a felhasználó domainjét", "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_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_DETERMINE_USER_LANGUAGE": "Próbálja megállapítani a felhasználó nyelvét",
"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button", "LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
"LABEL_REGISTRATION_LINK_URL": "Register url"
}, },
"TAB_BRANDING": { "TAB_BRANDING": {
"LEGEND_BRANDING": "Arculat", "LEGEND_BRANDING": "Arculat",

4
snappymail/v/0.0.0/app/localization/hu-HU/user.json
View file

@ -32,9 +32,7 @@
"LOGIN": { "LOGIN": {
"LABEL_LOGIN": "Bejelentkezés", "LABEL_LOGIN": "Bejelentkezés",
"LABEL_SIGN_ME": "Megjegyzés", "LABEL_SIGN_ME": "Megjegyzés",
"BUTTON_SIGN_IN": "Belépés", "BUTTON_SIGN_IN": "Belépés"
"LABEL_FORGOT_PASSWORD": "Elfelejtett jelszó",
"LABEL_REGISTRATION": "Regisztráció"
}, },
"TOP_TOOLBAR": { "TOP_TOOLBAR": {
"BUTTON_ADD_ACCOUNT": "Fiók hozzáadás", "BUTTON_ADD_ACCOUNT": "Fiók hozzáadás",

4
snappymail/v/0.0.0/app/localization/nl-NL/admin.json
View file

@ -43,9 +43,7 @@
"LABEL_DETERMINE_USER_DOMAIN": "Probeer gebruikersdomein te bepalen", "LABEL_DETERMINE_USER_DOMAIN": "Probeer gebruikersdomein te bepalen",
"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Sta taal selectie toe in het login scherm", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Sta taal selectie toe in het login scherm",
"LABEL_DETERMINE_USER_LANGUAGE": "Probeer gebruiker taal te bepalen", "LABEL_DETERMINE_USER_LANGUAGE": "Probeer gebruiker taal te bepalen",
"LABEL_HIDE_SUBMIT_BUTTON": "Verberg de 'Aanmelden' knop", "LABEL_HIDE_SUBMIT_BUTTON": "Verberg de 'Aanmelden' knop"
"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
"LABEL_REGISTRATION_LINK_URL": "Register url"
}, },
"TAB_BRANDING": { "TAB_BRANDING": {
"LEGEND_BRANDING": "Huisstijl", "LEGEND_BRANDING": "Huisstijl",

4
snappymail/v/0.0.0/app/localization/nl-NL/user.json
View file

@ -32,9 +32,7 @@
"LOGIN": { "LOGIN": {
"LABEL_LOGIN": "Inlognaam", "LABEL_LOGIN": "Inlognaam",
"LABEL_SIGN_ME": "Aangemeld blijven", "LABEL_SIGN_ME": "Aangemeld blijven",
"BUTTON_SIGN_IN": "Aanmelden", "BUTTON_SIGN_IN": "Aanmelden"
"LABEL_FORGOT_PASSWORD": "Wachtwoord vergeten",
"LABEL_REGISTRATION": "Registratie"
}, },
"TOP_TOOLBAR": { "TOP_TOOLBAR": {
"BUTTON_ADD_ACCOUNT": "Account toevoegen", "BUTTON_ADD_ACCOUNT": "Account toevoegen",

4
snappymail/v/0.0.0/app/localization/sv-SE/admin.json
View file

@ -43,9 +43,7 @@
"LABEL_DETERMINE_USER_DOMAIN": "Försök att bestämma användardomän", "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_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_DETERMINE_USER_LANGUAGE": "Försök att bestämma användarens språk",
"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button", "LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
"LABEL_REGISTRATION_LINK_URL": "Register url"
}, },
"TAB_BRANDING": { "TAB_BRANDING": {
"LEGEND_BRANDING": "Branding", "LEGEND_BRANDING": "Branding",

4
snappymail/v/0.0.0/app/localization/sv-SE/user.json
View file

@ -32,9 +32,7 @@
"LOGIN": { "LOGIN": {
"LABEL_LOGIN": "Användarnamn", "LABEL_LOGIN": "Användarnamn",
"LABEL_SIGN_ME": "Kom ihåg mig", "LABEL_SIGN_ME": "Kom ihåg mig",
"BUTTON_SIGN_IN": "Logga in", "BUTTON_SIGN_IN": "Logga in"
"LABEL_FORGOT_PASSWORD": "Glömt lösenord",
"LABEL_REGISTRATION": "Registrera"
}, },
"TOP_TOOLBAR": { "TOP_TOOLBAR": {
"BUTTON_ADD_ACCOUNT": "Lägg till konto", "BUTTON_ADD_ACCOUNT": "Lägg till konto",

4
snappymail/v/0.0.0/app/localization/zh-CN/admin.json
View file

@ -43,9 +43,7 @@
"LABEL_DETERMINE_USER_DOMAIN": "尝试判断用户使用的域名", "LABEL_DETERMINE_USER_DOMAIN": "尝试判断用户使用的域名",
"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "允许在登录界面选择语言", "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "允许在登录界面选择语言",
"LABEL_DETERMINE_USER_LANGUAGE": "尝试判断用户使用语言", "LABEL_DETERMINE_USER_LANGUAGE": "尝试判断用户使用语言",
"LABEL_HIDE_SUBMIT_BUTTON": "隐藏“登录”按钮", "LABEL_HIDE_SUBMIT_BUTTON": "隐藏“登录”按钮"
"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
"LABEL_REGISTRATION_LINK_URL": "Register url"
}, },
"TAB_BRANDING": { "TAB_BRANDING": {
"LEGEND_BRANDING": "Logo", "LEGEND_BRANDING": "Logo",

4
snappymail/v/0.0.0/app/localization/zh-CN/user.json
View file

@ -32,9 +32,7 @@
"LOGIN": { "LOGIN": {
"LABEL_LOGIN": "登录", "LABEL_LOGIN": "登录",
"LABEL_SIGN_ME": "记住我", "LABEL_SIGN_ME": "记住我",
"BUTTON_SIGN_IN": "登录", "BUTTON_SIGN_IN": "登录"
"LABEL_FORGOT_PASSWORD": "忘记密码",
"LABEL_REGISTRATION": "注册"
}, },
"TOP_TOOLBAR": { "TOP_TOOLBAR": {
"BUTTON_ADD_ACCOUNT": "添加账户", "BUTTON_ADD_ACCOUNT": "添加账户",

16
snappymail/v/0.0.0/app/templates/Views/User/Login.html
View file

@ -54,22 +54,6 @@
}"></div> }"></div>
</div> </div>
<div class="controls clearfix"
data-bind="visible: '' !== forgotPasswordLinkUrl || '' !== registrationLinkUrl">
<div class="forgot-link pull-left" 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}"
data-i18n="LOGIN/LABEL_FORGOT_PASSWORD"></a>
</div>
&nbsp;
<div class="registration-link pull-right"
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}"
data-i18n="LOGIN/LABEL_REGISTRATION"></a>
</div>
</div>
</form> </form>
</div> </div>
</div> </div>