From 769e0a3ea6455cb908cd7167d651024ce5c7eee3 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 12 Jan 2017 02:27:09 -0200 Subject: Notifications: mark as read/unread and pin (#629) * Use relative URLs * Notifications - Mark as read/unread * Feature of pinning a notification * On view issue, do not mark as read a pinned notification --- templates/base/head.tmpl | 2 +- templates/user/notification/notification.tmpl | 76 +++++++++++++++++++-------- 2 files changed, 55 insertions(+), 23 deletions(-) (limited to 'templates') diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index a0b5220fd2..e230436209 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -82,7 +82,7 @@ {{if .IsSigned}}
- + {{.i18n.Tr "notifications"}} diff --git a/templates/user/notification/notification.tmpl b/templates/user/notification/notification.tmpl index ddfcd4f717..3e5c0b7104 100644 --- a/templates/user/notification/notification.tmpl +++ b/templates/user/notification/notification.tmpl @@ -5,7 +5,7 @@

{{.i18n.Tr "notification.notifications"}}

- +
{{.i18n.Tr "notification.unread"}} {{if eq .Status 1}} @@ -13,7 +13,7 @@ {{end}}
- +
{{.i18n.Tr "notification.read"}} {{if eq .Status 2}} @@ -30,34 +30,66 @@ {{.i18n.Tr "notification.no_read"}} {{end}} {{else}} -
+
{{range $notification := .Notifications}} {{$issue := $notification.GetIssue}} {{$repo := $notification.GetRepo}} {{$repoOwner := $repo.MustOwner}} -
- - {{if and $issue.IsPull}} - {{if $issue.IsClosed}} - - {{else}} - - {{end}} + +
+ {{if ne $notification.Status 3}} +
+ {{$.CsrfTokenHtml}} + + + +
+ {{end}} + {{if or (eq $notification.Status 1) (eq $notification.Status 3)}} +
+ {{$.CsrfTokenHtml}} + + + +
+ {{else if eq $notification.Status 2}} +
+ {{$.CsrfTokenHtml}} + + + +
+ {{end}} +
+ + {{if eq $notification.Status 3}} + + {{else if $issue.IsPull}} + {{if $issue.IsClosed}} + + {{else}} + + {{end}} + {{else}} + {{if $issue.IsClosed}} + {{else}} - {{if $issue.IsClosed}} - - {{else}} - - {{end}} + {{end}} + {{end}} -
-
{{$repoOwner.Name}}/{{$repo.Name}}
-
#{{$issue.Index}} - {{$issue.Title}}
-
- -
+
+
{{$repoOwner.Name}}/{{$repo.Name}}
+
#{{$issue.Index}} - {{$issue.Title}}
+
+ {{end}}
{{end}} -- cgit v1.2.3