Mercurial > public > sg101
changeset 498:b137a0966e4b
Removed the warning about AT&T and sbcglobal on the registration page. Added "text" classes to the registration text widgets.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Thu, 24 Nov 2011 21:27:07 +0000 |
parents | 9894f8cbb931 |
children | 1a09a7bea000 |
files | gpp/accounts/forms.py gpp/templates/accounts/register.html |
diffstat | 2 files changed, 14 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/gpp/accounts/forms.py Tue Nov 22 01:25:08 2011 +0000 +++ b/gpp/accounts/forms.py Thu Nov 24 21:27:07 2011 +0000 @@ -18,13 +18,18 @@ class RegisterForm(forms.Form): """Form used to register with the website""" - username = forms.RegexField(max_length=30, regex=r'^\w+$', - error_messages={ - 'invalid': 'Your username must be 30 characters or less and ' - 'contain only letters, numbers and underscores.'}) - email = forms.EmailField() - password1 = forms.CharField(label="Password", widget=forms.PasswordInput) - password2 = forms.CharField(label="Password confirmation", widget=forms.PasswordInput) + username = forms.RegexField( + max_length=30, + regex=r'^\w+$', + error_messages={'invalid': ('Your username must be 30 characters or' + ' less and contain only letters, numbers and underscores.')}, + widget=forms.TextInput(attrs={'class': 'text'}), + ) + email = forms.EmailField(widget=forms.TextInput(attrs={'class': 'text'})) + password1 = forms.CharField(label="Password", + widget=forms.PasswordInput(attrs={'class': 'text'})) + password2 = forms.CharField(label="Password confirmation", + widget=forms.PasswordInput(attrs={'class': 'text'})) agree_age = forms.BooleanField(required=True, label='I certify that I am over the age of 13', error_messages={ @@ -41,7 +46,8 @@ error_messages={ 'required': 'You have not agreed to our Privacy Policy.', }) - question1 = forms.CharField(label="What number appears in the site name?") + question1 = forms.CharField(label="What number appears in the site name?", + widget=forms.TextInput(attrs={'class': 'text'})) question2 = forms.CharField(label='', required=False, widget=forms.TextInput(attrs={'style': 'display: none;'}))
--- a/gpp/templates/accounts/register.html Tue Nov 22 01:25:08 2011 +0000 +++ b/gpp/templates/accounts/register.html Thu Nov 24 21:27:07 2011 +0000 @@ -13,24 +13,6 @@ <li>You must agree to our <a href="/policy/tos/" target="_blank">Terms of Service</a>.</li> <li>You must agree to our <a href="/policy/privacy/" target="_blank">Privacy Policy</a>.</li> </ul> -<br /> -<div class="notice"> -<p><img src="{{ STATIC_URL }}icons/exclamation.png" alt="Notice"> -<strong>Attention AT&T & Sbcglobal users:</strong> -Please be aware that AT&T & Sbcglobal are currently refusing email from SurfGuitar101.com. These -users may not receive the confirmation email. If you have another email address you -can register from, please use it instead. Gmail, Hotmail, and Yahoo mail are known to work. -</p> -<p>If you must use a AT&T/Sbcglobal account to register:</p> -<ol> - <li>Register using the form below.</li> - <li>Wait half an hour or so for the confirmation email. Check spam folders.</li> - <li>If you do not receive the confirmation email, please send an email to <em>admin at surfguitar101 dot com</em> from the email address you registered with and ask us to manually activate your account. - </li> -</ol> -<p>We apologize for any inconvenience, but please send all complaints to AT&T.</p> -</div> -<br /> <form action="." method="post">{% csrf_token %} <table> {{ form.as_table }}