Merge pull request #73 from bkcsoft/gt/2164-release-pagination

Add Pagination to Releases-page (and de-duplicate pagination templates)

11 files changed, 12 insertions, 32 deletions

diff --git a/templates/admin/base/page.tmpl b/templates/admin/base/page.tmpl
deleted file mode 100644
index 564d7dec34..0000000000
--- a/templates/admin/base/page.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-	{{with .Page}}
-		{{if gt .TotalPages 1}}
-			<div class="center page buttons">
-				<div class="ui borderless pagination menu">
-					<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}?q={{$.Keyword}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
-					<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}&q={{$.Keyword}}"{{end}}>
-						<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
-					</a>
-					{{range .Pages}}
-						{{if eq .Num -1}}
-							<a class="disabled item">...</a>
-						{{else}}
-							<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}&q={{$.Keyword}}"{{end}}>{{.Num}}</a>
-						{{end}}
-					{{end}}
-					<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}&q={{$.Keyword}}"{{end}}>
-						{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
-					</a>
-					<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}&q={{$.Keyword}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
-				</div>
-			</div>
-		{{end}}
-	{{end}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 6b9423d03e..244f915c97 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -40,7 +40,7 @@
 					</table>
 				</div>
 
-				{{template "admin/base/page" .}}
+				{{template "base/paginate" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 4b1d98b94b..8db51489d7 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -44,7 +44,7 @@
 					</table>
 				</div>
 
-				{{template "admin/base/page" .}}
+				{{template "base/paginage" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 8c7a0c9a90..f1ebf4a340 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -45,7 +45,7 @@
 					</table>
 				</div>
 
-				{{template "admin/base/page" .}}
+				{{template "base/paginate" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/explore/page.tmpl b/templates/base/paginate.tmpl
index fd3e7a7a82..afe34c632f 100644
--- a/templates/explore/page.tmpl
+++ b/templates/base/paginate.tmpl
@@ -2,6 +2,7 @@
 	{{if gt .TotalPages 1}}
 		<div class="center page buttons">
 			<div class="ui borderless pagination menu">
+				<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}?q={{$.Keyword}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
 				<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}&q={{$.Keyword}}"{{end}}>
 					<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
 				</a>
@@ -13,8 +14,9 @@
 					{{end}}
 				{{end}}
 				<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}&q={{$.Keyword}}"{{end}}>
-					{{$.i18n.Tr "repo.issues.next"}} <i class="icon right arrow"></i>
+					{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
 				</a>
+				<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}&q={{$.Keyword}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
 			</div>
 		</div>
 	{{end}}
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index 6953414e85..c44456be4c 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -27,7 +27,7 @@
 					{{end}}
 				</div>
 
-				{{template "explore/page" .}}
+				{{template "base/paginate" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl
index 080a5076f1..eac3f1d26c 100644
--- a/templates/explore/repos.tmpl
+++ b/templates/explore/repos.tmpl
@@ -6,7 +6,7 @@
 			<div class="twelve wide column content">
 				{{template "explore/search" .}}
 				{{template "explore/repo_list" .}}
-				{{template "explore/page" .}}
+				{{template "base/paginate" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index c13ccc6977..ce356f4fde 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -27,7 +27,7 @@
 					{{end}}
 				</div>
 
-				{{template "explore/page" .}}
+				{{template "base/paginate" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 17b0ade8c9..69de8d3481 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -32,7 +32,7 @@
 					<div class="ui divider"></div>
 				{{end}}
 				{{template "explore/repo_list" .}}
-				{{template "explore/page" .}}
+				{{template "base/paginate" .}}
 			</div>
 
 			<div class="ui five wide column">
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index b9b1b7c2f4..477ab6b524 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -75,6 +75,7 @@
 				</li>
 			{{end}}
 		</ul>
+		{{template "base/paginage" .}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 4bcc92d95d..a7edd88c6d 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -86,7 +86,7 @@
 				</div>
 				{{if ne .TabName "activity"}}
 					{{template "explore/repo_list" .}}
-					{{template "explore/page" .}}
+					{{template "base/paginate" .}}
 				{{else}}
 					<br>
 					<div class="feeds">