X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=fc6fa541b2658cad952fc6fd26bc03f6c616d5c7;hb=refs%2Fheads%2Fcms;hp=b37ee500163c3630d6571583ad00b63d20e2957f;hpb=d9509698dac0831baad1b725710a72e0ef0dffca;p=unfold.git

diff --git a/myslice/urls.py b/myslice/urls.py
index b37ee500..fc6fa541 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -1,8 +1,10 @@
 from django.conf.urls import patterns, include, url
+from django.conf.urls.i18n import i18n_patterns
+from django.conf import settings
 
 # Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()
 
 # to enable insert_above stuff
 from django.template.loader import add_to_builtins
@@ -14,6 +16,7 @@ default_view='trash.pluginview.test_plugin_view'
 after_login_view='trash.dashboard.dashboard_view'
 
 urlpatterns = patterns(
+#urlpatterns = i18n_patterns(
     '',
     # Examples:
     # url(r'^$', 'myslice.views.home', name='home'),
@@ -21,11 +24,12 @@ urlpatterns = patterns(
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     # Uncomment the next line to enable the admin:
-    # url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', include(admin.site.urls)),
+
     #
     # default / view
     #
-    (r'^/?$', default_view),
+    #(r'^/?$', default_view),
     #
     # login / logout
     #
@@ -52,4 +56,13 @@ urlpatterns = patterns(
     # Debug
     url(r'^debug/', include('debug_platform.urls')),
 
+    url(r'^', include('cms.urls')),
 )
+
+# CMS
+if settings.DEBUG:
+    urlpatterns = patterns('',
+    url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+    url(r'', include('django.contrib.staticfiles.urls')),
+) + urlpatterns