X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/cf285ca933a8421ab58fdaa70f4d3a0382a73f32..277c595277997742a3d4efda1ca984734f95125e:/edumed/urls.py?ds=sidebyside diff --git a/edumed/urls.py b/edumed/urls.py index c77c112..43ed0a8 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -1,10 +1,11 @@ +# -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url from django.conf import settings from .views import HomeView, AvatarlessProfileEditView - -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^$', HomeView.as_view(), name="home"), url(r'^lekcje/', include('catalogue.urls')), url(r'^info/(?P.*)$', 'django.contrib.flatpages.views.flatpage', @@ -15,8 +16,7 @@ urlpatterns = patterns('', url(r'^forum/', include('forum.urls')), url(r'^forum/', include('pybb.urls', namespace='pybb')), url(r'^kompetencje/', include('curriculum.urls')), - #url(r'^wtem/', include('wtem.urls')), - url(r'^tem/', include('wtem.urls')), + url(r'^wtem/', include('wtem.urls')), ) @@ -26,17 +26,20 @@ if 'django.contrib.admin' in settings.INSTALLED_APPS: admin.autodiscover() if 'django_cas' in settings.INSTALLED_APPS: - urlpatterns += patterns('', + urlpatterns += patterns( + '', (r'^admin/logout/$', 'django_cas.views.logout'), ) - urlpatterns += patterns('', + urlpatterns += patterns( + '', url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/', include(admin.site.urls)), ) # Auth stuff, if necessary if 'django_cas' in settings.INSTALLED_APPS: - urlpatterns += patterns('', + urlpatterns += patterns( + '', url(r'^accounts/login/$', 'django_cas.views.login', name='login'), url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), ) @@ -55,8 +58,9 @@ if settings.DEBUG: if settings.DEBUG: - urlpatterns += patterns('', + urlpatterns += patterns( + '', url(r'^media/(?P.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, }), - ) + )