From: Radek Czajka Date: Mon, 31 Mar 2014 11:41:23 +0000 (+0200) Subject: Seasonal annoying. X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/bb4d6a520eba3b7fcd5896bbd23c52c4a80c623a Seasonal annoying. --- diff --git a/prawokultury/settings.d/50-static.py b/prawokultury/settings.d/50-static.py index f43274b..96abe58 100644 --- a/prawokultury/settings.d/50-static.py +++ b/prawokultury/settings.d/50-static.py @@ -27,7 +27,7 @@ PIPELINE_CSS = { 'css/prevnext.scss', 'css/forms.scss', 'events/events.scss', - + 'fnpdjango/annoy/annoy.css', ), 'output_filename': 'compressed/base.css', }, @@ -43,7 +43,7 @@ PIPELINE_JS = { 'source_filenames': ( 'js/promobox.js', 'shop/shop.js', - + 'fnpdjango/annoy/annoy.js', ), 'output_filename': 'compressed/base.js', }, diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html index 906871b..f296cb6 100755 --- a/prawokultury/templates/base.html +++ b/prawokultury/templates/base.html @@ -2,7 +2,7 @@ {% load url from future %} {% load i18n %} {% load static from staticfiles %} -{% load fnp_common menu_tags migdal_tags events_tags fnp_share fnp_lang %} +{% load fnp_common menu_tags migdal_tags events_tags fnp_share fnp_lang fnp_annoy %} {% load compressed %} {% load chunks %} @@ -22,6 +22,7 @@ {% block "headextra" %}{% endblock %} + {% annoy %}

diff --git a/requirements.txt b/requirements.txt index c0f07de..8454969 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ django-pagination django-honeypot django-migdal>=0.3.1,<0.4 -fnpdjango>=0.1.5,<0.2 +fnpdjango>=0.1.18,<0.2 textile django-markupfield<1.1 # 1.1 wants Django-1.5