Merge pull request #1691 from sapk/fix-admin-organization-new-ui

Fix admin organization new ui

5 files changed, 92 insertions, 68 deletions

diff --git a/conf/app.ini b/conf/app.ini
index 21464edd0f..f767be5518 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -23,6 +23,8 @@ ISSUE_PAGING_NUM = 10
 USER_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
+ORG_PAGING_NUM = 50
 
 [markdown]
 ; Enable hard line break extension
diff --git a/models/org.go b/models/org.go
index b45dcafb21..5c3b0d12a1 100644
--- a/models/org.go
+++ b/models/org.go
@@ -184,11 +184,10 @@ func CountOrganizations() int64 {
 	return count
 }
 
-// GetOrganizations returns given number of organizations with offset.
-func GetOrganizations(num, offset int) ([]*User, error) {
-	orgs := make([]*User, 0, num)
-	err := x.Limit(num, offset).Where("type=1").Asc("id").Find(&orgs)
-	return orgs, err
+// Organizations returns number of organizations in given page.
+func Organizations(page, pageSize int) ([]*User, error) {
+	orgs := make([]*User, 0, pageSize)
+	return orgs, x.Limit(pageSize, (page-1)*pageSize).Where("type=1").Asc("id").Find(&orgs)
 }
 
 // DeleteOrganization completely and permanently deletes everything of organization.
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 1d6bf4d62b..e004b35b47 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -95,6 +95,7 @@ var (
 	IssuePagingNum     int
 	AdminUserPagingNum int
 	AdminNoticePagingNum int
+	AdminOrgPagingNum int
 
 	// Markdown sttings.
 	Markdown struct {
@@ -372,6 +373,7 @@ func NewContext() {
 	sec = Cfg.Section("ui.admin")
 	AdminUserPagingNum = sec.Key("USER_PAGING_NUM").MustInt(50)
 	AdminNoticePagingNum = sec.Key("NOTICE_PAGING_NUM").MustInt(50)
+	AdminOrgPagingNum = sec.Key("ORG_PAGING_NUM").MustInt(50)
 
 	sec = Cfg.Section("picture")
 	PictureService = sec.Key("SERVICE").In("server", []string{"server"})
diff --git a/routers/admin/orgs.go b/routers/admin/orgs.go
index 54d7af5cb3..ae68b872d0 100644
--- a/routers/admin/orgs.go
+++ b/routers/admin/orgs.go
@@ -5,9 +5,12 @@
 package admin
 
 import (
+	"github.com/Unknwon/paginater"
+
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/middleware"
+	"github.com/gogits/gogs/modules/setting"
 )
 
 const (
@@ -15,18 +18,26 @@ const (
 )
 
 func Organizations(ctx *middleware.Context) {
-	ctx.Data["Title"] = ctx.Tr("admin.orgs")
+	ctx.Data["Title"] = ctx.Tr("admin.organizations")
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminOrganizations"] = true
 
-	pageNum := 50
-	p := pagination(ctx, models.CountOrganizations(), pageNum)
-
-	var err error
-	ctx.Data["Orgs"], err = models.GetOrganizations(pageNum, (p-1)*pageNum)
+	total := models.CountOrganizations()
+	page := ctx.QueryInt("page")
+	if page <= 1 {
+		page = 1
+	}
+	ctx.Data["Page"] = paginater.New(int(total), setting.AdminOrgPagingNum, page, 5)
+ 
+    orgs, err := models.Organizations(page, setting.AdminOrgPagingNum)
+	
 	if err != nil {
-		ctx.Handle(500, "GetOrganizations", err)
+		ctx.Handle(500, "Organizations", err)
 		return
 	}
+	
+ 	ctx.Data["Orgs"] = orgs
+	ctx.Data["Total"] = total
+
 	ctx.HTML(200, ORGS)
 }
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index ce5083a0ae..1ca61dd5c2 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -1,58 +1,68 @@
-{{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.orgs.org_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.orgs.name"}}</th>
-					                            <th>{{.i18n.Tr "email"}}</th>
-					                            <th>{{.i18n.Tr "admin.orgs.teams"}}</th>
-					                            <th>{{.i18n.Tr "admin.orgs.members"}}</th>
-					                            <th>{{.i18n.Tr "admin.users.repos"}}</th>
-					                            <th>{{.i18n.Tr "admin.users.created"}}</th>
-					                        </tr>
-					                    </thead>
-					                    <tbody>
-					                        {{range .Orgs}}
-					                        <tr>
-					                            <td>{{.Id}}</td>
-					                            <td><a href="{{AppSubUrl}}/org/{{.Name}}">{{.Name}}</a></td>
-					                            <td>{{.Email}}</td>
-					                            <td>{{.NumTeams}}</td>
-					                            <td>{{.NumMembers}}</td>
-					                            <td>{{.NumRepos}}</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/orgs?p={{.LastPageNum}}">&laquo; {{.i18n.Tr "admin.prev"}}</a></li>{{end}}
-					                    {{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/orgs?p={{.NextPageNum}}">&raquo; {{.i18n.Tr "admin.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.orgs.org_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.orgs.name"}}</th>
+			    <th>{{.i18n.Tr "email"}}</th>
+			    <th>{{.i18n.Tr "admin.orgs.teams"}}</th>
+			    <th>{{.i18n.Tr "admin.orgs.members"}}</th>
+			    <th>{{.i18n.Tr "admin.users.repos"}}</th>
+				<th>{{.i18n.Tr "admin.users.created"}}</th>
+			  </tr>
+			</thead>
+			<tbody>
+			  {{range .Orgs}}
+			  <tr>
+			    <td>{{.Id}}</td>
+			    <td><a href="{{AppSubUrl}}/org/{{.Name}}">{{.Name}}</a></td>
+			    <td>{{.Email}}</td>
+			    <td>{{.NumTeams}}</td>
+			    <td>{{.NumMembers}}</td>
+			    <td>{{.NumRepos}}</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" .}}
\ No newline at end of file
+{{template "base/footer" .}}
\ No newline at end of file