diff options
| author | Unknwon <u@gogs.io> | 2015-09-01 19:26:39 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-01 19:26:39 -0400 |
| commit | ebf1bd4f518971253e0a7a0e923645c1d584e03e (patch) | |
| tree | 4ada3c53f5cef5928405370e4c528789112b7549 /templates/repo/issue | |
| parent | 8c046073a891e3a192794869628763ef072002eb (diff) | |
| download | gitea-ebf1bd4f518971253e0a7a0e923645c1d584e03e.tar.gz gitea-ebf1bd4f518971253e0a7a0e923645c1d584e03e.zip | |
add view pull desc
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/view.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index b7ec0152f5..fe735ae106 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -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"> diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 6b8e1c55a4..27ce4d6c60 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -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>
\ No newline at end of file |