Fixes #3314, #3331: Various minor fixes.

[edumed.git] / edumed / views.py

diff --git a/edumed/views.py b/edumed/views.py
index 7d4818d..712570d 100755 (executable)
--- a/edumed/views.py
+++ b/edumed/views.py
@@ -1,6 +1,8 @@
 import os.path
 from django.conf import settings
 from django.views.generic import TemplateView
 import os.path
 from django.conf import settings
 from django.views.generic import TemplateView

+from django.views.defaults import page_not_found
+from django.contrib.flatpages.views import flatpage

 from pybb.views import ProfileEditView
 from .forms import AvatarlessEditProfileForm
 
 from pybb.views import ProfileEditView
 from .forms import AvatarlessEditProfileForm
 


@@ -8,16 +10,17 @@ from .forms import AvatarlessEditProfileForm
 class HomeView(TemplateView):
     template_name="home.html"
 
 class HomeView(TemplateView):
     template_name="home.html"
 

-    def get_context_data(self, **kwargs):
-        context = super(HomeView, self).get_context_data(**kwargs)
-        context['package_url'] = os.path.join(settings.MEDIA_URL, settings.CATALOGUE_PACKAGE)
-        context['package_student_url'] = os.path.join(settings.MEDIA_URL, settings.CATALOGUE_PACKAGE_STUDENT)
-        return context
+def mil_home_view(request):
+    return flatpage(request, url = '/' if request.LANGUAGE_CODE == 'pl' else '/en/')

 
 

+def mil_404_view(request):
+    return page_not_found(request, '404_mil.html')

 
 

-class MILHomeView(TemplateView):
-    template_name = 'base_mil.html'
+def mil_contact_view(request):
+    return flatpage(request, url = '/kontakt_mil/' if request.LANGUAGE_CODE == 'pl' else '/contact_mil/')

 
 

+def mil_knowledge_base_view(request, url):
+    return flatpage(request, url = 'bazawiedzy/' + url)

 
 class AvatarlessProfileEditView(ProfileEditView):
     form_class = AvatarlessEditProfileForm
 
 class AvatarlessProfileEditView(ProfileEditView):
     form_class = AvatarlessEditProfileForm