mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-12-08 06:29:47 +00:00
1000a0da3a
* show/hide resolved: got rid of classes `ui labeled button` - ignoring them overriding each other, they were contributing three useful CSS properties in total: ```css padding: 0; background: none; font-weight: 500; ``` and were also contributing an undesired margin:  * also fixed inconsistent font size between two views * additionally got rid of verbose fomantic classes since there was already a rule that could accept their properties * got rid of unused class `add-code-comment-right` * added testing for the hide/show/resolve/unresolved buttons, but not related to CSS, just thought it might be useful <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - User Interface changes without a feature or bug label - [PR](https://codeberg.org/forgejo/forgejo/pulls/10268): <!--number 10268 --><!--line 0 --><!--description Y2hvcmUodWkpOiBjbGVhbnVwIHJldmlld3MgY3NzLCBpbXByb3ZlIGNvbnNpc3RlbmN5-->chore(ui): cleanup reviews css, improve consistency<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10268 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Reviewed-by: Otto <otto@codeberg.org> Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org>
66 lines
3.5 KiB
Go HTML Template
66 lines
3.5 KiB
Go HTML Template
{{$resolved := (index .comments 0).IsResolved}}
|
|
{{$invalid := (index .comments 0).Invalidated}}
|
|
{{$resolveDoer := (index .comments 0).ResolveDoer}}
|
|
{{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}}
|
|
{{$referenceUrl := printf "%s#%s" $.Issue.Link (index .comments 0).HashTag}}
|
|
<div class="conversation-holder" data-path="{{(index .comments 0).TreePath}}" data-side="{{if lt (index .comments 0).Line 0}}left{{else}}right{{end}}" data-idx="{{(index .comments 0).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="{{AppSubUrl}}{{$referenceUrl}}" class="ui label 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-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="show-outdated">
|
|
{{svg "octicon-unfold" 16 "tw-mr-2"}}
|
|
{{ctx.Locale.Tr "repo.issues.review.show_resolved"}}
|
|
</button>
|
|
<button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="hide-outdated 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-{{(index .comments 0).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="button-row tw-flex tw-justify-end tw-items-center tw-flex-wrap tw-mt-2">
|
|
<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 $isNotPending}}
|
|
<button class="ui icon tiny basic button resolve-conversation" data-origin="diff" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index .comments 0).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">
|
|
{{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" (index .comments 0).ReviewID "root" $ "comment" (index .comments 0)}}
|
|
</div>
|
|
</div>
|