Fix blog and re-enable admin

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index b709acced792c93e27330fea820be3f1576d06d8..38f78a1a173a99f65e125812002209badc4703e4 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls.defaults import *
 from settings import MEDIA_ROOT, MEDIA_URL
 from blog.feeds import LatestBlogEntries
 from django.conf.urls.defaults import *
 from settings import MEDIA_ROOT, MEDIA_URL
 from blog.feeds import LatestBlogEntries

+from django.contrib import admin

 
 handler404 = 'generic.views.render_404'
 
 
 handler404 = 'generic.views.render_404'
 


@@ -8,6 +9,8 @@ feeds_dict = {
     'blog': LatestBlogEntries,
     }
 
     'blog': LatestBlogEntries,
     }
 

+admin.autodiscover()
+

 urlpatterns = patterns('',
     # Example:
     # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),
 urlpatterns = patterns('',
     # Example:
     # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),


@@ -15,9 +18,8 @@ urlpatterns = patterns('',
     # Uncomment this for admin:
     (r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
     (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
     # Uncomment this for admin:
     (r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
     (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),

-    (r'^admin/', include('django.contrib.admin.urls')),
+    (r'^admin/(.*)$', admin.site.root),

     (r'^blog/', include('blog.urls')),
     (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
     (r'^blog/', include('blog.urls')),
     (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),

-    (r'^(?:content/|)(?P<slug>[^/]+)/$', 'bpcms.views.document_view'),
-    (r'^(?:content/|)(?P<folders>.*)/(?P<slug>[^/]+)/$', 'bpcms.views.document_view'),
+    (r'^(?:content/|)', include('bpcms.urls'))

 )
 )