github.com/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-24 03:35:55 +01:00
Code Releases Wiki Activity

Merge pull request #1689 from sapk/fix-admin-notice-new-ui

Browse Source 
New admin notice UI based on user list example
This commit is contained in:
无闻 2015-09-25 12:53:18 -04:00
commit 1c35380c2c
5 changed files with 83 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/app.ini
View File

@ -19,8 +19,10 @@ EXPLORE_PAGING_NUM = 20
ISSUE_PAGING_NUM = 10 ISSUE_PAGING_NUM = 10
[ui.admin] [ui.admin]
; Numer of users that are showed in one page ; Number of users that are showed in one page
USER_PAGING_NUM = 50 USER_PAGING_NUM = 50
; Number of notices that are showed in one page
NOTICE_PAGING_NUM = 50
[markdown] [markdown]
; Enable hard line break extension ; Enable hard line break extension

9
models/admin.go
View File

@ -50,11 +50,10 @@ func CountNotices() int64 {
return count return count
} }
// GetNotices returns given number of notices with offset. // Notices returns number of notices in given page.
func GetNotices(num, offset int) ([]*Notice, error) { func Notices(page, pageSize int) ([]*Notice, error) {
notices := make([]*Notice, 0, num) notices := make([]*Notice, 0, pageSize)
err := x.Limit(num, offset).Desc("id").Find(&notices) return notices, x.Limit(pageSize, (page-1)*pageSize).Desc("id").Find(&notices)
return notices, err
} }
// DeleteNotice deletes a system notice by given ID. // DeleteNotice deletes a system notice by given ID.

2
modules/setting/setting.go
View File

@ -94,6 +94,7 @@ var (
ExplorePagingNum int ExplorePagingNum int
IssuePagingNum int IssuePagingNum int
AdminUserPagingNum int AdminUserPagingNum int
AdminNoticePagingNum int
// Markdown sttings. // Markdown sttings.
Markdown struct { Markdown struct {
@ -370,6 +371,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)
sec = Cfg.Section("picture") sec = Cfg.Section("picture")
PictureService = sec.Key("SERVICE").In("server", []string{"server"}) PictureService = sec.Key("SERVICE").In("server", []string{"server"})

17
routers/admin/notice.go
View File

@ -6,11 +6,13 @@ package admin
import ( import (
"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/base" "github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting"
) )
const ( const (
@ -22,15 +24,20 @@ func Notices(ctx *middleware.Context) {
ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdmin"] = true
ctx.Data["PageIsAdminNotices"] = true ctx.Data["PageIsAdminNotices"] = true
pageNum := 50 total := models.CountNotices()
p := pagination(ctx, models.CountNotices(), pageNum) page := ctx.QueryInt("page")
if page <= 1 {
notices, err := models.GetNotices(pageNum, (p-1)*pageNum) page = 1
}
ctx.Data["Page"] = paginater.New(int(total), setting.AdminNoticePagingNum, page, 5)
notices, err := models.Notices(page, setting.AdminNoticePagingNum)
if err != nil { if err != nil {
ctx.Handle(500, "GetNotices", err) ctx.Handle(500, "Notices", err)
return return
} }
ctx.Data["Notices"] = notices ctx.Data["Notices"] = notices
ctx.Data["Total"] = total
ctx.HTML(200, NOTICES) ctx.HTML(200, NOTICES)
} }

114
templates/admin/notice.tmpl
View File

@ -1,54 +1,64 @@
{{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.notices.system_notice_list"}} ({{.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.notices.system_notice_list"}}</strong> <thead>
</div> <tr>
<div class="panel-body admin-panel"> <th>ID</th>
<div class="admin-table"> <th>{{.i18n.Tr "admin.notices.type"}}</th>
<table class="table table-striped"> <th>{{.i18n.Tr "admin.notices.desc"}}</th>
<thead> <th>{{.i18n.Tr "admin.users.created"}}</th>
<tr> <th>{{.i18n.Tr "admin.notices.op"}}</th>
<th>Id</th> </tr>
<th>{{.i18n.Tr "admin.notices.type"}}</th> </thead>
<th>{{.i18n.Tr "admin.notices.desc"}}</th> <tbody>
<th>{{.i18n.Tr "admin.users.created"}}</th> {{range .Notices}}
<th>{{.i18n.Tr "admin.notices.op"}}</th> <tr>
</tr> <td>{{.Id}}</td>
</thead> <td>{{$.i18n.Tr .TrStr}}</td>
<tbody> <td><span>{{.Description}}</span></td>
{{range .Notices}} <td>{{.Created}}</td>
<tr> <td><a href="{{AppSubUrl}}/admin/notices/{{.Id}}/delete"><i class="fa fa-trash-o text-red"></i></a></td>
<td>{{.Id}}</td> </tr>
<td>{{$.i18n.Tr .TrStr}}</td> {{end}}
<td class="grid-1-2"><span>{{.Description}}</span></td> </tbody>
<td>{{.Created}}</td> </table>
<td><a href="{{AppSubUrl}}/admin/notices/{{.Id}}/delete"><i class="fa fa-trash-o text-red"></i></a></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/notices?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/notices?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" .}}