X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/32ac950fc8d6ba7ef7ec4bf1c4b05f2ed25b02fd..f2dd9c713605ba2a17425267eb2c0c4b4f7dc928:/edumed/urls.py?ds=sidebyside diff --git a/edumed/urls.py b/edumed/urls.py index 2c31a0c..262c433 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -1,19 +1,30 @@ +# -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url from django.conf import settings -from .views import HomeView, AvatarlessProfileEditView +from django.contrib.flatpages.views import flatpage +from django.shortcuts import redirect +from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template - -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^$', HomeView.as_view(), name="home"), - url(r'^kompetencje/', include('curriculum.urls')), url(r'^lekcje/', include('catalogue.urls')), - url(r'^info/(?P.*)$', 'django.contrib.flatpages.views.flatpage', - name="info"), + url(r'^info/turniej/(?P.*)$', lambda request, url: redirect('olimpiada', url)), + url(r'^info/(?P.*)$', flatpage, name="info"), + url(r'^olimpiada/$', lambda request: flatpage(request, 'turniej/'), name='olimpiada'), + url(r'^olimpiada/(?P.*)$', lambda request, url: flatpage(request, 'turniej/' + url), name='olimpiada'), + url(r'^olimpiada-teaser/(?P.*)$', + lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'), + name='olimpiada_teaser'), 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'^wlem/', include('wtem.urls')), + url(r'^api/', include('api.urls')), ) @@ -23,25 +34,41 @@ 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'), ) if settings.DEBUG: - urlpatterns += patterns('', + from fnpdjango.utils.urls import i18n_patterns + from .views import mil_home_view, mil_contact_view, mil_knowledge_base_view + urlpatterns += i18n_patterns( + '', + url(r'^katalog/$', mil_home_view, name="mil_home"), + url(r'^wez-udzial/', include('comment.urls')), + url(r'^kontakt/$', mil_contact_view, name='mil_contact'), + url(r'^bazawiedzy/(?P.*)$', mil_knowledge_base_view, name="knowledge_base"), + ) + + +if settings.DEBUG: + urlpatterns += patterns( + '', url(r'^media/(?P.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, }), - ) + )