Merge branch 'master' of git.illyse.org:coin

coin/members/urls.py

@@ -7,9 +7,11 @@ from coin.members.models import Member
 urlpatterns = patterns(
     '',
     url(r'^$', views.index, name='index'),
-    url(r'^(?P<pk>\d+)/$',
+    url(r'^/info/$',
         DetailView.as_view(
             model=Member,
-            template_name='members/detail.html'),
-        name='detail')
+            template_name='members/infos.html'),
+        name='infos'),
+    url(r'^/abo/', views.index, name = 'abo'),
+    url(r'^/contact/', views.index, name='contact')
 )

coin/resources/models.py

@@ -15,7 +15,7 @@ class IPPool(models.Model):
     inet = CidrAddressField()
     objects = NetManager()
 
-    def clean(self):
+    def clean_default_subnetsize(self):
         if self.inet.version == 4:
             if not self.inet.prefixlen <= self.default_subnetsize <= 32:
                 raise ValidationError('Invalid default subnet size')

coin/templates/base.html

@@ -28,10 +28,10 @@
     <nav id="sidebox" class="hide-for-small">
      <h3 id="nav">Navigation</h3>
      <ul class="side-nav">
-         <li {% if request.get_full_path = "/members/" %}class="active"{% endif %}><a href="index.html">Tableau de bord</a></li>
-         <li {% if request.get_full_path = "/members/info/" %}class="active"{% endif %} ><a href="infos.html">Mes informations personnelles</a></li>
-         <li {% if request.get_full_path = "/members/abo/" %}class="active"{% endif %}><a href="abo.html">Mes abonnements</a></li>
-         <li {% if request.get_full_path = "/members/contact/" %}class="active"{% endif %}><a href="contact.html">Contact / Support</a></li>
+         <li {% if request.get_full_path = "/members/" %}class="active"{% endif %}><a href="/members/">Tableau de bord</a></li>
+         <li {% if request.get_full_path = "/members/info/" %}class="active"{% endif %} ><a href="/members/info/">Mes informations personnelles</a></li>
+         <li {% if request.get_full_path = "/members/abo/" %}class="active"{% endif %}><a href="/members/abo/">Mes abonnements</a></li>
+         <li {% if request.get_full_path = "/members/contact/" %}class="active"{% endif %}><a href="/members/abo/">Contact / Support</a></li>
      </ul>
      </nav>
      {% endblock %}