diff options
| author | Justin Nuß <justin.nuss@hmmh.de> | 2014-07-24 10:15:05 +0200 |
|---|---|---|
| committer | Justin Nuß <justin.nuss@hmmh.de> | 2014-07-24 10:15:05 +0200 |
| commit | d43c5895bc5026fb29dd9aa509056e49b4644ba7 (patch) | |
| tree | 52e07c859411253fd87f29a3e6798e3f082b0459 /templates | |
| parent | c850c01007f9853bb22c940f47d3d7f1d00ba1cb (diff) | |
| download | gitea-d43c5895bc5026fb29dd9aa509056e49b4644ba7.tar.gz gitea-d43c5895bc5026fb29dd9aa509056e49b4644ba7.zip | |
Update template and style, only close commit if commit is in same repository
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/view.tmpl | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index d95fba40d8..653734767e 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -49,6 +49,7 @@ </div> </div> {{range .Comments}} + {{/* 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE, 4 = COMMIT, 5 = PULL */}} {{if eq .Type 0}} <div class="issue-child" id="issue-comment-{{.Id}}"> <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> @@ -78,6 +79,17 @@ <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created}}</span> </div> </div> + {{else if eq .Type 4}} + <div class="issue-child issue-reference issue-reference-commit"> + <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> + <div class="issue-content"> + <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-primary">Referenced</span> this issue <span class="time">{{TimeSince .Created}}</span> + <p> + <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> + {{.ContentHtml}} + </p> + </div> + </div> {{end}} {{end}} <hr class="issue-line"/> |