merge dev

[auf_rh_dae.git] / project / urls.py

diff --git a/project/urls.py b/project/urls.py
index 2c1364e..cf14e27 100644 (file)
--- a/project/urls.py
+++ b/project/urls.py
@@ -2,6 +2,7 @@
 from django.conf.urls.defaults import patterns, include, handler500, url
 from django.conf import settings
 from django.contrib import admin
 from django.conf.urls.defaults import patterns, include, handler500, url
 from django.conf import settings
 from django.contrib import admin

+from auf.django.emploi import settings as sett

 
 admin.autodiscover()
 
 
 admin.autodiscover()
 

@@ -9,16 +10,34 @@ handler500 # Pyflakes
 
 urlpatterns = patterns(
     '',
 
 urlpatterns = patterns(
     '',

-    ######## page d'accueil de demo ######
-    (r'^$', 'auf.django.skin.views.demo'),
-    ######################################
+    (r'^$', 'project.views.index'),
+    #url(r'^private_files/', include('private_files.urls')),
+    url(r'^captcha/', include('captcha.urls')),

     url(r'^admin_tools/', include('admin_tools.urls')),
     url(r'^admin_tools/', include('admin_tools.urls')),

+
+    # système
+    url(r'^$', 'project.views.accueil', name='accueil'),
+

     (r'^admin/', include(admin.site.urls)),
     (r'^admin/', include(admin.site.urls)),

-    (r'^dae/', include('project.dae.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'),
     (r'^connexion/$', 'django.contrib.auth.views.login'),
     (r'^deconnexion/$', 'django.contrib.auth.views.logout'),

-    (r'^', include('project.rh.urls')),
+    #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'^', include('project.rh.urls')),
+    url(r'^qbe/', include('django_qbe.urls')),

 )
 
 if settings.DEBUG:
 )
 
 if settings.DEBUG: