even more changes for olimpiada (logo size)

[edumed.git] / edumed / milurls.py

diff --git a/edumed/milurls.py b/edumed/milurls.py
index 201f85d..dea2558 100644 (file)
--- a/edumed/milurls.py
+++ b/edumed/milurls.py
@@ -1,29 +1,28 @@
+# -*- coding: utf-8 -*-

 from django.conf.urls import include, url, patterns
 from django.conf.urls import include, url, patterns

+from django.conf import settings

 
 from fnpdjango.utils.urls import i18n_patterns
 
 from fnpdjango.utils.urls import i18n_patterns

-from .views import mil_home_view
+from .views import mil_home_view, mil_contact_view, mil_knowledge_base_view

 
 
 
 

-urlpatterns = i18n_patterns('',
+urlpatterns = i18n_patterns(
+    '',

     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'^$', 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')),

-)
-
-urlpatterns += patterns('',
-    url(r'^kontakt/', 'django.contrib.flatpages.views.flatpage', {'url': 'kontakt/'},
-        name="info_contact_pl"),
-    url(r'^contact/', 'django.contrib.flatpages.views.flatpage', {'url': 'contact/'},
-        name="info_contact_en"),
+    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'
 
 )
 
 handler404 = 'edumed.views.mil_404_view'
 

-from django.conf import settings

 if settings.DEBUG:
 if settings.DEBUG:

-    urlpatterns += patterns('',
+    urlpatterns += patterns(
+        '',

         url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
             'document_root': settings.MEDIA_ROOT,
         }),
         url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
             'document_root': settings.MEDIA_ROOT,
         }),

-   )
+    )