Merge lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website
Proposed by
kaputtnik
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 536 | ||||
Proposed branch: | lp:~widelands-dev/widelands-website/gaming_password | ||||
Merge into: | lp:widelands-website | ||||
Diff against target: |
243 lines (+53/-33) 10 files modified
templates/django_messages/base.html (+1/-3) wlggz/forms.py (+8/-11) wlggz/models.py (+10/-0) wlggz/templates/wlggz/edit_ggz.html (+14/-3) wlggz/views.py (+5/-1) wlprofile/templates/wlprofile/base.html (+4/-11) wlprofile/templates/wlprofile/edit_profile.html (+0/-1) wlprofile/templates/wlprofile/view_profile.html (+5/-0) wlprofile/views.py (+4/-1) wlscheduling/templates/wlscheduling/base.html (+2/-2) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands-website/gaming_password | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
GunChleoc | Approve | ||
kaputtnik (community) | Needs Resubmitting | ||
Review via email: mp+367448@code.launchpad.net |
Commit message
Better place for setting the online gaming password
Description of the change
Rework of a users profile page:
Removed tabs, because the links are also in the loginbox:
- Messages
- Scheduler
Added tab:
- Gaming Password
- Renamed Tab 'E-Mail settings' -> 'Notification Settings'
Added an additional edit field for setting the gaming password, so the password has to be entered two times. Added a check to compare the entered data and give an errormessage if the passwords didn't match.
Added some help text.
Moved hashing of password to models.py, because i think it fits better over there.
To post a comment you must log in.
Some string nits, rest LGTM :)