Merge branch 'dev' into recrutement
authorNilovna Bascunan-Vasquez <contact@nilovna.com>
Tue, 9 Aug 2011 21:09:01 +0000 (17:09 -0400)
committerNilovna Bascunan-Vasquez <contact@nilovna.com>
Tue, 9 Aug 2011 21:09:01 +0000 (17:09 -0400)
1  2 
project/urls.py

diff --cc project/urls.py
@@@ -10,12 -10,10 +10,12 @@@ handler500 # Pyflake
  
  urlpatterns = patterns(
      '',
-     (r'^$', 'project.views.index'),
-     url(r'^captcha/', include('captcha.urls')),
-     url(r'^admin_tools/', include('admin_tools.urls')),
+     # système
+     url(r'^$', 'project.views.accueil', name='accueil'),
      (r'^admin/', include(admin.site.urls)),
 +    url(r'^api/(?P<method>[a-z_-]+)/(?P<offre_id>\d+)$', 'recrutement.api.api', 
 +            name='recrutement_api'),
      url(r'^api/(?P<method>[a-z_-]+)/$', 'recrutement.api.api', 
              name='recrutement_api'),
      (r'^connexion/$', 'django.contrib.auth.views.login'),