Compare commits

..

No commits in common. "9dfdfe2389596aba81f52686d176920f5fef4b3e" and "782c376c8b46d58ab12898c6389e75f77abe0fb5" have entirely different histories.

3 changed files with 30 additions and 21 deletions

View File

@ -344,9 +344,6 @@ func NotificationWatching(ctx *context.Context) {
page = 1 page = 1
} }
keyword := ctx.FormTrim("q")
ctx.Data["Keyword"] = keyword
var orderBy db.SearchOrderBy var orderBy db.SearchOrderBy
ctx.Data["SortType"] = ctx.FormString("sort") ctx.Data["SortType"] = ctx.FormString("sort")
switch ctx.FormString("sort") { switch ctx.FormString("sort") {
@ -381,7 +378,7 @@ func NotificationWatching(ctx *context.Context) {
Page: page, Page: page,
}, },
Actor: ctx.Doer, Actor: ctx.Doer,
Keyword: keyword, Keyword: ctx.FormTrim("q"),
OrderBy: orderBy, OrderBy: orderBy,
Private: ctx.IsSigned, Private: ctx.IsSigned,
WatchedByID: ctx.Doer.ID, WatchedByID: ctx.Doer.ID,

View File

@ -35,26 +35,26 @@
{{$issue := .Issue}} {{$issue := .Issue}}
{{$repo := .Repository}} {{$repo := .Repository}}
<tr id="notification_{{.ID}}"> <tr id="notification_{{.ID}}">
<td class="collapsing gt-pl-4" data-href="{{.Link}}"> <td class="collapsing" data-href="{{.Link}}">
{{if eq .Status 3}} {{if eq .Status 3}}
{{svg "octicon-pin" 16 "text blue"}} <span class="blue">{{svg "octicon-pin"}}</span>
{{else if not $issue}} {{else if not $issue}}
{{svg "octicon-repo" 16 "text grey"}} <span class="gray">{{svg "octicon-repo"}}</span>
{{else if $issue.IsPull}} {{else if $issue.IsPull}}
{{if $issue.IsClosed}} {{if $issue.IsClosed}}
{{if $issue.GetPullRequest.HasMerged}} {{if $issue.GetPullRequest.HasMerged}}
{{svg "octicon-git-merge" 16 "text purple"}} <span class="purple">{{svg "octicon-git-merge"}}</span>
{{else}} {{else}}
{{svg "octicon-git-pull-request" 16 "text red"}} <span class="red">{{svg "octicon-git-pull-request"}}</span>
{{end}} {{end}}
{{else}} {{else}}
{{svg "octicon-git-pull-request" 16 "text green"}} <span class="green">{{svg "octicon-git-pull-request"}}</span>
{{end}} {{end}}
{{else}} {{else}}
{{if $issue.IsClosed}} {{if $issue.IsClosed}}
{{svg "octicon-issue-closed" 16 "text red"}} <span class="red">{{svg "octicon-issue-closed"}}</span>
{{else}} {{else}}
{{svg "octicon-issue-opened" 16 "text green"}} <span class="green">{{svg "octicon-issue-opened"}}</span>
{{end}} {{end}}
{{end}} {{end}}
</td> </td>

View File

@ -85,6 +85,27 @@
padding: 8px 15px; padding: 8px 15px;
} }
.user.notification .svg {
float: left;
font-size: 2em;
}
.user.notification .svg.green {
color: var(--color-green);
}
.user.notification .svg.red {
color: var(--color-red);
}
.user.notification .svg.purple {
color: var(--color-purple);
}
.user.notification .svg.blue {
color: var(--color-blue);
}
.user.notification .content { .user.notification .content {
float: left; float: left;
margin-left: 7px; margin-left: 7px;
@ -149,13 +170,4 @@
#notification_div .tab.segment { #notification_div .tab.segment {
overflow-x: auto; overflow-x: auto;
padding: 0;
}
#notification_div .menu .active.item {
background: var(--color-box-body);
}
#notification_table {
border: none;
} }