lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

new admin user list UI

release/v1.15
Unknwon 2015-09-11 20:42:26 -04:00
parent 247017d9ff
commit be89802bd8
7 changed files with 100 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/app.ini
View File

@ -18,6 +18,10 @@ EXPLORE_PAGING_NUM = 20
; Number of issues that are showed in one page ; Number of issues that are showed in one page
ISSUE_PAGING_NUM = 10 ISSUE_PAGING_NUM = 10
[ui.admin]
; Numer of users that are showed in one page
USER_PAGING_NUM = 50
[markdown] [markdown]
; Enable hard line break extension ; Enable hard line break extension
ENABLE_HARD_LINE_BREAK = false ENABLE_HARD_LINE_BREAK = false

4
conf/locale/locale_en-US.ini
View File

@ -716,8 +716,8 @@ authentication = Authentications
config = Configuration config = Configuration
notices = System Notices notices = System Notices
monitor = Monitoring monitor = Monitoring
prev = Prev. first_page = First
next = Next last_page = Last
total = Total: %d total = Total: %d
dashboard.statistic = Statistic dashboard.statistic = Statistic

9
models/user.go
View File

@ -432,11 +432,10 @@ func CountUsers() int64 {
return countUsers(x) return countUsers(x)
} }
// GetUsers returns given number of user objects with offset. // Users returns number of users in given page.
func GetUsers(num, offset int) ([]*User, error) { func Users(page, pageSize int) ([]*User, error) {
users := make([]*User, 0, num) users := make([]*User, 0, pageSize)
err := x.Limit(num, offset).Where("type=0").Asc("id").Find(&users) return users, x.Limit(pageSize, (page-1)*pageSize).Where("type=0").Asc("id").Find(&users)
return users, err
} }
// get user by erify code // get user by erify code

8
modules/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long

8
modules/setting/setting.go
View File

@ -91,8 +91,9 @@ var (
AnsiCharset string AnsiCharset string
// UI settings. // UI settings.
ExplorePagingNum int ExplorePagingNum int
IssuePagingNum int IssuePagingNum int
AdminUserPagingNum int
// Markdown sttings. // Markdown sttings.
Markdown struct { Markdown struct {
@ -367,6 +368,9 @@ func NewConfigContext() {
ExplorePagingNum = sec.Key("EXPLORE_PAGING_NUM").MustInt(20) ExplorePagingNum = sec.Key("EXPLORE_PAGING_NUM").MustInt(20)
IssuePagingNum = sec.Key("ISSUE_PAGING_NUM").MustInt(10) IssuePagingNum = sec.Key("ISSUE_PAGING_NUM").MustInt(10)
sec = Cfg.Section("ui.admin")
AdminUserPagingNum = sec.Key("USER_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"})
AvatarUploadPath = sec.Key("AVATAR_UPLOAD_PATH").MustString("data/avatars") AvatarUploadPath = sec.Key("AVATAR_UPLOAD_PATH").MustString("data/avatars")

15
routers/admin/users.go
View File

@ -9,6 +9,7 @@ import (
"strings" "strings"
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/Unknwon/paginater"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/auth"
@ -46,15 +47,21 @@ func Users(ctx *middleware.Context) {
ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdmin"] = true
ctx.Data["PageIsAdminUsers"] = true ctx.Data["PageIsAdminUsers"] = true
pageNum := 50 total := models.CountUsers()
p := pagination(ctx, models.CountUsers(), pageNum) page := ctx.QueryInt("page")
if page <= 1 {
page = 1
}
ctx.Data["Page"] = paginater.New(int(total), setting.AdminUserPagingNum, page, 5)
users, err := models.GetUsers(pageNum, (p-1)*pageNum) users, err := models.Users(page, setting.AdminUserPagingNum)
if err != nil { if err != nil {
ctx.Handle(500, "GetUsers", err) ctx.Handle(500, "Users", err)
return return
} }
ctx.Data["Users"] = users ctx.Data["Users"] = users
ctx.Data["Total"] = total
ctx.HTML(200, USERS) ctx.HTML(200, USERS)
} }

127
templates/admin/user/list.tmpl
View File

@ -1,61 +1,72 @@
{{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.users.user_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
<div id="setting-content"> <div class="ui right">
<div class="panel panel-radius"> <a class="ui blue tiny button" href="{{AppSubUrl}}/admin/users/new">{{.i18n.Tr "admin.users.new_account"}}</a>
<div class="panel-header"> </div>
<strong>{{.i18n.Tr "admin.users.user_manage_panel"}}</strong> </h4>
</div> <div class="ui attached table segment">
<div class="panel-body admin-panel"> <table class="ui very basic striped table">
<a class="btn-blue btn-medium btn-link btn-radius" href="{{AppSubUrl}}/admin/users/new">{{.i18n.Tr "admin.users.new_account"}}</a> <thead>
<div class="admin-table"> <tr>
<table class="table table-striped"> <th>ID</th>
<thead> <th>{{.i18n.Tr "admin.users.name"}}</th>
<tr> <th>{{.i18n.Tr "email"}}</th>
<th>Id</th> <th>{{.i18n.Tr "admin.users.activated"}}</th>
<th>{{.i18n.Tr "admin.users.name"}}</th> <th>{{.i18n.Tr "admin.users.admin"}}</th>
<th>{{.i18n.Tr "email"}}</th> <th>{{.i18n.Tr "admin.users.repos"}}</th>
<th>{{.i18n.Tr "admin.users.activated"}}</th> <th>{{.i18n.Tr "admin.users.created"}}</th>
<th>{{.i18n.Tr "admin.users.admin"}}</th> <th>{{.i18n.Tr "admin.users.edit"}}</th>
<th>{{.i18n.Tr "admin.users.repos"}}</th> </tr>
<th>{{.i18n.Tr "admin.users.created"}}</th> </thead>
<th>{{.i18n.Tr "admin.users.edit"}}</th> <tbody>
</tr> {{range .Users}}
</thead> <tr>
<tbody> <td>{{.Id}}</td>
{{range .Users}} <td><a href="{{AppSubUrl}}/{{.Name}}">{{.Name}}</a></td>
<tr> <td>{{.Email}}</td>
<td>{{.Id}}</td> <td><i class="fa fa{{if .IsActive}}-check{{end}}-square-o"></i></td>
<td><a href="{{AppSubUrl}}/{{.Name}}">{{.Name}}</a></td> <td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td>
<td>{{.Email}}</td> <td>{{.NumRepos}}</td>
<td><i class="fa fa{{if .IsActive}}-check{{end}}-square-o"></i></td> <td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created }}</span></td>
<td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td> <td><a href="{{AppSubUrl}}/admin/users/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td>
<td>{{.NumRepos}}</td> </tr>
<td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created }}</span></td> {{end}}
<td><a href="{{AppSubUrl}}/admin/users/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td> </tbody>
</tr> </table>
{{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/users?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/users?p={{.NextPageNum}}">&raquo; {{.i18n.Tr "admin.next"}}</a></li>{{end}}
</ul>
{{end}}
</div>
</div>
</div>
</div>
</div>
</div>
</div> </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"}} <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" .}}