Templates updated

ellmetha · Mar 7, 2015 · 8b738e7 · 8b738e7
1 parent 3cc1c98
commit 8b738e7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/machina/templates/machina/forum_search/pagination.html b/machina/templates/machina/forum_search/pagination.html
@@ -4,28 +4,28 @@
     <li class="prev {% if not page.has_previous %}disabled{% endif %}">
         <a href="{% if page.has_previous %}?q={{ query }}&amp;page={{ page.previous_page_number }}{% endif %}">&laquo;</a>
     </li>
-    {% for number in page.paginator.page_range %}
-        {% if page.number == number %}
-            <li class="active"><a href="?q={{ query }}&amp;page={{ number }}">{{ number }}</a></li>
+    {% for number in paginator.page_range %}
+        {% if forloop.first %}
+            <li{% if page.number == number %} class="active"{% endif %}><a href="?q={{ query }}&amp;page={{ number }}">{{ number }}</a></li>
+            {% if page.number > 4 %}
+                <li><span>...</span></li>
+            {% endif %}
+        {% elif forloop.last %}
+            {% if page.number < paginator.num_pages|add:"-3" %}
+                <li><span>...</span></li>
+            {% endif %}
+            <li{% if page.number == number %} class="active"{% endif %}><a href="?q={{ query }}&amp;page={{ number }}">{{ number }}</a></li>
         {% else %}
-            {% if forloop.first %}
-                <li><a href="?q={{ query }}&amp;page={{ number }}">{{ number }}</a></li>
-                {% if page.number > 3 %}
-                    <li><span>...</span></li>
-                {% endif %}
-            {% elif forloop.last %}
-                {% if page.number < page.paginator.num_pages|add:"-2" %}
-                    <li><span>...</span></li>
-                {% endif %}
-                <li><a href="?q={{ query }}&amp;page={{ number }}">{{ number }}</a></li>
-            {% else %}
-                {% if number == page.previous_page_number or number == page.next_page_number %}
-                    <li><a href="?q={{ query }}&amp;page={{ number }}">{{ number }}</a></li>
-                {% endif %}
+            {% if page.number < 3 and number <= 5 %}
+                <li{% if page.number == number %} class="active"{% endif %}><a href="?q={{ query }}&amp;page={{ number }}">{{ number }}</a></li>
+            {% elif page.number > paginator.num_pages|add:"-2" and number >= paginator.num_pages|add:"-4" %}
+                <li{% if page.number == number %} class="active"{% endif %}><a href="?q={{ query }}&amp;page={{ number }}">{{ number }}</a></li>
+            {% elif number >= page.previous_page_number|add:"-1" and number <= page.next_page_number|add:"1" %}
+                <li{% if page.number == number %} class="active"{% endif %}><a href="?q={{ query }}&amp;page={{ number }}">{{ number }}</a></li>
             {% endif %}
         {% endif %}
     {% endfor %}
     <li class="next {% if not page.has_next %}disabled{% endif %}">
         <a href="{% if page.has_next %}?q={{ query }}&amp;page={{ page.next_page_number }}{% endif %}" >&raquo;</a>
     </li>
-</ul>
+</ul>
diff --git a/machina/templates/machina/partials/pagination.html b/machina/templates/machina/partials/pagination.html
@@ -6,23 +6,23 @@
             <a href="{% if page_obj.has_previous %}?page={{ page_obj.previous_page_number }}{% endif %}">&laquo;</a>
         </li>
         {% for number in paginator.page_range %}
-            {% if page_obj.number == number %}
-                <li class="active"><a href="?page={{ number }}">{{ number }}</a></li>
+            {% if forloop.first %}
+                <li{% if page_obj.number == number %} class="active"{% endif %}><a href="?page={{ number }}">{{ number }}</a></li>
+                {% if page_obj.number > 4 %}
+                    <li><span>...</span></li>
+                {% endif %}
+            {% elif forloop.last %}
+                {% if page_obj.number < paginator.num_pages|add:"-3" %}
+                    <li><span>...</span></li>
+                {% endif %}
+                <li{% if page_obj.number == number %} class="active"{% endif %}><a href="?page={{ number }}">{{ number }}</a></li>
             {% else %}
-                {% if forloop.first %}
-                    <li><a href="?page={{ number }}">{{ number }}</a></li>
-                    {% if page_obj.number > 3 %}
-                        <li><span>...</span></li>
-                    {% endif %}
-                {% elif forloop.last %}
-                    {% if page_obj.number < paginator.num_pages|add:"-2" %}
-                        <li><span>...</span></li>
-                    {% endif %}
-                    <li><a href="?page={{ number }}">{{ number }}</a></li>
-                {% else %}
-                    {% if number == page_obj.previous_page_number or number == page_obj.next_page_number %}
-                        <li><a href="?page={{ number }}">{{ number }}</a></li>
-                    {% endif %}
+                {% if page_obj.number < 3 and number <= 5 %}
+                    <li{% if page_obj.number == number %} class="active"{% endif %}><a href="?page={{ number }}">{{ number }}</a></li>
+                {% elif page_obj.number > paginator.num_pages|add:"-2" and number >= paginator.num_pages|add:"-4" %}
+                    <li{% if page_obj.number == number %} class="active"{% endif %}><a href="?page={{ number }}">{{ number }}</a></li>
+                {% elif number >= page_obj.previous_page_number|add:"-1" and number <= page_obj.next_page_number|add:"1" %}
+                    <li{% if page_obj.number == number %} class="active"{% endif %}><a href="?page={{ number }}">{{ number }}</a></li>
                 {% endif %}
             {% endif %}
         {% endfor %}