diff --git a/cmd/web.go b/cmd/web.go
index 7dfd19d6405..a513f589ac3 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -168,6 +168,8 @@ func runWeb(ctx *cli.Context) error {
bindIgnErr := binding.BindIgnErr
+ m.Use(user.GetNotificationCount)
+
// FIXME: not all routes need go through same middlewares.
// Especially some AJAX requests, we can reduce middleware number to improve performance.
// Routers.
@@ -578,6 +580,8 @@ func runWeb(ctx *cli.Context) error {
})
// ***** END: Repository *****
+ m.Get("/notifications", reqSignIn, user.Notifications)
+
m.Group("/api", func() {
apiv1.RegisterRoutes(m)
}, ignSignIn)
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index da2db622c51..8df3995e38d 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -13,6 +13,7 @@ version = Version
page = Page
template = Template
language = Language
+notifications = Notifications
create_new = Create...
user_profile_and_more = User profile and more
signed_in_as = Signed in as
@@ -1230,3 +1231,10 @@ default_message = Drop files here or click to upload.
invalid_input_type = You can't upload files of this type.
file_too_big = File size ({{filesize}} MB) exceeds maximum size ({{maxFilesize}} MB).
remove_file = Remove file
+
+[notification]
+notifications = Notifications
+unread = Unread
+read = Read
+no_unread = You have no unread notifications.
+no_read = You have no read notifications.
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 5d9ae7a2060..4893a7644d5 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -13,6 +13,7 @@ version=Versão
page=Página
template=Template
language=Idioma
+notifications = Notificações
create_new=Criar...
user_profile_and_more=Perfil do usuário e configurações
signed_in_as=Logado como
@@ -1197,3 +1198,10 @@ default_message=Arraste e solte arquivos aqui, ou clique para selecioná-los.
invalid_input_type=Você não pode enviar arquivos deste tipo.
file_too_big=O tamanho do arquivo ({{filesize}} MB) excede o limite máximo ({{maxFilesize}} MB).
remove_file=Remover
+
+[notification]
+notifications = Notificações
+unread = Não lidas
+read = Lidas
+no_unread = Você não possui notificações não lidas.
+no_read = Você não possui notificações lidas.
diff --git a/public/css/index.css b/public/css/index.css
index d64c71ca2a9..a8d616cc055 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -2694,6 +2694,24 @@ footer .ui.language .menu {
.user.followers .follow .ui.button {
padding: 8px 15px;
}
+.user.notification .octicon {
+ float: left;
+ font-size: 2em;
+}
+.user.notification .content {
+ float: left;
+ margin-left: 7px;
+}
+.user.notification .octicon-issue-opened,
+.user.notification .octicon-git-pull-request {
+ color: green;
+}
+.user.notification .octicon-issue-closed {
+ color: red;
+}
+.user.notification .octicon-git-merge {
+ color: purple;
+}
.dashboard {
padding-top: 15px;
padding-bottom: 80px;
diff --git a/public/less/_user.less b/public/less/_user.less
index 3e37011cfb8..d7acc4639ec 100644
--- a/public/less/_user.less
+++ b/public/less/_user.less
@@ -74,4 +74,25 @@
}
}
}
+
+ &.notification {
+ .octicon {
+ float: left;
+ font-size: 2em;
+ }
+ .content {
+ float: left;
+ margin-left: 7px;
+ }
+
+ .octicon-issue-opened, .octicon-git-pull-request {
+ color: green;
+ }
+ .octicon-issue-closed {
+ color: red;
+ }
+ .octicon-git-merge {
+ color: purple;
+ }
+ }
}
diff --git a/routers/user/notification.go b/routers/user/notification.go
new file mode 100644
index 00000000000..13d2d70f8e7
--- /dev/null
+++ b/routers/user/notification.go
@@ -0,0 +1,54 @@
+package user
+
+import (
+ "fmt"
+
+ "code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/context"
+)
+
+const (
+ tplNotification base.TplName = "user/notification/notification"
+)
+
+// GetNotificationCount is the middleware that sets the notification count in the context
+func GetNotificationCount(c *context.Context) {
+ if !c.IsSigned {
+ return
+ }
+
+ count, err := models.GetNotificationUnreadCount(c.User)
+ if err != nil {
+ c.Handle(500, "GetNotificationCount", err)
+ return
+ }
+
+ c.Data["NotificationUnreadCount"] = count
+}
+
+// Notifications is the notifications page
+func Notifications(c *context.Context) {
+ var status models.NotificationStatus
+ switch c.Query("status") {
+ case "read":
+ status = models.NotificationStatusRead
+ default:
+ status = models.NotificationStatusUnread
+ }
+
+ notifications, err := models.NotificationsForUser(c.User, status)
+ if err != nil {
+ c.Handle(500, "ErrNotificationsForUser", err)
+ return
+ }
+
+ title := "Notifications"
+ if count := len(notifications); count > 0 {
+ title = fmt.Sprintf("(%d) %s", count, title)
+ }
+ c.Data["Title"] = title
+ c.Data["Status"] = status
+ c.Data["Notifications"] = notifications
+ c.HTML(200, tplNotification)
+}
diff --git a/routers/user/setting.go b/routers/user/setting.go
index e078f8c17aa..a465b0cd8c1 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -29,7 +29,6 @@ const (
tplSettingsSocial base.TplName = "user/settings/social"
tplSettingsApplications base.TplName = "user/settings/applications"
tplSettingsDelete base.TplName = "user/settings/delete"
- tplNotification base.TplName = "user/notification"
tplSecurity base.TplName = "user/security"
)
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index fe14742510f..c1f386fe7bb 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -82,6 +82,18 @@
{{if .IsSigned}}
<div class="right menu">
+ <a href="/notifications" class="ui head link jump item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted">
+ <span class="text">
+ <i class="octicon octicon-inbox"><span class="sr-only">{{.i18n.Tr "notifications"}}</span></i>
+
+ {{if .NotificationUnreadCount}}
+ <span class="ui red label">
+ {{.NotificationUnreadCount}}
+ </span>
+ {{end}}
+ </span>
+ </a>
+
<div class="ui dropdown head link jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
<span class="text">
<i class="octicon octicon-plus"><span class="sr-only">{{.i18n.Tr "create_new"}}</span></i>
diff --git a/templates/user/notification/notification.tmpl b/templates/user/notification/notification.tmpl
new file mode 100644
index 00000000000..84e16eec9ea
--- /dev/null
+++ b/templates/user/notification/notification.tmpl
@@ -0,0 +1,68 @@
+{{template "base/head" .}}
+
+<div class="user notification">
+ <div class="ui container">
+ <h1 class="ui header">{{.i18n.Tr "notification.notifications"}}</h1>
+
+ <div class="ui top attached tabular menu">
+ <a href="/notifications?status=unread">
+ <div class="{{if eq .Status 1}}active{{end}} item">
+ {{.i18n.Tr "notification.unread"}}
+ {{if eq .Status 1}}
+ <div class="ui label">{{len .Notifications}}</div>
+ {{end}}
+ </div>
+ </a>
+ <a href="/notifications?status=read">
+ <div class="{{if eq .Status 2}}active{{end}} item">
+ {{.i18n.Tr "notification.read"}}
+ {{if eq .Status 2}}
+ <div class="ui label">{{len .Notifications}}</div>
+ {{end}}
+ </div>
+ </a>
+ </div>
+ <div class="ui bottom attached active tab segment">
+ {{if eq (len .Notifications) 0}}
+ {{if eq .Status 1}}
+ {{.i18n.Tr "notification.no_unread"}}
+ {{else}}
+ {{.i18n.Tr "notification.no_read"}}
+ {{end}}
+ {{else}}
+ <div class="ui relaxed divided list">
+ {{range $notification := .Notifications}}
+ {{$issue := $notification.GetIssue}}
+ {{$repo := $notification.GetRepo}}
+ {{$repoOwner := $repo.MustOwner}}
+
+ <div class="item">
+ <a href="{{$.AppSubUrl}}/{{$repoOwner.Name}}/{{$repo.Name}}/issues/{{$issue.Index}}">
+ {{if and $issue.IsPull}}
+ {{if $issue.IsClosed}}
+ <i class="octicon octicon-git-merge"></i>
+ {{else}}
+ <i class="octicon octicon-git-pull-request"></i>
+ {{end}}
+ {{else}}
+ {{if $issue.IsClosed}}
+ <i class="octicon octicon-issue-closed"></i>
+ {{else}}
+ <i class="octicon octicon-issue-opened"></i>
+ {{end}}
+ {{end}}
+
+ <div class="content">
+ <div class="header">{{$repoOwner.Name}}/{{$repo.Name}}</div>
+ <div class="description">{{$issue.Title}}</div>
+ </div>
+ </a>
+ </div>
+ {{end}}
+ </div>
+ {{end}}
+ </div>
+ </div>
+</div>
+
+{{template "base/footer" .}}