diff --git a/blog/templates/blog/base.html b/blog/templates/blog/base.html index 8217444..67df96a 100644 --- a/blog/templates/blog/base.html +++ b/blog/templates/blog/base.html @@ -1,5 +1,5 @@ {% load staticfiles %} -{% load pagination_filters %} +{% comment %} {% load pagination_filters %} {% comment %} BLOG @@ -64,7 +64,7 @@ {% if posts.has_other_pages %} ← {% for page in posts.paginator.num_pages|truncate:posts.number %} - {% if page == posts.number %} {{page}} + {% if page == posts.number %} {{page}} {% else %} {{page}} {% endif %} {% endfor %} → {% endif %} @@ -73,7 +73,7 @@ {% if posts.has_previous %}
  • <<
  • {{ posts.previous_page_number }}
    • - {% endif %} + {% endif %} {% if posts.has_other_pages %}
  • {{ posts.number }}
    • {% endif %} {% if posts.has_next %}
  • {{ posts.next_page_number }}
    • diff --git a/blog/templates/blog/post_list.html b/blog/templates/blog/post_list.html index b8b6e9c..7117ed1 100644 --- a/blog/templates/blog/post_list.html +++ b/blog/templates/blog/post_list.html @@ -1,5 +1,5 @@ {% extends 'blog/base.html' %} -{% load pagination_tags %} +{% comment %} {% load pagination_tags %} {% endcomment %} {% block content %} {% if posts %} @@ -8,7 +8,7 @@

    {{ post.title }}

    {{ post.published_date}}
    - {% if post.tags.names %} + {% if post.tags.names %}
    {% for tag in post.tags.names %} @@ -17,10 +17,10 @@
    {% endif %}
    - {{ post.text|safe|linebreaksbr|truncatewords:80 }}
    - + {{ post.text|safe|linebreaksbr|truncatewords:80 }}
    + {% endfor %} - + {% else %}

    Ничего не найдено

    diff --git a/mysite/settings.py b/mysite/settings.py index 0beac07..576f883 100644 --- a/mysite/settings.py +++ b/mysite/settings.py @@ -41,7 +41,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'blog', 'taggit', - 'pagination', + # 'pagination', ] MIDDLEWARE_CLASSES = [ diff --git a/requirements.txt b/requirements.txt index d370632..74c368e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -Django==1.11 +Django==1.11.1 django-taggit==0.22.1 psycopg2 django-tinymce