refact ergo + page perso (vide)
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Tue, 2 Aug 2011 19:35:30 +0000 (15:35 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Tue, 2 Aug 2011 19:35:30 +0000 (15:35 -0400)
1  2 
project/settings.py
project/urls.py

Simple merge
diff --cc project/urls.py
@@@ -10,20 -9,41 +10,28 @@@ 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.index', name='accueil'),
++
      (r'^admin/', include(admin.site.urls)),
 +    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('project.recrutement.urls')),
 -    url(r'^recrutement/affecter_evaluateurs_candidats/$', 
 -        'recrutement.views.affecter_evaluateurs_candidats', 
 -        name='affecter_evaluateurs_candidats'),
 -    url(r'^recrutement/affecter_evaluateurs_offre_emploi/$', 
 -        'recrutement.views.affecter_evaluateurs_offre_emploi', 
 -        name='affecter_evaluateurs_offre_emploi'),
 -    url(r'^recrutement/envoyer_courriel_candidats/$', 
 -        'recrutement.views.envoyer_courriel_candidats', 
 -        name='envoyer_courriel_candidats'),
 -    url(r'^recrutement/selectionner_template/$', 
 -        'recrutement.views.selectionner_template', 
 -        name='selectionner_template'),
 -    url(r'^recrutement/pieces/$', 'recrutement.views.postuler_appel_offre', 
 -        name='pieces'),
 -    url(r'^recrutement/postuler_appel_offre/$', 
 -        'recrutement.views.postuler_appel_offre', name='postuler_appel_offre'),
 +    (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: