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

Jump to bottom

Fix bug 1335331 - Enable users to change their email address #793

Merged
merged 17 commits into from
Jan 16, 2018
Merged

Fix bug 1335331 - Enable users to change their email address #793

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8ee9a1d
Bug 1335331: added ability to change email address
karabellyj Jul 16, 2017
6f1e755
Bug 1335331: add username in read-only mode
karabellyj Jul 22, 2017
fe26247
Bug 1335331: remove placeholders
karabellyj Aug 10, 2017
18ed578
Bug 1335331: add email validation
karabellyj Aug 10, 2017
9a3829e
Bug 1335331: adjust contributor profile tests
karabellyj Sep 30, 2017
3b360cb
Bug 1335331: make profile-form submit more generic
karabellyj Sep 30, 2017
bec393a
Bug 1335331: add logout after email change
karabellyj Oct 14, 2017
64ac44a
Bug 1335331: change email in tests
karabellyj Nov 2, 2017
3fa8e18
Bug 1335331: add email warning message to css
karabellyj Nov 2, 2017
3b25d3b
Bug 1335331: adjust contributor profile test email
karabellyj Nov 2, 2017
021eeef
Bug 1335331: shorten the line to pass PEP8
karabellyj Nov 2, 2017
e61b893
Bug 1335331: make code style consistent
karabellyj Nov 6, 2017
06fc386
Bug 1335331: correct level of indentation
karabellyj Dec 21, 2017
05602c8
Fix errors on settings page.
adngdb Jan 8, 2018
0747dae
Show or hide warning using JS.
adngdb Jan 15, 2018
dde7dfc
Make message a help text instead, and always show it.
adngdb Jan 16, 2018
0400924
Styling changes.
adngdb Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion pontoon/base/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,12 @@ class UserProfileForm(forms.ModelForm):
Form is responsible for saving user's name.
"""
first_name = forms.RegexField(regex='^[^<>"\'&]+$', max_length=30, strip=True)
email = forms.EmailField()
email = forms.EmailField(
help_text=(
'Changing your email address will cause a logout. '
'Make sure the new one is correct before saving!'
)
)

class Meta:
model = User
Expand Down
8 changes: 5 additions & 3 deletions pontoon/contributors/static/css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@
margin-top: 10px;
}

#email-warning {
display: none;
#profile-form .help {
color: #FED271;
font-style: italic;
font-weight: bold;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that the text is always visible, I find the styling a little too intrusive.

I'd remove bold (bold+italic at the same time is rarely a good idea) and change color to #888888. Please also add margin-top: 5px;.

}
#email-warning,

.errorlist {
color: #F36;
list-style: none;
Expand Down
15 changes: 0 additions & 15 deletions pontoon/contributors/static/js/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,4 @@ $(function() {
}
});
});

// Show a warning when a user changes their email address.
var emailField = $('#id_email');
var warningContent = $('#email-warning');
var originalEmail = emailField.val();

emailField.on('keyup', function () {
var newEmail = emailField.val();
if (newEmail === originalEmail && warningContent.is(':visible')) {
warningContent.hide();
}
else if (newEmail !== originalEmail && !warningContent.is(':visible')) {
warningContent.show();
}
});
});
5 changes: 1 addition & 4 deletions pontoon/contributors/templates/contributors/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ <h3>Personal infomation</h3>
{{ profile_form.email.label_tag(label_suffix='') }}
{{ profile_form.email }}
{{ profile_form.email.errors }}
<div id="email-warning">
Caution: Changing your email address will cause a logout.<br />
Make sure the new one is correct before saving!
</div>
<p class="help">{{ profile_form.email.help_text }}</p>
</div>
</div>

Expand Down