New admin notice UI based on user list example

diff --git a/conf/app.ini b/conf/app.ini
index 097047545974fd65fcf5d8c7a834b446e0f77a0a..21464edd0f87899f5b50bc913eb8961f5c100cb9 100644 (file)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -19,8 +19,10 @@ EXPLORE_PAGING_NUM = 20
 ISSUE_PAGING_NUM = 10
 
 [ui.admin]
-; Numer of users that are showed in one page
+; Number of users that are showed in one page
 USER_PAGING_NUM = 50
+; Number of notices that are showed in one page
+NOTICE_PAGING_NUM = 50
 
 [markdown]
 ; Enable hard line break extension

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

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index c326ed3794ba185fa9a0d5e41ebbbed720b85fa0..1d6bf4d62b8775834719bd1fd74126b1f3471909 100644 (file)
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -94,6 +94,7 @@ var (
        ExplorePagingNum   int
        IssuePagingNum     int
        AdminUserPagingNum int
+       AdminNoticePagingNum int
 
        // Markdown sttings.
        Markdown struct {
@@ -370,6 +371,7 @@ func NewContext() {
 
        sec = Cfg.Section("ui.admin")
        AdminUserPagingNum = sec.Key("USER_PAGING_NUM").MustInt(50)
+       AdminNoticePagingNum = sec.Key("NOTICE_PAGING_NUM").MustInt(50)
 
        sec = Cfg.Section("picture")
        PictureService = sec.Key("SERVICE").In("server", []string{"server"})

diff --git a/routers/admin/notice.go b/routers/admin/notice.go
index b431946366d63a5882f2ac75d3bcc9bcf95ef78d..b3cadc254dc49b3f15061afd12025aa85b4fecf4 100644 (file)
--- a/routers/admin/notice.go
+++ b/routers/admin/notice.go
@@ -6,11 +6,13 @@ package admin
 
 import (
        "github.com/Unknwon/com"
+        "github.com/Unknwon/paginater"
 
        "github.com/gogits/gogs/models"
        "github.com/gogits/gogs/modules/base"
        "github.com/gogits/gogs/modules/log"
        "github.com/gogits/gogs/modules/middleware"
+       "github.com/gogits/gogs/modules/setting"
 )
 
 const (
@@ -22,15 +24,20 @@ func Notices(ctx *middleware.Context) {
        ctx.Data["PageIsAdmin"] = true
        ctx.Data["PageIsAdminNotices"] = true
 
-       pageNum := 50
-       p := pagination(ctx, models.CountNotices(), pageNum)
-
-       notices, err := models.GetNotices(pageNum, (p-1)*pageNum)
+        total := models.CountNotices()
+       page := ctx.QueryInt("page")
+       if page <= 1 {
+               page = 1
+       }
+       ctx.Data["Page"] = paginater.New(int(total), setting.AdminNoticePagingNum, page, 5)
+ 
+        notices, err := models.Notices(page, setting.AdminNoticePagingNum)
        if err != nil {
-               ctx.Handle(500, "GetNotices", err)
+               ctx.Handle(500, "Notices", err)
                return
        }
        ctx.Data["Notices"] = notices
+       ctx.Data["Total"] = total
        ctx.HTML(200, NOTICES)
 }
 

diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index a3ae2a10dd99283ba76cd04ec06f0f03e7e40f4d..d32b4c98140ad7749d04a56210a197c9da3c141d 100644 (file)
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -1,54 +1,64 @@
-{{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.notices.system_notice_list"}}</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.notices.type"}}</th>
-                                                                   <th>{{.i18n.Tr "admin.notices.desc"}}</th>
-                                                                   <th>{{.i18n.Tr "admin.users.created"}}</th>
-                                                                   <th>{{.i18n.Tr "admin.notices.op"}}</th>
-                                                               </tr>
-                                                           </thead>
-                                                           <tbody>
-                                                               {{range .Notices}}
-                                                               <tr>
-                                                                   <td>{{.Id}}</td>
-                                                                   <td>{{$.i18n.Tr .TrStr}}</td>
-                                                                   <td class="grid-1-2"><span>{{.Description}}</span></td>
-                                                                   <td>{{.Created}}</td>
-                                                                   <td><a href="{{AppSubUrl}}/admin/notices/{{.Id}}/delete"><i class="fa fa-trash-o text-red"></i></a></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/notices?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/notices?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.notices.system_notice_list"}}
+        </h4>
+        <div class="ui attached table segment">
+          <table class="ui very basic striped table">
+            <thead>
+              <tr>
+                <th>ID</th>
+                <th>{{.i18n.Tr "admin.notices.type"}}</th>
+                <th>{{.i18n.Tr "admin.notices.desc"}}</th>
+                <th>{{.i18n.Tr "admin.users.created"}}</th>
+                <th>{{.i18n.Tr "admin.notices.op"}}</th>
+              </tr>
+            </thead>
+            <tbody>
+               {{range .Notices}}
+               <tr>
+               <td>{{.Id}}</td>
+               <td>{{$.i18n.Tr .TrStr}}</td>
+               <td><span>{{.Description}}</span></td>
+               <td>{{.Created}}</td>
+               <td><a href="{{AppSubUrl}}/admin/notices/{{.Id}}/delete"><i class="fa fa-trash-o text-red"></i></a></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" .}}