diff options
| -rw-r--r-- | django_authopenid/urls.py | 8 | ||||
| -rw-r--r-- | django_authopenid/views.py | 2 | ||||
| -rw-r--r-- | templates/authopenid/sendpw.html | 2 | ||||
| -rw-r--r-- | templates/authopenid/signin.html | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py index 6843e5c0..1d8a71aa 100644 --- a/django_authopenid/urls.py +++ b/django_authopenid/urls.py @@ -15,10 +15,10 @@ urlpatterns = patterns('django_authopenid.views', url(r'^%s$' % _('register/'), 'register', name='user_register'), url(r'^%s$' % _('signup/'), 'signup', name='user_signup'), #disable current sendpw function - url(r'^%s$' % _('sendpw/'), 'signin', name='user_sendpw'), - #url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'), - #url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', - # name='user_confirmchangepw'), + #url(r'^%s$' % _('sendpw/'), 'signin', name='user_sendpw'), + url(r'^%s$' % _('sendpw/'), 'sendpw', name='sendpw'), + url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', + name='user_confirmchangepw'), # manage account settings #url(r'^$', 'account_settings', name='user_account_settings'), diff --git a/django_authopenid/views.py b/django_authopenid/views.py index 1cb8928b..63eb9195 100644 --- a/django_authopenid/views.py +++ b/django_authopenid/views.py @@ -223,7 +223,7 @@ def signin(request,newquestion=False,newanswer=False): 'form1': form_auth, 'form2': form_signin, 'msg': request.GET.get('msg',''), - 'sendpw_url': reverse('user_sendpw'), + 'sendpw_url': reverse('sendpw'), }, context_instance=RequestContext(request)) def complete_signin(request): diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html index ba81dba4..334c70bc 100644 --- a/templates/authopenid/sendpw.html +++ b/templates/authopenid/sendpw.html @@ -13,7 +13,7 @@ {% trans "Please enter your username below and new password will be sent to your registered e-mail" %} </div> {% if form.errors %} -<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br> +<p class="errors"><span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br> {% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span> {% endif %} diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html index 9a1a6780..083d895a 100644 --- a/templates/authopenid/signin.html +++ b/templates/authopenid/signin.html @@ -113,8 +113,8 @@ </fieldset> </form> <div class="login"> - <p style="display:none">{% trans "we support two login modes" %}</p> - <div style="display:none"> + <p>{% trans "we support two login modes" %}</p> + <div > <br> {% if form1.errors %} <p class="errors"> @@ -137,8 +137,8 @@ <div class="form-row"><label for="id_username">{% trans "Login name" %}:</label><br />{{ form1.username }}</div> <div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div> <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"> - <a href="">{% trans "Forgot your password?" %}</a> - <a href="">{% trans "Create new account" %}</a></div> + <a href="{%url sendpw%}">{% trans "Forgot your password?" %}</a> + <a href="/registrarse">{% trans "Create new account" %}</a></div> </fieldset> </form> </div> |