Fix admin repos new ui

diff --git a/conf/app.ini b/conf/app.ini
index 21464edd0f87899f5b50bc913eb8961f5c100cb9..049e6d860b0b822a3642cb54c107da3cc0aa94e6 100644 (file)
--- a/conf/app.ini
+++ b/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
 

diff --git a/models/repo.go b/models/repo.go
index 8b80533813b29ab3c194202d16dc2737839f6a3a..c05c0098f272b168a0f6beec90934a3b0cb3fa72 100644 (file)
--- a/models/repo.go
+++ b/models/repo.go
@@ -775,15 +775,13 @@ func CountRepositories() int64 {
 func CountPublicRepositories() int64 {
        return countRepositories(false)
 }
-
-// GetRepositoriesWithUsers returns given number of repository objects with offset.
-// It also auto-gets corresponding users.
-func GetRepositoriesWithUsers(num, offset int) ([]*Repository, error) {
-       repos := make([]*Repository, 0, num)
-       if err := x.Limit(num, offset).Asc("id").Find(&repos); err != nil {
+// RepositoriesWithUsers returns number of repos in given page.
+func RepositoriesWithUsers(page, pageSize int) ([]*Repository, error) {
+       repos := make([]*Repository, 0, pageSize)
+       if err := x.Limit(pageSize, (page-1)*pageSize).Asc("id").Find(&repos); err != nil {
                return nil, err
        }
-
+       
        for _, repo := range repos {
                repo.Owner = &User{Id: repo.OwnerID}
                has, err := x.Get(repo.Owner)
@@ -795,6 +793,7 @@ func GetRepositoriesWithUsers(num, offset int) ([]*Repository, error) {
        }
 
        return repos, nil
+
 }
 
 // RepoPath returns repository path by given user and repository name.

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 1d6bf4d62b8775834719bd1fd74126b1f3471909..23f54faddaecd4f678d8862fc2754e48a3246d6e 100644 (file)
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -94,6 +94,7 @@ var (
        ExplorePagingNum   int
        IssuePagingNum     int
        AdminUserPagingNum int
+       AdminRepoPagingNum int
        AdminNoticePagingNum int
 
        // Markdown sttings.
@@ -371,6 +372,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)
 
        sec = Cfg.Section("picture")

diff --git a/routers/admin/repos.go b/routers/admin/repos.go
index 3f638871399fe03fdbceb6630213335bb8c1771e..d1d97b279b66befadb6871fb03d0885ac863ff12 100644 (file)
--- a/routers/admin/repos.go
+++ b/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
-       p := pagination(ctx, models.CountRepositories(), pageNum)
+       total := models.CountRepositories()
+       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)
 }

diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 5747ccecd205ab99d5896922f5290fd2d2353ccd..e350ad8f8600b64d8c6dc484d8deb4aaddbffae5 100644 (file)
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,60 +1,70 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="admin-wrapper">
-    <div id="setting-wrapper" class="main-wrapper">
-        <div id="admin-setting" class="container clear">
-            {{template "admin/nav" .}}
-            <div class="grid-4-5 left">
-                <div class="setting-content">
-                    {{template "ng/base/alert" .}}
-                    <div id="setting-content">
-                        <div class="panel panel-radius">
-                            <div class="panel-header">
-                                <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>
-                                                                   <th>{{.i18n.Tr "admin.repos.owner"}}</th>
-                                                                   <th>{{.i18n.Tr "admin.repos.name"}}</th>
-                                                                   <th>{{.i18n.Tr "admin.repos.private"}}</th>
-                                                                   <th>{{.i18n.Tr "admin.repos.watches"}}</th>
-                                                                   <th>{{.i18n.Tr "admin.repos.stars"}}</th>
-                                                                   <th>{{.i18n.Tr "admin.repos.issues"}}</th>
-                                                                   <th>{{.i18n.Tr "admin.users.created"}}</th>
-                                                               </tr>
-                                                           </thead>
-                                                           <tbody>
-                                                               {{range .Repos}}
-                                                               <tr>
-                                                                   <td>{{.ID}}</td>
-                                                                   <td><a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a></td>
-                                                               <td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td>
-                                                                   <td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
-                                                                   <td>{{.NumWatches}}</td>
-                                                                   <td>{{.NumStars}}</td>
-                                                                   <td>{{.NumIssues}}</td>
-                                                                   <td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td>
-                                                               </tr>
-                                                               {{end}}
-                                                           </tbody>
-                                                       </table>
-                                                       {{if or .LastPageNum .NextPageNum}}
-                                                       <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}}
-                                                           {{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/repos?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}}
-                                                       </ul>
-                                                       {{end}}
-                                               </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
+{{template "base/head" .}}
+<div class="admin user">
+  <div class="ui container">
+    <div class="ui grid">
+      {{template "admin/navbar" .}}
+      <div class="twelve wide column content">
+        {{template "base/alert" .}}
+        <h4 class="ui top attached header">
+          {{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
+        </h4>
+        <div class="ui attached table segment">
+          <table class="ui very basic striped table">
+                       <thead>
+                         <tr>
+                           <th>ID</th>
+                               <th>{{.i18n.Tr "admin.repos.owner"}}</th>
+                               <th>{{.i18n.Tr "admin.repos.name"}}</th>
+                               <th>{{.i18n.Tr "admin.repos.private"}}</th>
+                               <th>{{.i18n.Tr "admin.repos.watches"}}</th>
+                               <th>{{.i18n.Tr "admin.repos.stars"}}</th>
+                               <th>{{.i18n.Tr "admin.repos.issues"}}</th>
+                               <th>{{.i18n.Tr "admin.users.created"}}</th>
+                         </tr>
+                       </thead>
+                       <tbody>
+                         {{range .Repos}}
+                               <tr>
+                                 <td>{{.ID}}</td>
+                                 <td><a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a></td>
+                  <td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td>
+                             <td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
+                                 <td>{{.NumWatches}}</td>
+                                 <td>{{.NumStars}}</td>
+                             <td>{{.NumIssues}}</td>
+                                 <td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td>
+                               </tr>
+                         {{end}}
+                       </tbody>
+                 </table>
+       </div>
+
+       {{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}}"><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>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}
\ No newline at end of file