Merge pull request #1693 from sapk/fix-admin-repo-new-ui

Fix admin repos new ui

conf/app.ini

@@ -21,6 +21,8 @@ ISSUE_PAGING_NUM = 10
 [ui.admin]
 ; Number of users that are showed in one page
 USER_PAGING_NUM = 50
+; Number of repos that are showed in one page
+REPO_PAGING_NUM = 50
 ; Number of notices that are showed in one page
 NOTICE_PAGING_NUM = 50
 ; Number of organization that are showed in one page

models/repo.go

@@ -775,12 +775,10 @@ func CountRepositories() int64 {
 func CountPublicRepositories() int64 {
 	return countRepositories(false)
 }
-
+// RepositoriesWithUsers returns number of repos in given page.
-// GetRepositoriesWithUsers returns given number of repository objects with offset.
+func RepositoriesWithUsers(page, pageSize int) ([]*Repository, error) {
-// It also auto-gets corresponding users.
+	repos := make([]*Repository, 0, pageSize)
-func GetRepositoriesWithUsers(num, offset int) ([]*Repository, error) {
+	if err := x.Limit(pageSize, (page-1)*pageSize).Asc("id").Find(&repos); err != nil {
-	repos := make([]*Repository, 0, num)
-	if err := x.Limit(num, offset).Asc("id").Find(&repos); err != nil {
 		return nil, err
 	}
 	
@@ -795,6 +793,7 @@ func GetRepositoriesWithUsers(num, offset int) ([]*Repository, error) {
 	}
 
 	return repos, nil
+
 }
 
 // RepoPath returns repository path by given user and repository name.

modules/setting/setting.go

@@ -94,6 +94,7 @@ var (
 	ExplorePagingNum   int
 	IssuePagingNum     int
 	AdminUserPagingNum int
+	AdminRepoPagingNum int
 	AdminNoticePagingNum int
 	AdminOrgPagingNum int
 
@@ -372,6 +373,7 @@ func NewContext() {
 
 	sec = Cfg.Section("ui.admin")
 	AdminUserPagingNum = sec.Key("USER_PAGING_NUM").MustInt(50)
+	AdminRepoPagingNum = sec.Key("REPO_PAGING_NUM").MustInt(50)
 	AdminNoticePagingNum = sec.Key("NOTICE_PAGING_NUM").MustInt(50)
 	AdminOrgPagingNum = sec.Key("ORG_PAGING_NUM").MustInt(50)
 

routers/admin/repos.go

@@ -5,17 +5,20 @@
 package admin
 
 import (
+	"github.com/Unknwon/paginater"
 	"math"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/middleware"
+	"github.com/gogits/gogs/modules/setting"
 )
 
 const (
 	REPOS base.TplName = "admin/repo/list"
 )
 
+//* TODO Remove after general using of github.com/Unknwon/paginater
 func pagination(ctx *middleware.Context, count int64, pageNum int) int {
 	p := ctx.QueryInt("p")
 	if p < 1 {
@@ -33,19 +36,28 @@ func pagination(ctx *middleware.Context, count int64, pageNum int) int {
 	return p
 }
 
+//*/
 func Repositories(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("admin.repositories")
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminRepositories"] = true
 
-	pageNum := 50
+	total := models.CountRepositories()
-	p := pagination(ctx, models.CountRepositories(), pageNum)
+	page := ctx.QueryInt("page")
+	if page <= 1 {
+		page = 1
+	}
+	ctx.Data["Page"] = paginater.New(int(total), setting.AdminRepoPagingNum, page, 5)
+
+	repos, err := models.RepositoriesWithUsers(page, setting.AdminRepoPagingNum)
 
-	var err error
-	ctx.Data["Repos"], err = models.GetRepositoriesWithUsers(pageNum, (p-1)*pageNum)
 	if err != nil {
-		ctx.Handle(500, "GetRepositoriesWithUsers", err)
+		ctx.Handle(500, "RepositoriesWithUsers", err)
 		return
 	}
+
+	ctx.Data["Repos"] = repos
+	ctx.Data["Total"] = total
+
 	ctx.HTML(200, REPOS)
 }

templates/admin/repo/list.tmpl

@@ -1,20 +1,15 @@
-{{template "ng/base/head" .}}
+{{template "base/head" .}}
-{{template "ng/base/header" .}}
+<div class="admin user">
-<div id="admin-wrapper">
+  <div class="ui container">
-    <div id="setting-wrapper" class="main-wrapper">
+    <div class="ui grid">
-        <div id="admin-setting" class="container clear">
+      {{template "admin/navbar" .}}
-            {{template "admin/nav" .}}
+      <div class="twelve wide column content">
-            <div class="grid-4-5 left">
+        {{template "base/alert" .}}
-                <div class="setting-content">
+        <h4 class="ui top attached header">
-                    {{template "ng/base/alert" .}}
+          {{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
-                    <div id="setting-content">
+        </h4>
-                        <div class="panel panel-radius">
+        <div class="ui attached table segment">
-                            <div class="panel-header">
+          <table class="ui very basic striped table">
-                                <strong>{{.i18n.Tr "admin.repos.repo_manage_panel"}}</strong>
-                            </div>
-                            <div class="panel-body admin-panel">
-                                <div class="admin-table">
-					                <table class="table table-striped">
 			<thead>
 			  <tr>
 			    <th>ID</th>
@@ -42,19 +37,34 @@
 			  {{end}}
 			</tbody>
 		  </table>
-					                {{if or .LastPageNum .NextPageNum}}
+	</div>
-					                <ul class="pagination">
+
-					                    {{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/repos?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}}
+	{{with .Page}}
-					                    {{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/repos?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}}
+	  {{if gt .TotalPages 1}}
-					                </ul>
+	    <div class="center page buttons">
+	      <div class="ui borderless pagination menu">
+		<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><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}}"{{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}}"{{end}}>{{.Num}}</a>
                       {{end}}
+                {{end}}
+                <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{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}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
+	      </div>
+	    </div>
+          {{end}}
+	{{end}}
+
       </div>
     </div>
   </div>
 </div>
-                </div>
+{{template "base/footer" .}}
-            </div>
-        </div>
-    </div>
-</div>
-{{template "ng/base/footer" .}}