diff --git a/mamweb/admin.py b/mamweb/admin.py new file mode 100644 index 00000000..402f34ca --- /dev/null +++ b/mamweb/admin.py @@ -0,0 +1,24 @@ +from django.contrib import admin +from django.contrib.flatpages.models import FlatPage + +# Note: we are renaming the original Admin and Form as we import them! +from django.contrib.flatpages.admin import FlatPageAdmin as FlatPageAdminOld +from django.contrib.flatpages.admin import FlatpageForm as FlatpageFormOld + +from django import forms +from ckeditor.widgets import CKEditorWidget + +class FlatpageForm(FlatpageFormOld): + content = forms.CharField(widget=CKEditorWidget()) + class Meta: + model = FlatPage # this is not automatically inherited from FlatpageFormOld + exclude = [] + + +class FlatPageAdmin(FlatPageAdminOld): + form = FlatpageForm + + +# We have to unregister the normal admin, and then reregister ours +admin.site.unregister(FlatPage) +admin.site.register(FlatPage, FlatPageAdmin) diff --git a/mamweb/settings_common.py b/mamweb/settings_common.py index 18949127..b63e27a1 100644 --- a/mamweb/settings_common.py +++ b/mamweb/settings_common.py @@ -64,6 +64,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', ) TEMPLATE_CONTEXT_PROCESSORS = ( @@ -104,6 +105,8 @@ INSTALLED_APPS = ( 'threadedcomments', 'django_comments', + 'django.contrib.flatpages', + # MaMweb 'mamweb', 'seminar', @@ -117,7 +120,6 @@ INSTALLED_APPS = ( # 'admin_tools.menu', # 'admin_tools.dashboard', 'flat', - 'django.contrib.admin', ) diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index f9dcf422..ff931421 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -21,8 +21,12 @@ <!-- TODO: only on org login --> <div class="login-bar" style='background: #F80;'> {% if view.object %} - Objekt {{ view.object }}: {{ view.object }} - {% if view.object.admin_url %}<a href='{{ view.object.admin_url }}'>[admin]</a>{% endif %} + Objekt {{ view.object }}: {{ view.object }} + {% if view.object.admin_url %}<a href='{{ view.object.admin_url }}'>[admin]</a>{% endif %} + {% endif %} + {% if flatpage %} + Stránka <tt>{{ flatpage.url }}</tt> ({{ flatpage.title }}) + <a href='{% url 'admin:flatpages_flatpage_change' flatpage.id %}'>[admin]</a> {% endif %} </div> <div class="container"> diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html new file mode 100644 index 00000000..d4d45502 --- /dev/null +++ b/mamweb/templates/flatpages/default.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} + +{% block title %}{{ flatpage.title }}{% endblock title %} + +{% block content %} +<h2>{{ flatpage.title }}</h2> +<div> +{{ flatpage.content }} +</div> +{% endblock content %} + diff --git a/mamweb/templates/home.html b/mamweb/templates/home.html index 90c697d4..2998b0f7 100644 --- a/mamweb/templates/home.html +++ b/mamweb/templates/home.html @@ -1,9 +1,13 @@ {% extends "base.html" %} +{% block title %}{{ flatpage.title }}{% endblock title %} + {% block content %} -<div> -<h2>Vítejte na testwebu MaM!</h2> +<div>Toto je stránka podle šablony "home.html"</div> <p><a href='{% url 'admin:index' %}'>Administrátorské rozhraní</a> (admin/admin) +<h2>{{ flatpage.title }}</h2> +<div> +{{ flatpage.content }} </div> {% endblock content %} diff --git a/mamweb/urls.py b/mamweb/urls.py index 56b8ce6e..c51c72a4 100644 --- a/mamweb/urls.py +++ b/mamweb/urls.py @@ -19,9 +19,8 @@ urlpatterns = i18n_patterns('', url(r'^comments_dj/', include('django_comments.urls')), url(r'^comments_fl/', include('fluent_comments.urls')), - # Obsah - url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'), - + # Obsah - flatpages + url(r'^', include('django.contrib.flatpages.urls')), # Pozor: musi byt posledni ) # This is only needed when using runserver.