X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bb7b805e9838225a912041690e6a4cd0654dcbd8..refs/heads/edumed:/redakcja/urls.py diff --git a/redakcja/urls.py b/redakcja/urls.py index f8538fa8..1f8a7ff3 100644 --- a/redakcja/urls.py +++ b/redakcja/urls.py @@ -4,10 +4,14 @@ from django.conf.urls.defaults import * from django.contrib import admin from django.conf import settings + admin.autodiscover() urlpatterns = patterns('', # Auth + #url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'), + #url(r'^accounts/logout/$', 'catalogue.views.logout_then_redirect', name='logout'), + url(r'^accounts/login/$', 'django_cas.views.login', name='login'), url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), @@ -16,8 +20,13 @@ urlpatterns = patterns('', url(r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), + (r'^comments/', include('django.contrib.comments.urls')), + url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}), - url(r'^documents/', include('wiki.urls')), + url(r'^documents/', include('catalogue.urls')), + url(r'^apiclient/', include('apiclient.urls')), + url(r'^editor/', include('wiki.urls')), + url(r'^cover/', include('cover.urls')), # Static files (should be served by Apache) url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', @@ -26,4 +35,7 @@ urlpatterns = patterns('', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), url(r'^%s(?P.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), + + url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}), + )