Commit e7d2919c2edb1f8093554d7ffadcd591f67f18f5

Authored by Luan
1 parent 703c5cbc

Improving search paginator to use bootstrap

src/search/templates/search/search.html
@@ -105,19 +105,49 @@ @@ -105,19 +105,49 @@
105 105
106 {% if page.has_other_pages %} 106 {% if page.has_other_pages %}
107 <div class="text-center"> 107 <div class="text-center">
108 - <span> 108 + <ul class="pagination">
  109 + <li {% if page.number == 1 %}class="disabled"{% endif %}>
  110 + <a href="{% if page.number == 1 %}javascript:void(0);{% else %}{% append_to_get page=1 %}{% endif %}"><span class="glyphicon glyphicon-chevron-left small-icon"></span><span class="glyphicon glyphicon-chevron-left small-icon"></span></a>
  111 + </li>
  112 + <li {% if not page.has_previous %}class="disabled"{% endif %}>
  113 + <a href="{% if page.has_previous %}{% append_to_get page=page.previous_page_number %}{% else %}javascript:void(0);{% endif %}"><span class="glyphicon glyphicon-chevron-left small-icon"></span></a>
  114 + </li>
  115 +
109 {% if page.has_previous %} 116 {% if page.has_previous %}
110 - <a href="{% append_to_get page=page.previous_page_number %}">{% trans "Previous" %}</a> 117 + {% if page.previous_page_number > 1 %}
  118 + <li>
  119 + <a href="{% append_to_get page=page.previous_page_number|add:-2 %}">{{ page.number|add:-2 }}</a>
  120 + </li>
  121 + {% endif %}
  122 + <li>
  123 + <a href="{% append_to_get page=page.previous_page_number %}">{{ page.number|add:-1 }}</a>
  124 + </li>
111 {% endif %} 125 {% endif %}
112 - <span>  
113 - {% trans "Page" %} {{ page.number }} {% trans "of" %}  
114 - {{ page.paginator.num_pages }}  
115 - </span> 126 +
  127 + <li class="active">
  128 + <a href="javascript:void(0);">{{ page.number }}</a>
  129 + </li>
116 130
117 {% if page.has_next %} 131 {% if page.has_next %}
118 - <a href="{% append_to_get page=page.next_page_number %}">{% trans "Next" %}</a> 132 + <li>
  133 + <a href="{% append_to_get page=page.next_page_number %}">{{ page.number|add:1 }}</a>
  134 + </li>
  135 + {% if page.next_page_number < page.paginator.num_pages %}
  136 + <li>
  137 + <a href="{% append_to_get page=page.next_page_number|add:1 %}">{{ page.number|add:2 }}</a>
  138 + </li>
  139 + {% endif %}
119 {% endif %} 140 {% endif %}
120 - </span> 141 +
  142 + <li {% if not page.has_next %}class="disabled"{% endif %}>
  143 + <a href="{% if page.has_next %}{% append_to_get page=page.next_page_number %}{% else %}javascript:void(0);{% endif %}"><span class="glyphicon glyphicon-chevron-right small-icon"></span></a>
  144 + </li>
  145 +
  146 + <li {% if page.number == page.paginator.num_pages %}class="disabled"{% endif %}>
  147 + <a href="{% if page.number == page.paginator.num_pages %}javascript:void(0);{% else %}{% append_to_get page=page.paginator.num_pages %}{% endif %}"><span class="glyphicon glyphicon-chevron-right small-icon"></span><span class="glyphicon glyphicon-chevron-right small-icon"></span></a>
  148 + </li>
  149 +
  150 + </ul>
121 </div> 151 </div>
122 {% endif %} 152 {% endif %}
123 </div> 153 </div>
src/static/css/screen.css
@@ -403,3 +403,8 @@ ul.emails { @@ -403,3 +403,8 @@ ul.emails {
403 span.highlighted { 403 span.highlighted {
404 background-color: yellow; 404 background-color: yellow;
405 } 405 }
  406 +
  407 +/* paginator icon */
  408 +.small-icon {
  409 + font-size: 10px;
  410 +}