X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/f689c911be1ba63d0f404ddaed570df3c3ffbee9..c047053dab0ec7d125fd5b2540a01045e64dd3fa:/edumed/urls.py?ds=sidebyside diff --git a/edumed/urls.py b/edumed/urls.py index 8b24a1c..1764f61 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -2,9 +2,9 @@ from django.conf.urls import patterns, include, url from django.conf import settings from django.contrib.flatpages.views import flatpage -from django.shortcuts import redirect +# from django.shortcuts import redirect -from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template +# from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template urlpatterns = patterns( '', @@ -26,7 +26,7 @@ urlpatterns = patterns( # url(r'^forum/', include('pybb.urls', namespace='pybb')), # url(r'^kompetencje/', include('curriculum.urls')), url(r'^zadania/', include('wtem.urls')), - url(r'^2etap/', include('stage2.urls')), + url(r'^drugi-etap/', include('stage2.urls')), ) @@ -53,6 +53,12 @@ if 'django_cas' in settings.INSTALLED_APPS: url(r'^accounts/login/$', 'django_cas.views.login', name='login'), url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), ) +else: + from django.contrib.auth.views import login, logout + urlpatterns += ( + url(r'^accounts/login/$', login, name='login'), + url(r'^accounts/logout/$', logout, name='logout'), + ) urlpatterns += ( url(r'^(?P[^/]*/|)$', @@ -60,8 +66,7 @@ urlpatterns += ( ) if settings.DEBUG: - urlpatterns += patterns( - '', + urlpatterns += ( # url(r'^media/(?P.*)$', 'django.views.static.serve', { # 'document_root': settings.MEDIA_ROOT, # }),