Просмотр исходного кода

Fix display of topic pages on forum index

sh4nks 8 лет назад
Родитель
Сommit
ab6b8495b0
2 измененных файлов с 4 добавлено и 2 удалено
  1. 1 1
      flaskbb/templates/forum/forum.html
  2. 3 1
      flaskbb/templates/macros.html

+ 1 - 1
flaskbb/templates/forum/forum.html

@@ -78,7 +78,7 @@
                             <div class="topic-name">
                             <div class="topic-name">
                                 <a href="{{ topic.url }}">{{ topic.title }}</a>
                                 <a href="{{ topic.url }}">{{ topic.title }}</a>
                                 <!-- Topic Pagination -->
                                 <!-- Topic Pagination -->
-                                <span class="topic-pages">[{{ topic_pages(topic, flaskbb_config["POSTS_PER_PAGE"]) }}]</span>
+                                <span class="topic-pages">{{ topic_pages(topic, flaskbb_config["POSTS_PER_PAGE"]) }}</span>
                             </div>
                             </div>
 
 
                             <div class="topic-author">
                             <div class="topic-author">

+ 3 - 1
flaskbb/templates/macros.html

@@ -389,7 +389,8 @@
 {% set max_pages = 4 %}
 {% set max_pages = 4 %}
 {% set page_count = pages if pages <= max_pages else max_pages %}
 {% set page_count = pages if pages <= max_pages else max_pages %}
 
 
-{%- if pages > 0 -%}
+{%- if pages > 1 -%}
+[
     {%- for page in range(1, page_count+1) -%}
     {%- for page in range(1, page_count+1) -%}
         {% if pages > max_pages and page == max_pages-1 %}
         {% if pages > max_pages and page == max_pages-1 %}
             <a href="{{ url_for('forum.view_topic', topic_id=topic_obj.id) }}?page={{ page }}">{{ page }}</a> ...
             <a href="{{ url_for('forum.view_topic', topic_id=topic_obj.id) }}?page={{ page }}">{{ page }}</a> ...
@@ -399,6 +400,7 @@
             <a href="{{ url_for('forum.view_topic', topic_id=topic_obj.id) }}?page={{ page }}">{{ page }}</a>
             <a href="{{ url_for('forum.view_topic', topic_id=topic_obj.id) }}?page={{ page }}">{{ page }}</a>
         {% endif %}
         {% endif %}
     {%- endfor -%}
     {%- endfor -%}
+]
 {%- endif -%}
 {%- endif -%}
 {%- endmacro -%}
 {%- endmacro -%}