mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-01 05:36:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Minor fix for #2444

Browse source
This commit is contained in:
Unknwon 2016-02-01 20:55:12 -05:00
parent d3ba246693
commit 1c74612b3c
9 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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) ![](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 | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|

1
conf/locale/locale_en-US.ini
View file

@ -493,6 +493,7 @@ issues.label_modify = Label Modification
issues.label_deletion = Label Deletion 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_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.label_deletion_success = Label has been deleted successfully!
issues.num_participants = %d Participants
pulls.new = New Pull Request pulls.new = New Pull Request
pulls.compare_changes = Compare Changes pulls.compare_changes = Compare Changes

2
gogs.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.8.26.0201" const APP_VER = "0.8.27.0201"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

4
modules/bindata/bindata.go
View file

File diff suppressed because one or more lines are too long

4
public/css/gogs.css
View file

@ -1450,6 +1450,10 @@ footer .container .links > *:first-child {
.repository.view.issue .ui.segment.metas { .repository.view.issue .ui.segment.metas {
margin-top: -3px; margin-top: -3px;
} }
.repository.view.issue .ui.participants img {
margin-top: 5px;
margin-right: 5px;
}
.repository .comment.form .ui.comments { .repository .comment.form .ui.comments {
margin-top: -12px; margin-top: -12px;
max-width: 100%; max-width: 100%;

7
public/less/_repository.less
View file

@ -460,6 +460,13 @@
.ui.segment.metas { .ui.segment.metas {
margin-top: -3px; margin-top: -3px;
} }
.ui.participants {
img {
margin-top: 5px;
margin-right: 5px;
}
}
} }
.comment.form { .comment.form {
.ui.comments { .ui.comments {

8
routers/repo/issue.go
View file

@ -595,10 +595,11 @@ func ViewIssue(ctx *middleware.Context) {
ok bool ok bool
marked = make(map[int64]models.CommentTag) marked = make(map[int64]models.CommentTag)
comment *models.Comment 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 { for _, comment = range issue.Comments {
if comment.Type == models.COMMENT_TYPE_COMMENT { if comment.Type == models.COMMENT_TYPE_COMMENT {
comment.RenderedContent = string(base.RenderMarkdown([]byte(comment.Content), ctx.Repo.RepoLink, 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["Participants"] = participants
ctx.Data["NumParticipants"] = len(participants)
ctx.Data["Issue"] = issue ctx.Data["Issue"] = issue
ctx.Data["IsIssueOwner"] = ctx.Repo.IsAdmin() || (ctx.IsSigned && issue.IsPoster(ctx.User.Id)) ctx.Data["IsIssueOwner"] = ctx.Repo.IsAdmin() || (ctx.IsSigned && issue.IsPoster(ctx.User.Id))
ctx.Data["SignInLink"] = setting.AppSubUrl + "/user/login" ctx.Data["SignInLink"] = setting.AppSubUrl + "/user/login"

2
templates/.VERSION
View file

@ -1 +1 @@
0.8.26.0201 0.8.27.0201

11
templates/repo/issue/view_content.tmpl
View file

@ -316,18 +316,15 @@
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="ui participants floating jump"> <div class="ui participants">
<span class="text"><strong>{{len .Participants }} Participants</strong></span> <span class="text"><strong>{{.i18n.Tr "repo.issues.num_participants" .NumParticipants}}</strong></span>
<div class="ui floating jump"> <div>
{{range .Participants}} {{range .Participants}}
<a href="{{.HomeLink}}"> <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> </a>
{{end}} {{end}}
</div> </div>
<script>
$('.participants .ui.avatar.image').popup();
</script>
</div> </div>
</div> </div>
</div> </div>