From: Radek Czajka Date: Thu, 14 Feb 2013 11:08:13 +0000 (+0100) Subject: textile in infopages X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/f7c70cc1d06530544ec7ca45c330357babf1e093?hp=d63e57b65600af76e8032f468b82dfeb79ed66c3 textile in infopages --- diff --git a/edumed/templates/flatpages/default.html b/edumed/templates/flatpages/default.html index b9ce096..1a6f372 100755 --- a/edumed/templates/flatpages/default.html +++ b/edumed/templates/flatpages/default.html @@ -1,7 +1,8 @@ {% extends "base.html" %} +{% load textile_pl from fnp_markup %} {% block title %}{{ flatpage.title }}{% endblock %} {% block body %} -{{ flatpage.content }} -{% endblock %} \ No newline at end of file +{{ flatpage.content|textile_pl }} +{% endblock %} diff --git a/edumed/urls.py b/edumed/urls.py index 5978ddf..d988610 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -10,7 +10,7 @@ urlpatterns = patterns('', url(r'^kompetencje/', include('curriculum.urls')), url(r'^lekcje/', include('catalogue.urls')), # url(r'^i/', include('django.contrib.flatpages.urls')), - url(r'^i/(?P.*)$', 'django.contrib.flatpages.views.flatpage', + url(r'^info/(?P.*)$', 'django.contrib.flatpages.views.flatpage', name="info"), url(r'^szukaj/', include('haystack.urls')), )