diff options
| author | Lauris BH <lauris@nix.lv> | 2018-09-17 17:59:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 17:59:49 +0300 |
| commit | 4befec242aa3563f5a8a38bd390d834e4aa2797b (patch) | |
| tree | f372612f3911ceb304bc6868b051a4c972025013 /templates | |
| parent | 756eafaaf68b3cadb3f33f37554a6aa2d83921ef (diff) | |
| download | gitea-4befec242aa3563f5a8a38bd390d834e4aa2797b.tar.gz gitea-4befec242aa3563f5a8a38bd390d834e4aa2797b.zip | |
Code review UI improvements and bugfixes (#4682)
* Code review UI improvements
* More fixes to dark theme
* Style fix
* Fix to allow add code review comments only on review files tab
* More readability dark style fixes
* Fix commenting on deleted files. Fixes #4752
* Fix line blame getting for multiple corner cases
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/diff/box.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/diff/comment_form.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/diff/section_unified.tmpl | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 382442fe34..8be31ce8c3 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -125,7 +125,7 @@ </td> <td class="lines-code lines-code-old halfwidth"> - {{if and $.root.SignedUserID $line.CanComment}} + {{if and $.root.SignedUserID $line.CanComment $.root.PageIsPullFiles}} <a class="ui green button add-code-comment add-code-comment-left" data-path="{{$file.Name}}" data-side="left" data-idx="{{$line.LeftIdx}}">+</a> {{end}} <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.LeftIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre> diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index afb30a368f..9683c3e401 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -2,7 +2,7 @@ {{if $.hidden}} <button class="comment-form-reply ui green labeled icon tiny button"><i class="reply icon"></i> {{$.root.i18n.Tr "repo.diff.comment.reply"}}</button> {{end}} - <form class="ui form {{if $.hidden}}hide comment-form{{end}}" action="{{$.root.Issue.HTMLURL}}/files/reviews/comments" method="post"> + <form class="ui form {{if $.hidden}}hide comment-form comment-form-reply{{end}}" action="{{$.root.Issue.HTMLURL}}/files/reviews/comments" method="post"> {{$.root.CsrfTokenHtml}} <input type="hidden" name="side" value="{{if $.Side}}{{$.Side}}{{end}}"> <input type="hidden" name="line" value="{{if $.Line}}{{$.Line}}{{end}}"> @@ -34,8 +34,10 @@ class="ui submit green tiny button btn-start-review">{{$.root.i18n.Tr "repo.diff.comment.start_review"}}</button> {{end}} {{end}} + {{if not $.root.CurrentReview}} <button type="submit" class="ui submit tiny basic button btn-add-single">{{$.root.i18n.Tr "repo.diff.comment.add_single_comment"}}</button> + {{end}} {{if or (not $.HasComments) $.hidden}} <button type="button" class="ui submit tiny basic button btn-cancel" onclick="cancelCodeComment(this);">{{$.root.i18n.Tr "cancel"}}</button> {{end}} diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index 491572cded..c65b8bdf3e 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -16,7 +16,7 @@ </td> {{end}} <td class="lines-code {{if (not $line.RightIdx)}}lines-code-old{{end}}"> - {{if and $.root.SignedUserID $line.CanComment}} + {{if and $.root.SignedUserID $line.CanComment $.root.PageIsPullFiles}} <a class="ui green button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}" data-path="{{$file.Name}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">+</a> {{end}} <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre> |