mirror of
https://github.com/go-gitea/gitea
synced 2024-12-24 03:25:03 +01:00
Minor fix for #2444
This commit is contained in:
parent
d3ba246693
commit
1c74612b3c
9 changed files with 26 additions and 15 deletions
|
@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
|
|||
|
||||
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
|
||||
|
||||
##### Current version: 0.8.26
|
||||
##### Current version: 0.8.27
|
||||
|
||||
| Web | UI | Preview |
|
||||
|:-------------:|:-------:|:-------:|
|
||||
|
|
|
@ -493,6 +493,7 @@ issues.label_modify = Label Modification
|
|||
issues.label_deletion = Label Deletion
|
||||
issues.label_deletion_desc = Deleting this label will remove its information in all related issues. Do you want to continue?
|
||||
issues.label_deletion_success = Label has been deleted successfully!
|
||||
issues.num_participants = %d Participants
|
||||
|
||||
pulls.new = New Pull Request
|
||||
pulls.compare_changes = Compare Changes
|
||||
|
|
2
gogs.go
2
gogs.go
|
@ -17,7 +17,7 @@ import (
|
|||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
|
||||
const APP_VER = "0.8.26.0201"
|
||||
const APP_VER = "0.8.27.0201"
|
||||
|
||||
func init() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1450,6 +1450,10 @@ footer .container .links > *:first-child {
|
|||
.repository.view.issue .ui.segment.metas {
|
||||
margin-top: -3px;
|
||||
}
|
||||
.repository.view.issue .ui.participants img {
|
||||
margin-top: 5px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
.repository .comment.form .ui.comments {
|
||||
margin-top: -12px;
|
||||
max-width: 100%;
|
||||
|
|
|
@ -460,6 +460,13 @@
|
|||
.ui.segment.metas {
|
||||
margin-top: -3px;
|
||||
}
|
||||
|
||||
.ui.participants {
|
||||
img {
|
||||
margin-top: 5px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.comment.form {
|
||||
.ui.comments {
|
||||
|
|
|
@ -595,10 +595,11 @@ func ViewIssue(ctx *middleware.Context) {
|
|||
ok bool
|
||||
marked = make(map[int64]models.CommentTag)
|
||||
comment *models.Comment
|
||||
participants []*models.User
|
||||
participants = make([]*models.User, 1, 10)
|
||||
)
|
||||
participants = append(participants, issue.Poster)
|
||||
// Render comments. (and fetch participants)
|
||||
|
||||
// Render comments and and fetch participants.
|
||||
participants[0] = issue.Poster
|
||||
for _, comment = range issue.Comments {
|
||||
if comment.Type == models.COMMENT_TYPE_COMMENT {
|
||||
comment.RenderedContent = string(base.RenderMarkdown([]byte(comment.Content), ctx.Repo.RepoLink,
|
||||
|
@ -636,6 +637,7 @@ func ViewIssue(ctx *middleware.Context) {
|
|||
}
|
||||
|
||||
ctx.Data["Participants"] = participants
|
||||
ctx.Data["NumParticipants"] = len(participants)
|
||||
ctx.Data["Issue"] = issue
|
||||
ctx.Data["IsIssueOwner"] = ctx.Repo.IsAdmin() || (ctx.IsSigned && issue.IsPoster(ctx.User.Id))
|
||||
ctx.Data["SignInLink"] = setting.AppSubUrl + "/user/login"
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.8.26.0201
|
||||
0.8.27.0201
|
|
@ -316,18 +316,15 @@
|
|||
|
||||
<div class="ui divider"></div>
|
||||
|
||||
<div class="ui participants floating jump">
|
||||
<span class="text"><strong>{{len .Participants }} Participants</strong></span>
|
||||
<div class="ui floating jump">
|
||||
<div class="ui participants">
|
||||
<span class="text"><strong>{{.i18n.Tr "repo.issues.num_participants" .NumParticipants}}</strong></span>
|
||||
<div>
|
||||
{{range .Participants}}
|
||||
<a href="{{.HomeLink}}">
|
||||
<img class="ui avatar image" src="{{.AvatarLink}}" data-content={{.FullName}}>
|
||||
<img class="ui avatar image poping up" src="{{.AvatarLink}}" data-content="{{.DisplayName}}" data-position="top center" data-variation="small inverted">
|
||||
</a>
|
||||
{{end}}
|
||||
</div>
|
||||
<script>
|
||||
$('.participants .ui.avatar.image').popup();
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue