mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 12:15:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

#1545 Cross reference the commit from the issue when it is closed by the commit

Browse source
This commit is contained in:
Unknwon 2015-08-30 00:45:56 +08:00
parent 302938e646
commit 9b9e5f0290
9 changed files with 46 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -439,6 +439,7 @@ issues.reopen_comment_issue = Reopen and comment
issues.create_comment = Comment issues.create_comment = Comment
issues.closed_at = `closed <a id="%[1]s" href="#%[1]s">%[2]s</a>` issues.closed_at = `closed <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.reopened_at = `reopened <a id="%[1]s" href="#%[1]s">%[2]s</a>` issues.reopened_at = `reopened <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.commit_ref_at = `referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.poster = Poster issues.poster = Poster
issues.admin = Admin issues.admin = Admin
issues.owner = Owner issues.owner = Owner

4
modules/bindata/bindata.go
View file

File diff suppressed because one or more lines are too long

2
public/css/gogs.min.css vendored
View file

File diff suppressed because one or more lines are too long

14
public/less/_repository.less
View file

@ -235,6 +235,20 @@
font-size: 35px; font-size: 35px;
color: #6cc644; color: #6cc644;
} }
&.octicon-bookmark {
margin-top: 3px;
font-size: 25px;
}
}
.detail {
font-size: 0.9rem;
margin-top: 5px;
margin-left: 35px;
.octicon {
&.octicon-git-commit {
margin-top: 2px;
}
}
} }
} }
} }

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

@ -143,6 +143,19 @@
<img src="{{.Poster.AvatarLink}}"> <img src="{{.Poster.AvatarLink}}">
</a> </a>
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span> <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
</div>
{{else if eq .Type 4}}
<div class="event">
<span class="octicon octicon-bookmark"></span>
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
<img src="{{.Poster.AvatarLink}}">
</a>
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}</span>
<div class="detail">
<span class="octicon octicon-git-commit"></span>
<span class="text grey">{{.Content | Safe}}</span>
</div>
</div> </div>
{{end}} {{end}}

9
templates/status/401.tmpl
View file

@ -1,6 +1,5 @@
{{template "ng/base/head" .}} {{template "base/head" .}}
{{template "ng/base/header" .}} <div class="ui container center">
<div class="container"> 401 Unauthorized
401 Unauthorized: {{.ErrorMsg}}
</div> </div>
{{template "ng/base/footer" .}} {{template "base/footer" .}}

7
templates/status/403.tmpl
View file

@ -1,6 +1,5 @@
{{template "ng/base/head" .}} {{template "base/head" .}}
{{template "ng/base/header" .}} <div class="ui container center">
<div class="container">
403 Forbidden 403 Forbidden
</div> </div>
{{template "ng/base/footer" .}} {{template "base/footer" .}}

10
templates/status/404.tmpl
View file

@ -1,11 +1,9 @@
{{template "ng/base/head" .}} {{template "base/head" .}}
{{template "ng/base/header" .}} <div class="ui container center">
<div class="container text-center">
<p style="margin-top: 100px"><img src="{{AppSubUrl}}/img/404.png" alt="404"/></p> <p style="margin-top: 100px"><img src="{{AppSubUrl}}/img/404.png" alt="404"/></p>
<hr/> <div class="ui divider"></div>
<br> <br>
<p>Application Version: {{AppVer}}</p> <p>Application Version: {{AppVer}}</p>
<p>If you think this is an error, please open an issue on <a href="https://github.com/gogits/gogs/issues/new">GitHub</a>.</p> <p>If you think this is an error, please open an issue on <a href="https://github.com/gogits/gogs/issues/new">GitHub</a>.</p>
<!-- <p>We're currently working on 0.5 beta version, many pages may be missing at this time. Sorry for confusion!</p> -->
</div> </div>
{{template "ng/base/footer" .}} {{template "base/footer" .}}

9
templates/status/500.tmpl
View file

@ -1,10 +1,9 @@
{{template "ng/base/head" .}} {{template "base/head" .}}
{{template "ng/base/header" .}} <div class="ui container center">
<div id="body" class="container text-center">
<p style="margin-top: 100px"><img src="{{AppSubUrl}}/img/500.png" alt="500"/></p> <p style="margin-top: 100px"><img src="{{AppSubUrl}}/img/500.png" alt="500"/></p>
<hr/> <div class="ui divider"></div>
<br> <br>
{{if .ErrorMsg}}<p>An error has occurred : {{.ErrorMsg}}</p>{{end}} {{if .ErrorMsg}}<p>An error has occurred : {{.ErrorMsg}}</p>{{end}}
<p>Application Version: {{AppVer}}</p> <p>Application Version: {{AppVer}}</p>
</div> </div>
{{template "ng/base/footer" .}} {{template "base/footer" .}}