Upgrade Mercurial.

[redakcja.git] / redakcja / urls.py

diff --git a/redakcja/urls.py b/redakcja/urls.py
index f8538fa..b3da1ee 100644 (file)
--- a/redakcja/urls.py
+++ b/redakcja/urls.py
@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 
 # -*- coding: utf-8 -*-
 

-from django.conf.urls.defaults import *
+from django.conf.urls import include, patterns, url

 from django.contrib import admin
 from django.conf import settings
 from django.contrib import admin
 from django.conf import settings

+from django.conf.urls.static import static
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.views.generic import RedirectView
+

 
 admin.autodiscover()
 
 
 admin.autodiscover()
 


@@ -10,20 +14,22 @@ urlpatterns = patterns('',
     # Auth
     url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
     url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
     # Auth
     url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
     url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),

+    url(r'^admin/login/$', 'django_cas.views.login', name='login'),
+    url(r'^admin/logout/$', 'django_cas.views.logout', name='logout'),

 
     # Admin panel
 
     # Admin panel

-    (r'^admin/filebrowser/', include('filebrowser.urls')),

     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
 
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
 

-    url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}),
-    url(r'^documents/', include('wiki.urls')),
+    (r'^comments/', include('django.contrib.comments.urls')),

 
 

-    # Static files (should be served by Apache)
-    url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
-        {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
-    url(r'^%s(?P<path>.+)$' % settings.ADMIN_MEDIA_PREFIX[1:], 'django.views.static.serve',
-        {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
-    url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
-        {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
+    url(r'^$', RedirectView.as_view(url= '/documents/')),
+    url(r'^documents/', include('catalogue.urls')),
+    url(r'^apiclient/', include('apiclient.urls')),
+    url(r'^editor/', include('wiki.urls')),
+    url(r'^cover/', include('cover.urls')),

 )
 )

+
+if settings.DEBUG:
+    urlpatterns += staticfiles_urlpatterns()
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)