mirror
/
gitea
mirror of https://github.com/go-gitea/gitea
2
0
Fork 0
Code Issues Releases Wiki Activity

Move new comment form to its own file

Browse Source 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
pull/3748/head
Jonas Franz 7 years ago
parent 75b7d9b86a
commit e252d3bdb5
No known key found for this signature in database
GPG Key ID: 506AEEBE80BEDECD
3 changed files with 45 additions and 74 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 54
      templates/repo/diff/box.tmpl
  2. 32
      templates/repo/diff/comment_form.tmpl
  3. 33
      templates/repo/diff/new_comment.tmpl

54
templates/repo/diff/box.tmpl
Unescape View File

@ -114,48 +114,18 @@
<a class="ui green button add-code-comment add-code-comment-right" data-side="right" data-idx="{{$line.RightIdx}}">+</a> <a class="ui green button add-code-comment add-code-comment-right" data-side="right" data-idx="{{$line.RightIdx}}">+</a>
{{end}} {{end}}
</td> </td>
{{if index $.CodeComments $file.Name (mul $line.LeftIdx -1)}} {{if index $.CodeComments $file.Name (mul $line.LeftIdx -1)}}
<td class="add-comment-left add-comment-right"> <td class="add-comment-left add-comment-right">
<div class="field comment-code-cloud"> <div class="field comment-code-cloud">
<div class="comment-list"> <div class="comment-list">
<ui class="ui comments"> <ui class="ui comments">
{{ template "repo/diff/comments" dict "root" $ "comments" (index $.CodeComments $file.Name (mul $line.LeftIdx -1))}} {{ template "repo/diff/comments" dict "root" $ "comments" (index $.CodeComments $file.Name (mul $line.LeftIdx -1))}}
</ui> </ui>
</div> </div>
<form class="ui form" action="/jonas/ggre/pulls/1/files/reviews/comments" method="post"> {{template "repo/diff/comment_form" .}}
<input name="_csrf" value="cvHYSIf3f6KNll956UBanD4Dy7c6MTUyNTk2MDkwNjg3NTcyMjY5OQ==" type="hidden"> </div>
<input name="side" value="previous" type="hidden"> </td>
<input name="line" value="2" type="hidden"> {{end}}
<input name="path" value="README.md" type="hidden">
<input name="commit_id" value="e324f1688f063d6fd9268fb8f02149c9eb1a867c" type="hidden">
<input name="is_review" value="true" type="hidden">
<input name="diff_start_cid" type="hidden">
<input name="diff_end_cid" type="hidden">
<input name="diff_base_cid" type="hidden">
<div class="ui top attached tabular menu" data-write="write489406" data-preview="preview489406">
<a class="item active" data-tab="write489406">Write</a>
<a class="item" data-tab="preview489406" data-url="/api/v1/markdown" data-context="/jonas/ggre">Preview</a>
</div>
<div class="ui bottom attached tab segment active" data-tab="write489406">
<div class="field">
<textarea name="content" placeholder="Leave a comment"></textarea>
</div>
</div>
<div class="ui bottom attached tab segment markdown" data-tab="preview489406"></div>
<div class="footer">
<span class="markdown-info"><i class="octicon octicon-markdown"></i> Styling with markdown is supported.</span>
<div class="ui right floated">
<div class="ui submit tiny basic button btn-cancel">Cancel</div>
<div class="ui submit tiny basic button btn-add-single">Add single comment</div>
<button type="submit" class="ui submit green tiny button btn-add-comment">Add comment</button>
<div class="ui submit green tiny button btn-start-review">Start review</div>
</div>
</div>
</form>
</div>
</td>
{{end}}
<td class="lines-code lines-code-new halfwidth"> <td class="lines-code lines-code-new halfwidth">
<pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre> <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre>
</td> </td>

32
templates/repo/diff/comment_form.tmpl
Unescape View File

@ -0,0 +1,32 @@
<form class="ui form" action="{{.Link}}/reviews/comments" method="post">
{{.CsrfTokenHtml}}
<input type="hidden" name="side" value="previous">
<input type="hidden" name="line" value="2">
<input type="hidden" name="path" value="README.md">
<input type="hidden" name="commit_id" value="e324f1688f063d6fd9268fb8f02149c9eb1a867c">
<input type="hidden" name="is_review" value="true">
<input type="hidden" name="diff_start_cid">
<input type="hidden" name="diff_end_cid">
<input type="hidden" name="diff_base_cid">
<div class="ui top attached tabular menu" data-write="write" data-preview="preview">
<a class="active item" data-tab="write">{{.i18n.Tr "write"}}</a>
<a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "preview"}}</a>
</div>
<div class="ui bottom attached active tab segment" data-tab="write">
<div class="field">
<textarea name="content" placeholder="{{$.i18n.Tr "repo.diff.comment.placeholder"}}"></textarea>
</div>
</div>
<div class="ui bottom attached tab segment markdown" data-tab="preview">
{{.i18n.Tr "loading"}}
</div>
<div class="footer">
<span class="markdown-info"><i class="octicon octicon-markdown"></i> {{$.i18n.Tr "repo.diff.comment.markdown_info"}}</span>
<div class="ui right floated">
<div class="ui submit tiny basic button btn-cancel">{{$.i18n.Tr "cancel"}}</div>
<div class="ui submit tiny basic button btn-add-single">{{$.i18n.Tr "repo.diff.comment.add_single_comment"}}</div>
<button type="submit" class="ui submit green tiny button btn-add-comment">{{$.i18n.Tr "repo.diff.comment.add_review_comment"}}</button>
<div class="ui submit green tiny button btn-start-review">{{$.i18n.Tr "repo.diff.comment.start_review"}}</div>
</div>
</div>
</form>

33
templates/repo/diff/new_comment.tmpl
Unescape View File

@ -1,34 +1,3 @@
<div class="field comment-code-cloud"> <div class="field comment-code-cloud">
<form class="ui form" action="{{.Link}}/reviews/comments" method="post"> {{ template "repo/diff/comment_form" .}}
{{.CsrfTokenHtml}}
<input type="hidden" name="side" value="previous">
<input type="hidden" name="line" value="2">
<input type="hidden" name="path" value="README.md">
<input type="hidden" name="commit_id" value="e324f1688f063d6fd9268fb8f02149c9eb1a867c">
<input type="hidden" name="is_review" value="true">
<input type="hidden" name="diff_start_cid">
<input type="hidden" name="diff_end_cid">
<input type="hidden" name="diff_base_cid">
<div class="ui top attached tabular menu" data-write="write" data-preview="preview">
<a class="active item" data-tab="write">{{.i18n.Tr "write"}}</a>
<a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "preview"}}</a>
</div>
<div class="ui bottom attached active tab segment" data-tab="write">
<div class="field">
<textarea name="content" placeholder="{{$.i18n.Tr "repo.diff.comment.placeholder"}}"></textarea>
</div>
</div>
<div class="ui bottom attached tab segment markdown" data-tab="preview">
{{.i18n.Tr "loading"}}
</div>
<div class="footer">
<span class="markdown-info"><i class="octicon octicon-markdown"></i> {{$.i18n.Tr "repo.diff.comment.markdown_info"}}</span>
<div class="ui right floated">
<div class="ui submit tiny basic button btn-cancel">{{$.i18n.Tr "cancel"}}</div>
<div class="ui submit tiny basic button btn-add-single">{{$.i18n.Tr "repo.diff.comment.add_single_comment"}}</div>
<button type="submit" class="ui submit green tiny button btn-add-comment">{{$.i18n.Tr "repo.diff.comment.add_review_comment"}}</button>
<div class="ui submit green tiny button btn-start-review">{{$.i18n.Tr "repo.diff.comment.start_review"}}</div>
</div>
</div>
</form>
</div> </div>

Write Preview
Loading…
Cancel
Save