From: Radek Czajka Date: Tue, 30 Jul 2013 12:59:39 +0000 (+0200) Subject: Starting with forum. X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/f61d46269e6ecd5f96b92cbcfbfb0a932454e8fd?ds=sidebyside Starting with forum. --- diff --git a/edumed/settings.d/30-apps.py b/edumed/settings.d/30-apps.py index e98a3ee..42583bd 100644 --- a/edumed/settings.d/30-apps.py +++ b/edumed/settings.d/30-apps.py @@ -15,6 +15,7 @@ INSTALLED_APPS = ( 'haystack', 'chunks', 'contact', + 'pybb', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/edumed/settings.d/40-context.py b/edumed/settings.d/40-context.py index e161e0b..0cf10b8 100644 --- a/edumed/settings.d/40-context.py +++ b/edumed/settings.d/40-context.py @@ -8,5 +8,6 @@ TEMPLATE_CONTEXT_PROCESSORS = tuple(x for x in ( "django.core.context_processors.tz", "django.contrib.messages.context_processors.messages" if 'django.contrib.messages' in INSTALLED_APPS else None, - "django.core.context_processors.request" + "django.core.context_processors.request", + 'pybb.context_processors.processor', ) if x is not None) diff --git a/edumed/settings.d/40-middleware.py b/edumed/settings.d/40-middleware.py index 34780d8..8a3d2e6 100644 --- a/edumed/settings.d/40-middleware.py +++ b/edumed/settings.d/40-middleware.py @@ -21,5 +21,6 @@ MIDDLEWARE_CLASSES = tuple(x for x in ( 'pagination.middleware.PaginationMiddleware' if "pagination" in INSTALLED_APPS else None, 'django.middleware.cache.FetchFromCacheMiddleware', - 'fnpdjango.middleware.SetRemoteAddrFromXRealIP' + 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', + 'pybb.middleware.PybbMiddleware', ) if x is not None) diff --git a/edumed/settings.d/50-contrib.py b/edumed/settings.d/50-contrib.py index 9291ce5..cbb615d 100644 --- a/edumed/settings.d/50-contrib.py +++ b/edumed/settings.d/50-contrib.py @@ -5,3 +5,5 @@ SPONSORS_THUMB_WIDTH = 100 SPONSORS_THUMB_HEIGHT = 56 HONEYPOT_FIELD_NAME='miut' + +PYBB_SMILES = {} diff --git a/edumed/templates/base.html b/edumed/templates/base.html index 6233cf3..417dc88 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -59,7 +59,7 @@ -
{% block body %}{% endblock %}
+
{% block body %}{% block content %}{% endblock %}{% endblock %}