From 38251de263956a5df50f788f6017aa0848fe800c Mon Sep 17 00:00:00 2001
From: ifac0 <ifac@cin.ufpe.br>
Date: Thu, 6 Oct 2016 23:32:01 -0300
Subject: [PATCH] correção do urls e atualização do template #58

---
 core/templates/registration/passwor_reset_confirm.html | 74 +++++++++++++++++++++++++++++++++-----------------------------------------
 core/urls.py                                           |  2 +-
 2 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/core/templates/registration/passwor_reset_confirm.html b/core/templates/registration/passwor_reset_confirm.html
index a8e2d8c..7abb6df 100644
--- a/core/templates/registration/passwor_reset_confirm.html
+++ b/core/templates/registration/passwor_reset_confirm.html
@@ -1,48 +1,40 @@
 {% extends "index.html" %}
 {% load i18n static %}
 
-{% block content%}
+	{% block content%}
 
 	<div class="row">
-		<div class="col-md-4 col-md-offset-4 col-xs-4 col-xs-offset-4 col-sm-4 col-sm-offset-4 col-lg-4 col-lg-offset-4 col-xl-4 col-xl-offset-4">
-      <div class="row">
-        <div class="col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8 col-xs-offset-2 col-xs-8 col-lg-offset-2 col-lg-8 col-xs-offset-2 col-xs-8">
-          </br>
-          </br>
-          <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus">
-          </br>
-        </div>
-      </div>
-    </div>
-		<div class="row ">
-			<div class="col-lg-9 col-lg-offset-2 col-xs-9 col-xs-offset-2 col-sm-9 col-sm-offset-2 col-md-9 col-md-offset-2 col-xl-9 col-xl-offset-2">
-
-
-      {% if validlink %}
-        <h3>Nova Senha</h3>
-        <form method="post">
-          {% csrf_token %}
-          {{ form.new_password1.erros }}
-					<label for="id_password1"> Nova Senha: </label>
-					{form.new_password1}
-
-					{{ form.new_password2.erros }}
-					<label for="id_password2"> Confirmar Senha: </label>
-					{form.new_password2}
-
-
-          <button type="submit">Confirmar</button>
-        </form>
-
-      {% else %}
-        <p>
-          O link de redefinição de senha está inválido, possivelmente porque ele já foi utilizado.
-          Por favor, solicite uma nova redefinição de senha.
-        </p>
-      {% endif %}
-
-    </div>
+	<div class="col-md-4 col-md-offset-4 col-xs-4 col-xs-offset-4 col-sm-4 col-sm-offset-4 col-lg-4 col-lg-offset-4 col-xl-4 col-xl-offset-4">
+  <div class="row">
+  <div class="col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8 col-xs-offset-2 col-xs-8 col-lg-offset-2 col-lg-8 col-xs-offset-2 col-xs-8">
+  </br>
+  </br>
+  <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus">
+  </br>
   </div>
-</div>
+  </div>
+  </div>
+	<div class="row ">
+	<div class="col-lg-9 col-lg-offset-2 col-xs-9 col-xs-offset-2 col-sm-9 col-sm-offset-2 col-md-9 col-md-offset-2 col-xl-9 col-xl-offset-2">
+
+
+
+	{% if validlink %}
+
+	<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+
+	<form method="post">{% csrf_token %}
+	{{ form.new_password1.errors }}
+	<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
+	{{ form.new_password2.errors }}
+	<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
+	<p><input type="submit" value="{% trans 'Change my password' %}" /></p>
+	</form>
+
+	{% else %}
+
+	<p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+
+	{% endif %}
 
-{% endblock content %}
+	{% endblock %}
diff --git a/core/urls.py b/core/urls.py
index 7b1f65b..b6559a7 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -21,7 +21,7 @@ urlpatterns = [
 	url(r'^reset/done/$', password_reset_done, {'template_name':'registration/passwor_reset_done.html'}),
 	url(r'^reset/(?P<uidb64>[0-9A-Za-z]+)/(?P<token>.+)/$', password_reset_confirm,
 									{'template_name':'registration/passwor_reset_confirm.html',
-									'post_reset_redirect' : 'done/'},
+									'post_reset_redirect' : '/done/'},
 									name='password_reset_confirm'),
 	url(r'^done/$', password_reset_complete,{'template_name':'registration/passwor_reset_complete.html'}),
 ]
--
libgit2 0.21.2