Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed 'confirm password' placeholder text on user registration form #9969

Merged
merged 9 commits into from
Jun 7, 2018
Merged

Changed 'confirm password' placeholder text on user registration form #9969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
23e5cef
initial commit
Mar 2, 2018
133cfe3
changed placeholder to Confirm Password from Password
Mar 2, 2018
aa07c66
Merge branch 'develop' into change-pwd
kumarcs Mar 2, 2018
1221fc3
added variable for confirm password field
Mar 3, 2018
7cae42e
Merge branch 'change-pwd' of https://github.com/kumarnitj/Rocket.Chat…
Mar 3, 2018
ccf4217
added space before closing braces
Mar 3, 2018
992ff12
Merge branch 'develop' into change-pwd
kumarcs Mar 3, 2018
3aee0b1
Merge branch 'develop' into change-pwd
ggazzo Jun 6, 2018
a913a11
fix review
ggazzo Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/rocketchat-lib/server/startup/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ RocketChat.settings.addGroup('Accounts', function() {
'public': true,
i18nLabel: 'Placeholder_for_password_login_field'
});
this.add('Accounts_ConfirmPasswordPlaceholder', '', {
type: 'string',
'public': true,
i18nLabel: 'Placeholder_for_password_login_field'
});
this.add('Accounts_ForgetUserSessionOnWindowClose', false, {
type: 'boolean',
'public': true
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-login/client/login/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
<div class="rc-input__wrapper">
<input name="confirm-pass" id="confirm-pass" type="password" class="rc-input__element"
autocapitalize="off" autocorrect="off"
placeholder="{{passwordPlaceholder}}" autofocus>
placeholder="{{confirmPasswordPlaceholder}}" autofocus>
<div class="input-error"></div>
</div>
</label>
Expand Down
3 changes: 3 additions & 0 deletions packages/rocketchat-ui-login/client/login/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ Template.loginForm.helpers({
passwordPlaceholder() {
return RocketChat.settings.get('Accounts_PasswordPlaceholder') || t('Password');
},
confirmPasswordPlaceholder() {
return RocketChat.settings.get('Accounts_ConfirmPasswordPlaceholder') || t('Confirm_password');
},
hasOnePassword() {
return typeof OnePassword !== 'undefined' && OnePassword.findLoginForUrl && typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios';
},
Expand Down