Merge remote-tracking branch 'origin/filmowa' into filmowa

[edumed.git] / edumed / views.py

diff --git a/edumed/views.py b/edumed/views.py
old mode 100755 (executable)
new mode 100644 (file)
index 5ac002b..47c5d16
--- a/edumed/views.py
+++ b/edumed/views.py
@@ -1,33 +1,31 @@
-import os.path
-from django.conf import settings
-from django.views.generic import TemplateView
-from django.views.defaults import page_not_found
+# -*- coding: utf-8 -*-

 from django.contrib.flatpages.views import flatpage
 from django.contrib.flatpages.views import flatpage

+from django.views.defaults import page_not_found
+from django.views.generic import TemplateView

 from pybb.views import ProfileEditView
 from pybb.views import ProfileEditView

+

 from .forms import AvatarlessEditProfileForm
 
 
 class HomeView(TemplateView):
 from .forms import AvatarlessEditProfileForm
 
 
 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
+    template_name = "home.html"

 
 
 def mil_home_view(request):
 
 
 def mil_home_view(request):

-    return flatpage(request, url = '/' if request.LANGUAGE_CODE == 'pl' else '/en/')
+    return flatpage(request, url='/' if request.LANGUAGE_CODE == 'pl' else '/en/')
+

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

+

 def mil_contact_view(request):
 def mil_contact_view(request):

-    return flatpage(request, url = '/kontakt_mil/' if request.LANGUAGE_CODE == 'pl' else '/contact_mil/')
+    return flatpage(request, url='/kontakt_mil/' if request.LANGUAGE_CODE == 'pl' else '/contact_mil/')
+

 
 def mil_knowledge_base_view(request, url):
 
 def mil_knowledge_base_view(request, url):

-    return flatpage(request, url = 'bazawiedzy/' + url)
+    return flatpage(request, url='bazawiedzy/' + url)
+

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