configured django-cms for testing purposes

[unfold.git] / myslice / urls.py

diff --git a/myslice/urls.py b/myslice/urls.py
index 669961f..fc6fa54 100644 (file)
--- 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
     #
@@ -34,7 +38,6 @@ urlpatterns = patterns(
     (r'^accounts/login/$', 'auth.views.login_user'),
     (r'^login/?$', 'auth.views.login_user'),
     (r'^logout/?$', 'auth.views.logout_user'),
-    (r'^logout/confirm/?$', 'auth.views.do_logout_user'),
     #
     # the manifold proxy
     #
@@ -42,10 +45,24 @@ urlpatterns = patterns(
     #
     # various trash views
     #
-    (r'^slice/?$', 'trash.sampleviews.slice_view'),
-    (r'^slice/(?P<name>[\w\.]+)/?$', 'trash.sampleviews.slice_view'),
     (r'^tab/?$', 'trash.sampleviews.tab_view'),
     (r'^scroll/?$', 'trash.sampleviews.scroll_view'),
     (r'^plugin/?$', 'trash.pluginview.test_plugin_view'),
     (r'^dashboard/?$', 'trash.dashboard.dashboard_view'),
+    (r'^slice/?$', 'trash.sliceview.slice_view'),
+    (r'^slice/(?P<slicename>[\w\.]+)/?$', 'trash.sliceview.slice_view'),
+    # Portal
+    url(r'^portal/', include('portal.urls')),
+    # 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