X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/d12ee4e0ec425e7f508c93ad1295a21a67ae1a30..29d00a3749ebfcf255932d7d0d0c9013c2e9a5a3:/edumed/urls.py diff --git a/edumed/urls.py b/edumed/urls.py index 3e99b30..c77c112 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -1,17 +1,22 @@ from django.conf.urls import patterns, include, url from django.conf import settings -from .views import HomeView +from .views import HomeView, AvatarlessProfileEditView + urlpatterns = patterns('', url(r'^$', HomeView.as_view(), name="home"), - url(r'^kompetencje/', include('curriculum.urls')), 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')), + url(r'^tem/', include('wtem.urls')), ) @@ -20,6 +25,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)), @@ -28,8 +37,20 @@ 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'), + ) + + +if settings.DEBUG: + 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"), )