Merge branch 'leveling'

[edumed.git] / edumed / milurls.py

diff --git a/edumed/milurls.py b/edumed/milurls.py
index 8f9060c..b68f1ba 100644 (file)
--- a/edumed/milurls.py
+++ b/edumed/milurls.py
@@ -1,14 +1,25 @@
-from django.conf.urls import include, url
+from django.conf.urls import include, url, patterns
 
 from fnpdjango.utils.urls import i18n_patterns
-from .views import MILHomeView
+from .views import mil_home_view, mil_contact_view, mil_knowledge_base_view
 
 
 urlpatterns = i18n_patterns('',
-    url(r'^$', MILHomeView.as_view(), name="mil_home"),
+    url(r'^$', mil_home_view, name="mil_home"),
     url(r'^kompetencje/', include('curriculum.urls')),
+    url(r'^wez-udzial/', include('comment.urls')),
+    url(r'^zglos/', include('contact.urls')),
+    url(r'^kontakt/$', mil_contact_view, name='mil_contact'),
+    url(r'^bazawiedzy/(?P<url>.*)$', mil_knowledge_base_view,
+        name="knowledge_base"),
 )
 
 handler404 = 'edumed.views.mil_404_view'
 
-
+from django.conf import settings
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )