X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/736d94f6ac63f205be2967f013a15c457032fc2f..968d158dc47ba5894b5c0df6d57d52e063c3ba4d:/edumed/views.py?ds=inline

diff --git a/edumed/views.py b/edumed/views.py
old mode 100755
new mode 100644
index a6c1aa6..866bce1
--- a/edumed/views.py
+++ b/edumed/views.py
@@ -1,30 +1,35 @@
-import os.path
+# -*- coding: utf-8 -*-
 from django.conf import settings
+from django.contrib.flatpages.models import FlatPage
+from django.contrib.flatpages.views import render_flatpage
+from django.contrib.sites.models import get_current_site
+from django.http.response import Http404, HttpResponsePermanentRedirect
+from django.shortcuts import get_object_or_404
 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
 
 
-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')
-
-def mil_contact_view(request):
-    return flatpage(request, url = '/kontakt_mil/' if request.LANGUAGE_CODE == 'pl' else '/contact_mil/')
-
-class AvatarlessProfileEditView(ProfileEditView):
-    form_class = AvatarlessEditProfileForm
+def flatpage_with_template(request, url, template_name):
+    """
+    Public interface to the flat page view.
+
+    Models: `flatpages.flatpages`
+    Templates: Uses the template defined by the ``template_name`` field,
+        or :template:`flatpages/default.html` if template_name is not defined.
+    Context:
+        flatpage
+            `flatpages.flatpages` object
+    """
+    if not url.startswith('/'):
+        url = '/' + url
+    site_id = get_current_site(request).id
+    try:
+        f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=site_id)
+    except Http404:
+        if not url.endswith('/') and settings.APPEND_SLASH:
+            url += '/'
+            get_object_or_404(FlatPage, url__exact=url, sites__id__exact=site_id)
+            return HttpResponsePermanentRedirect('%s/' % request.path)
+        else:
+            raise
+    f.template_name = template_name
+    return render_flatpage(request, f)