diff options
Diffstat (limited to 'templates/repo/issue/view_content.tmpl')
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 44 |
1 files changed, 7 insertions, 37 deletions
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index a6d4ba4712..4ed7240d36 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -4,41 +4,11 @@ {{template "base/alert" .}} </div> {{end}} - <div class="sixteen wide column title"> - <div class="ui grid"> - <h1 class="twelve wide column"> - <span class="index">#{{.Issue.Index}}</span> <span id="issue-title">{{.Issue.Name}}</span> - <div id="edit-title-input" class="ui input" style="display: none"> - <input value="{{.Issue.Name}}"> - </div> - </h1> - {{if .IsIssueOwner}} - <div class="four wide column"> - <div class="edit-zone text right"> - <div id="edit-title" class="ui basic green not-in-edit button">{{.i18n.Tr "repo.issues.edit"}}</div> - <div id="cancel-edit-title" class="ui basic blue in-edit button" style="display: none">{{.i18n.Tr "repo.issues.cancel"}}</div> - <div id="save-edit-title" class="ui green in-edit button" style="display: none" data-update-url="{{.Link}}/title">{{.i18n.Tr "repo.issues.save"}}</div> - </div> - </div> - {{end}} - </div> - {{if .Issue.IsClosed}} - <div class="ui red large label"><i class="octicon octicon-issue-closed"></i> {{.i18n.Tr "repo.issues.closed_title"}}</div> - {{else}} - <div class="ui green large label"><i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues.open_title"}}</div> - {{end}} - {{ $createdStr:= TimeSince .Issue.Created $.Lang }} - <span class="time-desc"> - {{if gt .Issue.Poster.Id 0}} - {{$.i18n.Tr "repo.issues.opened_by" $createdStr .Issue.Poster.HomeLink .Issue.Poster.Name | Safe}} - {{else}} - {{$.i18n.Tr "repo.issues.opened_by_fake" $createdStr .Issue.Poster.Name | Safe}} - {{end}} - ยท - {{$.i18n.Tr "repo.issues.num_comments" .Issue.NumComments}} - </span> - <div class="ui divider"></div> - </div> + {{if not .Issue.IsPull}} + {{template "repo/issue/view_title" .}} + {{end}} + + {{ $createdStr:= TimeSince .Issue.Created $.Lang }} <div class="twelve wide column comment-list"> <ui class="ui comments"> <div class="comment"> @@ -63,7 +33,7 @@ {{end}} </div> <div class="raw-content hide">{{.Issue.Content}}</div> - <div class="edit-content-zone hide" data-write="issue-{{.Issue.ID}}-write" data-preview="issue-{{.Issue.ID}}-preview" data-update-url="{{.Link}}/content" data-context="{{.RepoLink}}"></div> + <div class="edit-content-zone hide" data-write="issue-{{.Issue.ID}}-write" data-preview="issue-{{.Issue.ID}}-preview" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/content" data-context="{{.RepoLink}}"></div> </div> {{if .Issue.Attachments}} <div class="ui bottom attached segment"> @@ -167,7 +137,7 @@ <img src="{{.SignedUser.AvatarLink}}"> </a> <div class="content"> - <form class="ui segment form" id="comment-form" action="{{.Link}}/comments" method="post"> + <form class="ui segment form" id="comment-form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/comments" method="post"> {{template "repo/issue/comment_tab" .}} {{.CsrfTokenHtml}} <input id="status" name="status" type="hidden"> |