Add missing templates to reset password. Add link in login page.

Need finitions

coin/members/admin.py

@@ -96,7 +96,6 @@ class MemberAdmin(UserAdmin):
             '%d membre(s) définis comme non adhérent(s).' % rows_updated)
     set_as_non_member.short_description = "Définir comme non adhérent"
 
-
 class MembershipFeeAdmin(admin.ModelAdmin):
     list_display = ('member', 'end_date', 'amount')
     form = autocomplete_light.modelform_factory(MembershipFee)

coin/members/templates/members/detail.html

@@ -9,23 +9,23 @@
             <table class="full-width">
                 <tr>
                     <td class="center"><span class="label">Prénom - Nom</span></td>
-                    <td>{{member.first_name}} {{member.last_name}}</td>
+                    <td>{{user.first_name}} {{user.last_name}}</td>
                 </tr>
                 <tr>
                     <td class="center"><span class="label">Adresse</span></td>
-                    <td>{{member.address}}<br />{{member.postal_code}} {{member.city}}</td>
+                    <td>{{user.address}}<br />{{user.postal_code}} {{user.city}}</td>
                 </tr>
                 <tr>
                     <td class="center"><span class="label">Email</span></td>
-                    <td>{{member.email}}</td>
+                    <td>{{user.email}}</td>
                 </tr>
                 <tr>
                     <td class="center"><span class="label">Téléphone fixe</span></td>
-                    <td>{{member.home_phone_number}}</td>
+                    <td>{{user.home_phone_number}}</td>
                 </tr>
                 <tr>
                     <td class="center"><span class="label">Téléphone mobile</span></td>
-                    <td>{{member.mobile_phone_number}}</td>
+                    <td>{{user.mobile_phone_number}}</td>
                 </tr>
             </table>
         </div>
@@ -35,15 +35,15 @@
         <div class="panel">
             <h3>Je suis membre d'Illyse</h3>
             <p>et ma cotisation est :
-                {% if member.is_paid_up %}
+                {% if user.is_paid_up %}
                     <span class="label success">à jour !</span>
                 {% else %}
                     <span class="label alert">non à jour !</span>
                 {% endif %}
             </p>
-            <p>Date de fin de cotisation : {{ member.end_date_of_membership }}</p>
+            <p>Date de fin de cotisation : {{ user.end_date_of_membership }}</p>
 
-            <a href="https://www.illyse.org/documents/22" target="_blank" class="button small radius expand {% if not member.is_paid_up %}alert{% endif %}">Renouveler ma cotisation</a>
+            <a href="https://www.illyse.org/documents/22" target="_blank" class="button small radius expand {% if not user.is_paid_up %}alert{% endif %}">Renouveler ma cotisation</a>
         </div>
         <!--<div class="pa nel">
             <h3>Infos additionnelles</h3>

coin/members/templates/members/login.html

@@ -13,21 +13,22 @@
 	{% endif %}
 
 	<form method="post" action="{% url 'members:django.contrib.auth.views.login' %}">
-	{% csrf_token %}
-	<table>
-	<tr>
-		<td>{{ form.username.label_tag }}</td>
-		<td>{{ form.username }}</td>
-	</tr>
-	<tr>
-		<td>{{ form.password.label_tag }}</td>
-		<td>{{ form.password }}</td>
-	</tr>
-	</table>
+    	{% csrf_token %}
+    	<table>
+    	<tr>
+    		<td>{{ form.username.label_tag }}</td>
+    		<td>{{ form.username }}</td>
+    	</tr>
+    	<tr>
+    		<td>{{ form.password.label_tag }}</td>
+    		<td>{{ form.password }}</td>
+    	</tr>
+    	</table>
 
-	<input type="submit" value="Connexion" class="button radius"/>
-	<input type="hidden" name="next" value="{{ next }}" />
+    	<input type="submit" value="Connexion" class="button radius"/>
+    	<input type="hidden" name="next" value="{{ next }}" />
 	</form>
+    <a href="{% url 'members:password_reset'%}">(Ré)initialiser son mot de passe</a>
 </div>
 
 {% endblock %}

coin/members/templates/members/registration/password_reset_complete.html

@@ -1,21 +1,18 @@
-{% extends "admin/base_site.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 
-{% block breadcrumbs %}
-<div class="breadcrumbs">
-<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
-&rsaquo; {% trans 'Password reset' %}
-</div>
-{% endblock %}
+{% block content %}
 
-{% block title %}{% trans 'Password reset complete' %}{% endblock %}
+<div class="row">
+    <div class="large-12 columns">
 
-{% block content %}
+    <h2>{% trans 'Password reset complete' %}</h2>
 
-<h1>{% trans 'Password reset complete' %}</h1>
+    <p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
 
-<p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
+    <p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
 
-<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
+    </div>
+</div>
 
 {% endblock %}

coin/members/templates/members/registration/password_reset_confirm.html

@@ -1,37 +1,51 @@
-{% extends "admin/base_site.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 
-{% block breadcrumbs %}
-<div class="breadcrumbs">
-<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
-&rsaquo; {% trans 'Password reset confirmation' %}
-</div>
-{% endblock %}
+{% block content %}
 
-{% block title %}{% trans 'Password reset' %}{% endblock %}
+<div class="row">
+    <div class="large-12 columns">
 
-{% block content %}
+    {% if validlink %}
+
+    <h2>{% trans 'Enter new password' %}</h2>
 
-{% if validlink %}
+<!-- <p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p> -->
 
-<h1>{% trans 'Enter new password' %}</h1>
 
-<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
 
-<form action="" 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>
+    {% if form.errors %}
+    <div class="alert-box alert">
+        {% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
+    </div>
+    {% endif %}
 
-{% else %}
+    <form action="" method="post">{% csrf_token %}
+        <label {% if form.new_password1.errors %}class="error"{% endif %}>{% trans 'Password' %}
+            {{ form.new_password1 }}
+        </label>
+        {% if form.new_password1.errors %}
+            <span class="error">{% for error in form.new_password1.errors %}{{ error|escape }}{% endfor %}</span>
+        {% endif %}
 
-<h1>{% trans 'Password reset unsuccessful' %}</h1>
+        <label {% if form.new_password2.errors %}class="error"{% endif %}>{% trans 'Password (again)' %}
+            {{ form.new_password2 }}
+        </label>
+        {% if form.new_password2.errors %}
+            <span class="error">{% for error in form.new_password2.errors %}{{ error|escape }}{% endfor %}</span>
+        {% endif %}
 
-<p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+        <input type="submit" value="{% trans 'Change my password' %}" class="button radius" />
+    </form>
 
-{% endif %}
+    {% else %}
+
+    <h2>{% trans 'Password reset unsuccessful' %}</h2>
+
+    <p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+
+    {% endif %}
+    </div>
+</div>
 
 {% endblock %}

coin/members/templates/members/registration/password_reset_done.html

@@ -1,18 +1,10 @@
-{% extends "admin/base_site.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 
-{% block breadcrumbs %}
-<div class="breadcrumbs">
-<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
-&rsaquo; {% trans 'Password reset' %}
-</div>
-{% endblock %}
-
-{% block title %}{% trans 'Password reset successful' %}{% endblock %}
-
 {% block content %}
 
-<h1>{% trans 'Password reset successful' %}</h1>
+
+<h2>Vérifiez votre email</h2>
 
 <p>{% trans "We've emailed you instructions for setting your password. You should be receiving them shortly." %}</p>
 

coin/members/templates/members/registration/password_reset_form.html

@@ -12,11 +12,19 @@
 
 <div class="row">
     <div class="large-12 columns">
+        {% if form.errors %}
+        <div class="alert-box alert">
+            {% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
+        </div>
+        {% endif %}
+    
         <form action="" method="post">{% csrf_token %}
-            {{ form.email.errors }}
             <label {% if form.id_email.errors %}class="error"{% endif %}>{% trans 'Email address' %}
                 {{ form.email }}
             </label>
+            {% if form.email.errors %}
+                <span class="error">{% for error in form.email.errors %}{{ error|escape }}{% endfor %}</span>
+            {% endif %}
 
             <input type="submit" value="{% trans 'Reset my password' %}" class="button radius" />
         </form>

coin/members/urls.py

@@ -31,8 +31,12 @@ urlpatterns = patterns(
         'current_app':'members'},
         name = 'password_reset_done'),
     url(r'^password_reset_confirm/(?P<uidb64>.+)/(?P<token>.+)$', 'django.contrib.auth.views.password_reset_confirm',
-        {'template_name':'members/registration/password_reset_confirm.html'},
+        {'post_reset_redirect':'members:password_reset_complete',
+        'template_name':'members/registration/password_reset_confirm.html'},
         name = 'password_reset_confirm'),
+    url(r'^password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete',
+        {'template_name':'members/registration/password_reset_complete.html'},
+        name = 'password_reset_complete'),
         
 
     url(r'^detail/$',views.detail,

coin/members/views.py

@@ -3,22 +3,21 @@ from django.shortcuts import render_to_response
 from django.contrib.auth.decorators import login_required
 from django.http import Http404
 
+
 @login_required
 def index(request):
-    return render_to_response('members/index.html')
+    return render_to_response('members/index.html',
+                              context_instance=RequestContext(request))
 
 
 @login_required
 def detail(request):
-    member = request.user
-
-    return render_to_response('members/detail.html', {'member': member},
+    return render_to_response('members/detail.html',
                               context_instance=RequestContext(request))
 
 @login_required
 def subscriptions(request):
-    member = request.user
-    subscriptions = member.get_active_subscriptions()
+    subscriptions = request.user.get_active_subscriptions()
 
     return render_to_response('members/subscriptions.html',
                               {'subscriptions':subscriptions},
@@ -26,24 +25,12 @@ def subscriptions(request):
 
 @login_required
 def invoices(request):
-    member = request.user
-
-    invoices = member.invoices.all().order_by('-date')
+    invoices = request.user.invoices.all().order_by('-date')
 
     return render_to_response('members/invoices.html',
                               {'invoices':invoices},
                               context_instance=RequestContext(request))
 
-
 @login_required
 def contact(request):
     return render_to_response('members/contact.html')
-
-@login_required
-def change_password(request):
-    member = get_object_or_404(Member, pk=member_id)
-    if request.POST['password']:
-        member.password = ''
-    else:
-        return render(request, 'members/change_password.html',
-                      {'member': member})

coin/templates/base.html

@@ -26,11 +26,13 @@
    <div class="row">
        <div class="large-3 columns">
         {% block sidenav %}
+        {% if user.is_authenticated %}
         <nav id="sidebox" class="hide-for-small">
          <ul class="side-nav">
              {% include "menu_items.html" %}
          </ul>
          </nav>
+         {% endif %}
          {% endblock %}
          &nbsp;
        </div>
@@ -39,13 +41,14 @@
         {% block content %}{% endblock %}
         </div>
     </div>
-
+    {% if user.is_authenticated %}
     <aside class="left-off-canvas-menu">
         <ul class="off-canvas-list">
             <li><label>Navigation</label></li>
             {% include "menu_items.html" %}
         </ul>
     </aside>
+    {% endif %}
 
 
     <div id="footer">