pagination

prsnca · Sep 26, 2016 · 876adaf · 876adaf
1 parent c19466d
commit 876adaf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/committeeVotes/static/css/site.css b/committeeVotes/static/css/site.css
@@ -666,6 +666,10 @@ ul, ol, table {
     cursor: pointer;
 }
 
+.pagination-dots{
+    cursor: default;
+}
+
 hr.minister-hr {
     height: 12px;
     border: 0;

diff --git a/committeeVotes/templates/committeeVotes/minister_detail.html b/committeeVotes/templates/committeeVotes/minister_detail.html
@@ -86,27 +86,43 @@ <h2>
                              <div class="pagination">
                                     <ul class="pagination pagination-centered">
                                         {% if votes.has_previous %}
-                                            <li><a href="?page=1"><<</a></li>
-                                            <li><a href="?page={{ votes.previous_page_number }}"><</a></li>
+                                            <li data-toggle="tooltip" title="לעמוד הקודם"><a href="?page={{ votes.previous_page_number }}"><</a></li>
                                         {% endif %}
 
 
+
+                                        {% if votes.number >= 5 %}
+                                            <li><a href="?page=1">1</a></li>
+                                         <li  class="pagination-dots">
+                                                <span>...</span>
+                                            </li>
+                                        {% endif %}
+
                                         {% for i in votes.paginator.page_range %}
                                             <li  class="
                                                 {% if votes.number == i %} active {% endif %}
-                                                {% if votes.number < i|add:-2 %} hidden {% endif %}
-                                                {% if votes.number > i|add:2 %} hidden {% endif %}"
+
+                                                {% if votes.number|add:4 <=  votes.paginator.num_pages and votes.number < i|add:-1 %}
+                                                 hidden
+                                                {% endif %}
+
+                                                {% if votes.number >= 5 and votes.number > i|add:1 %} hidden {% endif %}"
                                             >
                                                 <a href="?page={{i}}">{{i}}</a>
                                             </li>
                                         {% endfor %}
 
+                                         {% if votes.number|add:4 <=  votes.paginator.num_pages%}
+                                            <li  class="pagination-dots">
+                                                <span>...</span>
+                                            </li>
+                                        <li><a href="?page={{ votes.paginator.num_pages}}">{{votes.paginator.num_pages}}</a></li>
+                                        {% endif %}
 
                                     {% if votes.has_next %}
-                                        <li><a href="?page={{ votes.paginator.page_range     }}">{{votes.paginator.num_pages}}</a></li>
-                                        <li><a href="?page={{ votes.next_page_number }}">></a></li>
-                                        <li><a href="?page={{ votes.paginator.num_pages }}">>></a></li>
-                                    {% endif %}
+
+                                        <li data-toggle="tooltip" title="לעמוד הבא"><a href="?page={{ votes.next_page_number }}">></a></li>
+                                        {% endif %}
 
                                     </ul>