@@ -129,6 +129,6 @@ {% compressed_js 'base' %} {% tracking_code %} - {% block "extra_js" %}{% endblock %} + {% block extra_js %}{% endblock %} diff --git a/prawokultury/templates/migdal/entry/publications/entry_detail.html b/prawokultury/templates/migdal/entry/publications/entry_detail.html index 7bb506e..9632fa6 100755 --- a/prawokultury/templates/migdal/entry/publications/entry_detail.html +++ b/prawokultury/templates/migdal/entry/publications/entry_detail.html @@ -4,7 +4,7 @@ {% load url from future %} -{% block "body" %} +{% block body %} {% if not entry.published %}

{% trans "This entry hasn't been published yet." %}

diff --git a/questions/models.py b/questions/models.py index 278071e..43c6cc5 100644 --- a/questions/models.py +++ b/questions/models.py @@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _ from markupfield.fields import MarkupField from taggit.models import TagBase, GenericTaggedItemBase from taggit_autosuggest.managers import TaggableManager -from fnpdjango.utils.text.slughifi import slughifi +from slugify import slugify class TagCategory(models.Model): @@ -26,7 +26,7 @@ class TagCategory(models.Model): class Tag(TagBase): def slugify(self, tag, i=None): - slug = slughifi(tag) + slug = slugify(tag) if i is not None: slug += "_%d" % i return slug diff --git a/questions/templates/questions/question_detail.html b/questions/templates/questions/question_detail.html index b263830..e0e3e9e 100755 --- a/questions/templates/questions/question_detail.html +++ b/questions/templates/questions/question_detail.html @@ -1,8 +1,8 @@ {% extends "base.html" %} {% load url from future %} -{% block "titleextra" %}{{ question|linebreaksbr }} :: {% endblock %} -{% block "body" %} +{% block titleextra %}{{ question|linebreaksbr }} :: {% endblock %} +{% block body %}

diff --git a/questions/templates/questions/question_form.html b/questions/templates/questions/question_form.html index 8f74192..751b0b8 100755 --- a/questions/templates/questions/question_form.html +++ b/questions/templates/questions/question_form.html @@ -2,8 +2,8 @@ {% load url from future %} {% load chunks %} -{% block "titleextra" %}Pierwsza pomoc w prawie autorskim: pytanie do prawnika :: {% endblock %} -{% block "body" %} +{% block titleextra %}Pierwsza pomoc w prawie autorskim: pytanie do prawnika :: {% endblock %} +{% block body %}

Formularz kontaktowy

diff --git a/questions/templates/questions/question_list.html b/questions/templates/questions/question_list.html index 46e757c..8ef2773 100755 --- a/questions/templates/questions/question_list.html +++ b/questions/templates/questions/question_list.html @@ -4,8 +4,8 @@ {% load compressed %} {% load chunks %} -{% block "titleextra" %}Pierwsza pomoc w prawie autorskim :: {% endblock %} -{% block "body" %} +{% block titleextra %}Pierwsza pomoc w prawie autorskim :: {% endblock %} +{% block body %}

Pierwsza pomoc w prawie autorskim: zapytaj prawnika

@@ -60,10 +60,10 @@ {% endblock %} -{% block "extra_css" %} +{% block extra_css %} {% compressed_css 'questions' %} {% endblock %} -{% block "extra_js" %} +{% block extra_js %} {% compressed_js 'questions' %} {% endblock %} diff --git a/questions/templates/questions/question_thanks.html b/questions/templates/questions/question_thanks.html index 1388aef..a5dc200 100755 --- a/questions/templates/questions/question_thanks.html +++ b/questions/templates/questions/question_thanks.html @@ -1,8 +1,8 @@ {% extends "base.html" %} {% load url from future %} -{% block "titleextra" %}DziÄkujemy za przesÅanie pytania :: {% endblock %} -{% block "body" %} +{% block titleextra %}DziÄkujemy za przesÅanie pytania :: {% endblock %} +{% block body %}

DziÄkujemy za przesÅanie pytania

diff --git a/requirements.txt b/requirements.txt index 3471526..448cb82 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ --i http://pypi.nowoczesnapolska.org.pl/simple +-i https://py.mdrn.pl:8443/simple Django>=1.6,<1.7 django_cas>=2.1,<2.2 @@ -8,9 +8,10 @@ sorl-thumbnail>=11.09,<12 django-pagination django-honeypot -django-migdal>=0.4,<0.5 -fnpdjango>=0.1.18,<0.2 +django-migdal>=0.5,<0.6 +fnpdjango>=0.2.2,<0.3 +python-slugify textile django-markupfield>=1.2,<1.3 django-gravatar2 diff --git a/shop/templates/shop/no_thanks.html b/shop/templates/shop/no_thanks.html index ad2d65e..300c4cd 100644 --- a/shop/templates/shop/no_thanks.html +++ b/shop/templates/shop/no_thanks.html @@ -4,7 +4,7 @@ {% block titleextra %}{% trans "Payment failed" %}{% endblock %} -{% block "body" %} +{% block body %}

{% trans "Payment failed" %}

diff --git a/shop/templates/shop/thanks.html b/shop/templates/shop/thanks.html index c08447c..ddd9bf0 100644 --- a/shop/templates/shop/thanks.html +++ b/shop/templates/shop/thanks.html @@ -4,7 +4,7 @@ {% block titleextra %}{% trans "Payment successful" %}{% endblock %} -{% block "body" %} +{% block body %}

{% trans "Payment successful" %}

{% trans "Events" %}

{% trans "Page not found" %}

{% trans "Upcoming events" %}

{{ question|linebreaksbr }}

Formularz kontaktowy

Pierwsza pomoc w prawie autorskim: zapytaj prawnika

DziÄkujemy za przesÅanie pytania

{% trans "Payment failed" %}

{% trans "Payment successful" %}

{% trans "Events" %}

{% trans "Page not found" %}

{% trans "Upcoming events" %}

{{ question|linebreaksbr }}

Formularz kontaktowy

Pierwsza pomoc w prawie autorskim: zapytaj prawnika

DziÄkujemy za przesÅanie pytania

{% trans "Payment failed" %}

{% trans "Payment successful" %}

DziÄkujemy za przesÅanie pytania