fnp / prawokultury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 0a6e68a)
adapt to new migdal and fnpdjango
authorJan Szejko <janek37@gmail.com>
Tue, 8 Nov 2016 16:35:03 +0000 (17:35 +0100)
committerJan Szejko <janek37@gmail.com>
Tue, 8 Nov 2016 16:35:03 +0000 (17:35 +0100)
13 files changed:
events/templates/events/event_list.html patch | blob | history
prawokultury/settings.d/50-static.py patch | blob | history
prawokultury/templates/404.html patch | blob | history
prawokultury/templates/base.html patch | blob | history
prawokultury/templates/migdal/entry/publications/entry_detail.html patch | blob | history
questions/models.py patch | blob | history
questions/templates/questions/question_detail.html patch | blob | history
questions/templates/questions/question_form.html patch | blob | history
questions/templates/questions/question_list.html patch | blob | history
questions/templates/questions/question_thanks.html patch | blob | history
requirements.txt patch | blob | history
shop/templates/shop/no_thanks.html patch | blob | history
shop/templates/shop/thanks.html patch | blob | history

diff --git a/events/templates/events/event_list.html b/events/templates/events/event_list.html
index b6dd773..ad2a92c 100755 (executable)
--- a/events/templates/events/event_list.html
+++ b/events/templates/events/event_list.html
@@ -3,7 +3,7 @@
 {% load i18n pagination_tags fnp_prevnext %}
 {% load events_tags %}
 
-{% block "body" %}
+{% block body %}
 <h1>{% trans "Events" %}</h1>
 
 {% autopaginate object_list 10 %}
diff --git a/prawokultury/settings.d/50-static.py b/prawokultury/settings.d/50-static.py
index a6af4e6..031658c 100644 (file)
--- a/prawokultury/settings.d/50-static.py
+++ b/prawokultury/settings.d/50-static.py
@@ -9,7 +9,7 @@ STATICFILES_FINDERS = (
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
-STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage'
+STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage'
 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 PIPELINE_CSS = {
diff --git a/prawokultury/templates/404.html b/prawokultury/templates/404.html
index 62bbbe8..1ef6711 100644 (file)
--- a/prawokultury/templates/404.html
+++ b/prawokultury/templates/404.html
@@ -2,10 +2,10 @@
 {% load i18n %}
 
 
-{% block "titleextra" %}{% trans "Page not found" %} :: {% endblock %}
+{% block titleextra %}{% trans "Page not found" %} :: {% endblock %}
 
 
-{% block "body" %}
+{% block body %}
 
 <h1>{% trans "Page not found" %}</h1>
 
diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index a7ba6e8..e479416 100644 (file)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -8,19 +8,19 @@
 {% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
-       <title>{% block "titleextra" %}{% endblock %}{% trans "Right to Culture" %}</title>
+       <title>{% block titleextra %}{% endblock %}{% trans "Right to Culture" %}</title>
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
-        {% block "extra_css" %}{% endblock %}
+        {% block extra_css %}{% endblock %}
         <meta charset="UTF-8" />
-        <meta property='og:url' content='{% block "ogurl" %}{{ request.get_full_path|build_absolute_uri:request }}{% endblock %}' />
-        <meta property='og:title' content='{% block "ogtitle" %}{% trans "Right to Culture" %}{% endblock %}' />
+        <meta property='og:url' content='{% block ogurl %}{{ request.get_full_path|build_absolute_uri:request }}{% endblock %}' />
+        <meta property='og:title' content='{% block ogtitle %}{% trans "Right to Culture" %}{% endblock %}' />
         <meta property='og:site_name' content='{% trans "Right to Culture" %}' />
-        <meta property='og:description' content='{% block "ogdescription" %}Prawokultury.pl to strona edukacyjna mająca za zadanie w przystępny i rzetelny sposób informować o wszelkich kwestiach związanych z prawem autorskim.{% endblock %}' />
-        <meta property='og:type' content='{% block "ogtype" %}website{% endblock %}' />
-        <meta property='og:image' content='{% block "ogimage" %}{{ "/static/img/square-logo.png"|build_absolute_uri:request }}{% endblock %}' />
+        <meta property='og:description' content='{% block ogdescription %}Prawokultury.pl to strona edukacyjna mająca za zadanie w przystępny i rzetelny sposób informować o wszelkich kwestiach związanych z prawem autorskim.{% endblock %}' />
+        <meta property='og:type' content='{% block ogtype %}website{% endblock %}' />
+        <meta property='og:image' content='{% block ogimage %}{{ "/static/img/square-logo.png"|build_absolute_uri:request }}{% endblock %}' />
         <meta property='og:locale' content='pl_PL' />
-        {% block "headextra" %}{% endblock %}
+        {% block headextra %}{% endblock %}
     </head>
     <body>
     {% load fnp_annoy %}{% annoy %}
@@ -54,7 +54,7 @@
             </button></form>
         </div>
         <ul id="menu" class="bar-left">
-            {% block "main_menu" %}
+            {% block main_menu %}
                 {% main_menu %}
             {% endblock %}
             <li id="item-lang">{% lang_switcher %}</li>
@@ -70,7 +70,7 @@
 
         <div id="main-bar" style='clear: both;'>
         <div id="sidebar" class="bar-right">
-            {% block "sidebar" %}
+            {% block sidebar %}
                 <div class="sidebar-box">
                     <h3><a href="{% url 'events' %}">{% trans "Upcoming events" %}</a></h3>
                     {% events_box %}
@@ -96,7 +96,7 @@
             {% endblock %}
         </div>
         <div id="content" class="bar-left">
-            {% block "body" %}{% endblock %}
+            {% block body %}{% endblock %}
         </div>
         <div style="clear: both;"></div>
         </div>
@@ -129,6 +129,6 @@
     <script type="text/javascript" src="//code.jquery.com/jquery-1.8.0.min.js" charset="utf-8"></script>
     {% compressed_js 'base' %}
     {% tracking_code %}
-    {% block "extra_js" %}{% endblock %}
+    {% block extra_js %}{% endblock %}
     </body>
 </html>
diff --git a/prawokultury/templates/migdal/entry/publications/entry_detail.html b/prawokultury/templates/migdal/entry/publications/entry_detail.html
index 7bb506e..9632fa6 100755 (executable)
--- 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 %}
     <p class="warning">{% trans "This entry hasn't been published yet." %}</p>
diff --git a/questions/models.py b/questions/models.py
index 278071e..43c6cc5 100644 (file)
--- 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 (executable)
--- 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 %}
 <h1>{{ question|linebreaksbr }}</h1>
 
 <div class="normal">
diff --git a/questions/templates/questions/question_form.html b/questions/templates/questions/question_form.html
index 8f74192..751b0b8 100755 (executable)
--- 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 %}
 <h1>Formularz kontaktowy</h1>
 
 
diff --git a/questions/templates/questions/question_list.html b/questions/templates/questions/question_list.html
index 46e757c..8ef2773 100755 (executable)
--- 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 %}
 <h1>Pierwsza pomoc w prawie autorskim: zapytaj prawnika</h1>
 
 <div class="normal">
@@ -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 (executable)
--- 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 %}
 <h1>Dziękujemy za przesłanie pytania</h1>
 
 <div class="normal">
diff --git a/requirements.txt b/requirements.txt
index 3471526..448cb82 100644 (file)
--- 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 (file)
--- 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 %}
 
 <h1>{% trans "Payment failed" %}</h1>
 
diff --git a/shop/templates/shop/thanks.html b/shop/templates/shop/thanks.html
index c08447c..ddd9bf0 100644 (file)
--- 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 %}
 
 <h1>{% trans "Payment successful" %}</h1>