修正分页逻辑

vfeihuang · Mar 26, 2018 · 62e1194 · 62e1194
1 parent 308da3b
commit 62e1194
Showing 1 changed file with 53 additions and 33 deletions.
diff --git a/templates/list_byrequests.html b/templates/list_byrequests.html
@@ -64,41 +64,61 @@ <h3><a title="{{ hash.name }}" href="{{url_for('detail',info_hash=hash.info_hash
 </div>
 {% endfor %} 
 <div class="bottom-pager detail-width">
-{% set prev_pages = page-4 if page>5 else 1 %}
-{% set next_pages = page+5 if page+5<=pages else pages%}
+
     {%if pages<10%}
-{%if page==1%}
-<span>上一页</span>
-{%else%}
-<a href="{{ url_for('search_results_byrequests', query=query,page=page-1 )}}">上一页</a>
-{%endif%}
-{%for i in range(1,pages+1)%}
-<a href="{{ url_for('search_results_byrequests', query=query,page=i) }}">{{i}}</a>
-{%endfor%}
-{%if page<pages%}
-<a href="{{ url_for('search_results_byrequests', query=query,page=page+1) }}">下一页</a>
-{%else%}
-<span>下一页</span>
-{%endif%}    
-    {%else%}
-{%if page==1%}
-<span>上一页</span>
-{%else%}
-<a href="{{ url_for('search_results_byrequests', query=query,page=page-1 )}}">上一页</a>
-{%endif%}
-{%for i in range(prev_pages,page)%}
-<a href="{{ url_for('search_results_byrequests', query=query,page=i) }}">{{i}}</a>
-{%endfor%}
-<a href="#">{{page}}</a>
-{%for i in range(page+1,next_pages+1)%}
-<a href="{{ url_for('search_results_byrequests', query=query,page=i) }}">{{i}}</a>
-{%endfor%}
-{%if page<pages%}
-<a href="{{ url_for('search_results_byrequests', query=query,page=page+1) }}">下一页</a>
-{%else%}
-<span>下一页</span>
-{%endif%}
+		{%if page==1%}
+		<span>上一页</span>
+		{%else%}
+		<a href="{{ url_for('search_results_byrequests', query=query,page=page-1 )}}">上一页</a>
+		{%endif%}
+
+		{%for i in range(1,page)%}
+		<a href="{{ url_for('search_results_byrequests', query=query,page=i) }}">{{i}}</a>
+		{%endfor%}
+
+		<span>{{page}}</span>
+
+		{%for i in range(page+1,pages)%}
+		<a href="{{ url_for('search_results_byrequests', query=query,page=i) }}">{{i}}</a>
+		{%endfor%}
+
+		{%if page<pages%}
+		<a href="{{ url_for('search_results_byrequests', query=query,page=page+1) }}">下一页</a>
+		{%else%}
+		<span>下一页</span>
+		{%endif%}    
+
+	{%else%}
+
+		{%if page==1%}
+		<span>上一页</span>
+		{%else%}
+		<a href="{{ url_for('search_results_byrequests', query=query,page=page-1 )}}">上一页</a>
+		{%endif%}
+
+		{%if page>=6%}
+			{%for i in range(page-5,page)%}
+			<a href="{{ url_for('search_results_byrequests', query=query,page=i) }}">{{i}}</a>
+			{%endfor%}
+		{%else%}
+			{%for i in range(1,page)%}
+			<a href="{{ url_for('search_results_byrequests', query=query,page=i) }}">{{i}}</a>
+			{%endfor%}
+		{%endif%}
+
+		<span>{{page}}</span>
+
+		{%for i in range(page+1,page+5)%}
+		<a href="{{ url_for('search_results_byrequests', query=query,page=i) }}">{{i}}</a>
+		{%endfor%}
+
+		{%if page<pages%}
+		<a href="{{ url_for('search_results_byrequests', query=query,page=page+1) }}">下一页</a>
+		{%else%}
+		<span>下一页</span>
+		{%endif%}
     {%endif%}
+
 </div>
 </div>
 <div class="col-md-2">