mirror of
https://github.com/go-gitea/gitea.git
synced 2024-11-28 01:58:20 +01:00
b615a59db8
Backport #31091 by @silverwind Fixes: https://github.com/go-gitea/gitea/issues/31071 Not perfect but much better than before. Before: Overflows, sticky not working, filename unreadable: <img width="506" alt="Screenshot 2024-05-27 at 02 02 40" src="https://github.com/go-gitea/gitea/assets/115237/a06b1edf-dece-4402-98c2-68670fca265f"> After: <img width="457" alt="Screenshot 2024-05-27 at 01 59 06" src="https://github.com/go-gitea/gitea/assets/115237/2a282c96-e719-4554-b418-81963ae6269c"> Co-authored-by: silverwind <me@silverwind.io>
73 lines
3.7 KiB
Handlebars
73 lines
3.7 KiB
Handlebars
{{if len .comments}}
|
|
{{$comment := index .comments 0}}
|
|
{{$resolved := $comment.IsResolved}}
|
|
{{$invalid := $comment.Invalidated}}
|
|
{{$resolveDoer := $comment.ResolveDoer}}
|
|
{{$hasReview := and $comment.Review}}
|
|
{{$isReviewPending := and $hasReview (eq $comment.Review.Type 0)}}
|
|
{{$referenceUrl := printf "%s#%s" $.Issue.Link $comment.HashTag}}
|
|
<div class="conversation-holder" data-path="{{$comment.TreePath}}" data-side="{{if lt $comment.Line 0}}left{{else}}right{{end}}" data-idx="{{$comment.UnsignedLine}}">
|
|
{{if $resolved}}
|
|
<div class="ui attached header resolved-placeholder tw-flex tw-items-center tw-justify-between">
|
|
<div class="ui grey text tw-flex tw-items-center tw-flex-wrap tw-gap-1">
|
|
{{svg "octicon-check" 16 "icon tw-mr-1"}}
|
|
<b>{{$resolveDoer.Name}}</b> {{ctx.Locale.Tr "repo.issues.review.resolved_by"}}
|
|
{{if $invalid}}
|
|
<!--
|
|
We only handle the case $resolved=true and $invalid=true in this template because if the comment is not resolved it has the outdated label in the comments area (not the header above).
|
|
The case $resolved=false and $invalid=true is handled in repo/diff/comments.tmpl
|
|
-->
|
|
<a href="{{$referenceUrl}}" class="ui label basic small tw-ml-2" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
|
|
{{ctx.Locale.Tr "repo.issues.review.outdated"}}
|
|
</a>
|
|
{{end}}
|
|
</div>
|
|
<div class="tw-flex tw-items-center tw-gap-2">
|
|
<button id="show-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button show-outdated tw-flex tw-items-center">
|
|
{{svg "octicon-unfold" 16 "tw-mr-2"}}
|
|
{{ctx.Locale.Tr "repo.issues.review.show_resolved"}}
|
|
</button>
|
|
<button id="hide-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button hide-outdated tw-flex tw-items-center tw-hidden">
|
|
{{svg "octicon-fold" 16 "tw-mr-2"}}
|
|
{{ctx.Locale.Tr "repo.issues.review.hide_resolved"}}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
<div id="code-comments-{{$comment.ID}}" class="field comment-code-cloud {{if $resolved}}tw-hidden{{end}}">
|
|
<div class="comment-list">
|
|
<ui class="ui comments">
|
|
{{template "repo/diff/comments" dict "root" $ "comments" .comments}}
|
|
</ui>
|
|
</div>
|
|
<div class="tw-flex tw-justify-end tw-items-center tw-gap-2 tw-mt-2 tw-flex-wrap">
|
|
<div class="ui buttons">
|
|
<button class="ui icon tiny basic button previous-conversation">
|
|
{{svg "octicon-arrow-up" 12 "icon"}} {{ctx.Locale.Tr "repo.issues.previous"}}
|
|
</button>
|
|
<button class="ui icon tiny basic button next-conversation">
|
|
{{svg "octicon-arrow-down" 12 "icon"}} {{ctx.Locale.Tr "repo.issues.next"}}
|
|
</button>
|
|
</div>
|
|
{{if and $.CanMarkConversation $hasReview (not $isReviewPending)}}
|
|
<button class="ui icon tiny basic button resolve-conversation tw-mr-0" data-origin="diff" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{$comment.ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation">
|
|
{{if $resolved}}
|
|
{{ctx.Locale.Tr "repo.issues.review.un_resolve_conversation"}}
|
|
{{else}}
|
|
{{ctx.Locale.Tr "repo.issues.review.resolve_conversation"}}
|
|
{{end}}
|
|
</button>
|
|
{{end}}
|
|
{{if and $.SignedUserID (not $.Repository.IsArchived)}}
|
|
<button class="comment-form-reply ui primary tiny labeled icon button tw-mr-0">
|
|
{{svg "octicon-reply" 16 "reply icon tw-mr-1"}}{{ctx.Locale.Tr "repo.diff.comment.reply"}}
|
|
</button>
|
|
{{end}}
|
|
</div>
|
|
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" $comment.ReviewID "root" $ "comment" $comment}}
|
|
</div>
|
|
</div>
|
|
{{else}}
|
|
{{template "repo/diff/conversation_outdated"}}
|
|
{{end}}
|