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.

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

Feature/home subscribe #38

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Prev Previous commit
Next Next commit
removed comments
  • Loading branch information
doradomiguel35 committed Feb 11, 2019
commit 683d6391262d09ee45457139b948f995837842da
43 changes: 26 additions & 17 deletions templates/registration/password_reset_confirm.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% extends 'base.html' %}
{% load widget_tweaks %}
{% load i18n %}

{% block content %}
Expand All @@ -10,23 +11,31 @@ <h4 class="mb-5">
{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}
</h4>
</div>

<form id="form-reset-password" class="form row"method="post">
{% csrf_token %}
<fieldset class="module aligned">
<div class="form-row field-password1">
{{ form.new_password1.errors }}
<label for="id_new_password1">{% trans 'New password:' %}</label>
{{ form.new_password1 }}
</div>
<div class="form-row field-password2">
{{ form.new_password2.errors }}
<label for="id_new_password2">{% trans 'Confirm password:' %}</label>
{{ form.new_password2 }}
</div>
<input type="submit" value="{% trans 'Change my password' %}">
</fieldset>
</form>
<div class="row">
<div class="col-md-6 offset-md-3">
<form id="form-reset-password" class="form row" method="post">
{% csrf_token %}
<fieldset class="module aligned">
<div class="form-group mb-5 pw-masking masked">
<span id="pass1-error" class="error-msg" >
{{ form.new_password1.errors }}
</span>
<label for="id_new_password1">{% trans 'New password:' %}</label>
{{ form.new_password1|add_class:"form-control"|attr:"type:text"|attr:"placeholder:New password" }}
</div>
<div class="form-group mb-5 pw-masking masked">
<span id="pass2-error" class="error-msg" >
{{ form.new_password2.errors }}
</span>
<label for="id_new_password2">{% trans 'Confirm password:' %}</label>
{{ form.new_password2|add_class:"form-control"|attr:"type:text"|attr:"placeholder:Confirm password"}}
</div>
<button class="btn btn-primary form-control mb-5" type="submit">{% trans 'Change my password' %}</button>

</fieldset>
</form>
</div>
</div>
</div>

{% else%}
Expand Down
1 change: 0 additions & 1 deletion templates/registration/password_reset_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ <h4 class="mb-5">
<div class="col-md-6">
<div id="form-email" class="form-group mb-4">
<label>Email Address</label>
<!-- <input type="text" placeholder="Email" class="form-control"> -->
{{ form.email|add_class:"form-control"|attr:"placeholder:example@example.com" }}
<span id="fname-error" class="error-msg" >
{{ form.email.errors }}
Expand Down
9 changes: 0 additions & 9 deletions users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,6 @@ def get(self,request,*args,**kwargs):
}, status=200, headers={'Authorization': 'Token {}'.format(token.key)})


# class SendEmailToken(APIView):
# """send and email containing a url with expiration
# for redirecting to the forget password page
# """
# permission_classes = (AllowAny,)

# def





Expand Down