add view pull desc

This commit is contained in:
Unknwon 2015-09-01 19:26:39 -04:00
parent 8c046073a8
commit ebf1bd4f51
9 changed files with 43 additions and 28 deletions

View file

@ -1,5 +1,5 @@
{{template "base/head" .}}
<div class="repository view issue">
<div class="repository view issue pull">
{{template "repo/header" .}}
<div class="ui container">
<div class="navbar">

View file

@ -21,6 +21,11 @@
{{else}}
<div class="ui green large label"><i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues.open_title"}}</div>
{{end}}
{{if .Issue.IsPull}}
<a {{if gt .Issue.Poster.Id 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.Name}}</a>
<span class="pull-desc">{{$.i18n.Tr "repo.pulls.title_desc" .NumCommits .HeadTarget .BaseTarget | Str2html}}</span>
{{else}}
{{ $createdStr:= TimeSince .Issue.Created $.Lang }}
<span class="time-desc">
{{if gt .Issue.Poster.Id 0}}
@ -31,5 +36,6 @@
·
{{$.i18n.Tr "repo.issues.num_comments" .Issue.NumComments}}
</span>
{{end}}
<div class="ui divider"></div>
</div>