X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/f7c70cc1d06530544ec7ca45c330357babf1e093..873c22275a94e60243469f1b7f0eedb7b2e76f39:/edumed/urls.py?ds=inline diff --git a/edumed/urls.py b/edumed/urls.py index d988610..fb09204 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -1,18 +1,21 @@ from django.conf.urls import patterns, include, url from django.conf import settings -from django.views.generic import TemplateView +from .views import HomeView, AvatarlessProfileEditView + urlpatterns = patterns('', - # Examples: - # url(r'^$', 'edumed.views.home', name='home'), - url(r'^$', TemplateView.as_view(template_name="home.html"), name="home"), - url(r'^kompetencje/', include('curriculum.urls')), + url(r'^$', HomeView.as_view(), name="home"), url(r'^lekcje/', include('catalogue.urls')), -# url(r'^i/', include('django.contrib.flatpages.urls')), url(r'^info/(?P.*)$', 'django.contrib.flatpages.views.flatpage', name="info"), url(r'^szukaj/', include('haystack.urls')), + url(r'^zglos/', include('contact.urls')), + url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'), + 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')), ) @@ -21,6 +24,10 @@ if 'django.contrib.admin' in settings.INSTALLED_APPS: from django.contrib import admin admin.autodiscover() + if 'django_cas' in settings.INSTALLED_APPS: + urlpatterns += patterns('', + (r'^admin/logout/$', 'django_cas.views.logout'), + ) urlpatterns += patterns('', url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/', include(admin.site.urls)), @@ -29,8 +36,8 @@ if 'django.contrib.admin' in settings.INSTALLED_APPS: # Auth stuff, if necessary if 'django_cas' in settings.INSTALLED_APPS: urlpatterns += patterns('', - (r'^accounts/login/$', 'django_cas.views.login'), - (r'^accounts/logout/$', 'django_cas.views.logout'), + url(r'^accounts/login/$', 'django_cas.views.login', name='login'), + url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), )