X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/43116c58e5c56f94ef358a5a17fb13a252e02531..f2ed7d5158a1d6508b1382a384e32e22371a80b6:/redakcja/urls.py diff --git a/redakcja/urls.py b/redakcja/urls.py index d25312d9..c0629fac 100644 --- a/redakcja/urls.py +++ b/redakcja/urls.py @@ -1,6 +1,6 @@ # -*- 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.conf.urls.static import static @@ -14,6 +14,8 @@ urlpatterns = patterns('', # 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 url(r'^admin/doc/', include('django.contrib.admindocs.urls')), @@ -25,6 +27,7 @@ urlpatterns = patterns('', url(r'^documents/', include('catalogue.urls')), url(r'^apiclient/', include('apiclient.urls')), url(r'^editor/', include('wiki.urls')), + url(r'^images/', include('wiki_img.urls')), url(r'^cover/', include('cover.urls')), )