diff options
| author | Unknwon <u@gogs.io> | 2015-08-13 16:07:11 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-13 16:07:11 +0800 |
| commit | 133b19d0c5587b7c6d5d9e8057f81bc45a246972 (patch) | |
| tree | 1cd0e19599d5f9288fb1b2cbf5bf8f48fdf16fd8 /templates | |
| parent | d7d72b9e3cc0e536d213d6501244544de8020661 (diff) | |
| download | gitea-133b19d0c5587b7c6d5d9e8057f81bc45a246972.tar.gz gitea-133b19d0c5587b7c6d5d9e8057f81bc45a246972.zip | |
finish view comments on issue page
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/repo/header.tmpl | 5 | ||||
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 39 |
3 files changed, 37 insertions, 9 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 93417c1159..4d7844225d 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.4.0812 Beta
\ No newline at end of file +0.6.4.0813 Beta
\ No newline at end of file diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index c364fe40fd..5d68f393e3 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -1,10 +1,7 @@ {{with .Repository}} <div class="ui container"><!-- start container --> - <div id="repoheader" class="ui vertically padded grid head"><!-- start grid --> - <div class="column"><!-- start column --> - <div class="ui black small compact menu floated right count labelled"> <a class="item{{if $.IsRepositoryOwner}} poping up{{end}}"{{if not $.IsRepositoryOwner}} href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top center" data-variation="tiny"{{end}}> <i class="icon octicon octicon-repo-forked"></i> @@ -41,9 +38,7 @@ </div> </div><!-- end column --> - </div><!-- end grid --> - </div><!-- end container --> <div class="ui divider"></div> diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index be80cb1555..bbac9cd9ec 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -50,20 +50,53 @@ </div> </div> + {{range .Issue.Comments}} + {{ $createdStr:= TimeSince .Created $.Lang }} + <div class="comment"> + <a class="avatar" href="{{.Poster.HomeLink}}"> + <img src="{{.Poster.AvatarLink}}"> + </a> + <div class="content"> + <div class="ui top attached header"> + <span class="text"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span> + <div class="ui right actions"> + </div> + </div> + <div class="ui attached segment markdown"> + {{if .RenderedContent}} + {{.RenderedContent|Str2html}} + {{else}} + <span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span> + {{end}} + </div> + {{if .Attachments}} + <div class="ui bottom attached segment"> + <div class="ui small images"> + {{range .Attachments}} + <a target="_blank" href="/attachments/{{.UUID}}"><img class="ui image" src="/attachments/{{.UUID}}"></a> + {{end}} + </div> + </div> + {{end}} + </div> + </div> + {{end}} + <div class="comment form"> <a class="avatar" href="{{.SignedUser.HomeLink}}"> <img src="{{.SignedUser.AvatarLink}}"> </a> <div class="content"> - <form class="ui segment form" action="{{.Link}}" method="post"> + <form class="ui segment form" action="{{.Link}}/comments" method="post"> {{template "repo/issue/comment_tab" .}} + {{.CsrfTokenHtml}} <div class="text right"> <div class="ui red basic button" data-close="{{.i18n.Tr "repo.issues.close_issue"}}" data-close-and-comment="{{.i18n.Tr "repo.issues.close_comment_issue"}}"> {{.i18n.Tr "repo.issues.close_issue"}} </div> - <div class="ui green button"> + <button class="ui green button"> {{.i18n.Tr "repo.issues.create_comment"}} - </div> + </button> </div> </form> </div> |