wonderful
/
gitea-1156
forked from Gitlink/gitea-1156
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New admin organization UI

This commit is contained in:
Antoine GIRARD 2015-09-25 19:54:52 +02:00
parent 1c35380c2c
commit c98dad1cf3
5 changed files with 92 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/app.ini
View File

@ -23,6 +23,8 @@ ISSUE_PAGING_NUM = 10
USER_PAGING_NUM = 50 USER_PAGING_NUM = 50
; Number of notices that are showed in one page ; Number of notices that are showed in one page
NOTICE_PAGING_NUM = 50 NOTICE_PAGING_NUM = 50
; Number of organization that are showed in one page
ORG_PAGING_NUM = 50
[markdown] [markdown]
; Enable hard line break extension ; Enable hard line break extension

9
models/org.go
View File

@ -184,11 +184,10 @@ func CountOrganizations() int64 {
return count return count
} }
// GetOrganizations returns given number of organizations with offset. // Organizations returns number of organizations in given page.
func GetOrganizations(num, offset int) ([]*User, error) { func Organizations(page, pageSize int) ([]*User, error) {
orgs := make([]*User, 0, num) orgs := make([]*User, 0, pageSize)
err := x.Limit(num, offset).Where("type=1").Asc("id").Find(&orgs) return orgs, x.Limit(pageSize, (page-1)*pageSize).Where("type=1").Asc("id").Find(&orgs)
return orgs, err
} }
// DeleteOrganization completely and permanently deletes everything of organization. // DeleteOrganization completely and permanently deletes everything of organization.

2
modules/setting/setting.go
View File

@ -95,6 +95,7 @@ var (
IssuePagingNum int IssuePagingNum int
AdminUserPagingNum int AdminUserPagingNum int
AdminNoticePagingNum int AdminNoticePagingNum int
AdminOrgPagingNum int
// Markdown sttings. // Markdown sttings.
Markdown struct { Markdown struct {
@ -372,6 +373,7 @@ func NewContext() {
sec = Cfg.Section("ui.admin") sec = Cfg.Section("ui.admin")
AdminUserPagingNum = sec.Key("USER_PAGING_NUM").MustInt(50) AdminUserPagingNum = sec.Key("USER_PAGING_NUM").MustInt(50)
AdminNoticePagingNum = sec.Key("NOTICE_PAGING_NUM").MustInt(50) AdminNoticePagingNum = sec.Key("NOTICE_PAGING_NUM").MustInt(50)
AdminOrgPagingNum = sec.Key("ORG_PAGING_NUM").MustInt(50)
sec = Cfg.Section("picture") sec = Cfg.Section("picture")
PictureService = sec.Key("SERVICE").In("server", []string{"server"}) PictureService = sec.Key("SERVICE").In("server", []string{"server"})

25
routers/admin/orgs.go
View File

@ -5,9 +5,12 @@
package admin package admin
import ( import (
"github.com/Unknwon/paginater"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting"
) )
const ( const (
@ -15,18 +18,26 @@ const (
) )
func Organizations(ctx *middleware.Context) { 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["PageIsAdmin"] = true
ctx.Data["PageIsAdminOrganizations"] = true ctx.Data["PageIsAdminOrganizations"] = true
pageNum := 50 total := models.CountOrganizations()
p := pagination(ctx, models.CountOrganizations(), pageNum) page := ctx.QueryInt("page")
if page <= 1 {
var err error page = 1
ctx.Data["Orgs"], err = models.GetOrganizations(pageNum, (p-1)*pageNum) }
ctx.Data["Page"] = paginater.New(int(total), setting.AdminOrgPagingNum, page, 5)
orgs, err := models.Organizations(page, setting.AdminOrgPagingNum)
if err != nil { if err != nil {
ctx.Handle(500, "GetOrganizations", err) ctx.Handle(500, "Organizations", err)
return return
} }
ctx.Data["Orgs"] = orgs
ctx.Data["Total"] = total
ctx.HTML(200, ORGS) ctx.HTML(200, ORGS)
} }

122
templates/admin/org/list.tmpl
View File

@ -1,58 +1,68 @@
{{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.orgs.org_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.orgs.org_manage_panel"}}</strong> <thead>
</div> <tr>
<div class="panel-body admin-panel"> <th>ID</th>
<div class="admin-table"> <th>{{.i18n.Tr "admin.orgs.name"}}</th>
<table class="table table-striped"> <th>{{.i18n.Tr "email"}}</th>
<thead> <th>{{.i18n.Tr "admin.orgs.teams"}}</th>
<tr> <th>{{.i18n.Tr "admin.orgs.members"}}</th>
<th>Id</th> <th>{{.i18n.Tr "admin.users.repos"}}</th>
<th>{{.i18n.Tr "admin.orgs.name"}}</th> <th>{{.i18n.Tr "admin.users.created"}}</th>
<th>{{.i18n.Tr "email"}}</th> </tr>
<th>{{.i18n.Tr "admin.orgs.teams"}}</th> </thead>
<th>{{.i18n.Tr "admin.orgs.members"}}</th> <tbody>
<th>{{.i18n.Tr "admin.users.repos"}}</th> {{range .Orgs}}
<th>{{.i18n.Tr "admin.users.created"}}</th> <tr>
</tr> <td>{{.Id}}</td>
</thead> <td><a href="{{AppSubUrl}}/org/{{.Name}}">{{.Name}}</a></td>
<tbody> <td>{{.Email}}</td>
{{range .Orgs}} <td>{{.NumTeams}}</td>
<tr> <td>{{.NumMembers}}</td>
<td>{{.Id}}</td> <td>{{.NumRepos}}</td>
<td><a href="{{AppSubUrl}}/org/{{.Name}}">{{.Name}}</a></td> <td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td>
<td>{{.Email}}</td> </tr>
<td>{{.NumTeams}}</td> {{end}}
<td>{{.NumMembers}}</td> </tbody>
<td>{{.NumRepos}}</td> </table>
<td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td> </div>
</tr>
{{end}} {{with .Page}}
</tbody> {{if gt .TotalPages 1}}
</table> <div class="center page buttons">
{{if or .LastPageNum .NextPageNum}} <div class="ui borderless pagination menu">
<ul class="pagination"> <a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
{{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}} <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{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}} <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
</ul> </a>
{{end}} {{range .Pages}}
</div> {{if eq .Num -1}}
</div> <a class="disabled item">...</a>
</div> {{else}}
</div> <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
</div> {{end}}
</div> {{end}}
</div> <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> </div>
{{template "ng/base/footer" .}} {{template "base/footer" .}}