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 --combined project/urls.py
@@@ -10,22 -10,28 +10,30 @@@ 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'),
      (r'^deconnexion/$', 'django.contrib.auth.views.logout'),
+     #url(r'^private_files/', include('private_files.urls')),
+     url(r'^captcha/', include('captcha.urls')),
+     url(r'^admin_tools/', include('admin_tools.urls')),
+     (r'^tinymce/', include('tinymce.urls')),
+     (r'^prive/(?P<path>.*)$', 'django.views.static.serve', 
+         {'document_root': settings.PRIVE_MEDIA_ROOT}),
+     url(r'^404$', 'project.views.erreur404', name='404'),
+     url(r'^500$', 'project.views.erreur500', name='500'),
+     url(r'^550$', 'project.views.erreur550', name='550'),
+     # apps
      (r'^dae/', include('project.dae.urls')),
      (r'^recrutement/', include('recrutement.urls')),
-     (r'^tinymce/', include('tinymce.urls')),    
      (r'^', include('project.rh.urls')),
-     (r'^prive/(?P<path>.*)$', 'django.views.static.serve', 
-         {'document_root': sett.PRIVE_MEDIA_ROOT}),
  )
  
  if settings.DEBUG: