2020-12-03 10:05:27 -05:00
{{ $resolved := ( index .comments 0 ) .IsResolved }}
2023-06-21 12:08:12 -04:00
{{ $invalid := ( index .comments 0 ) .Invalidated }}
2020-12-03 10:05:27 -05:00
{{ $resolveDoer := ( index .comments 0 ) .ResolveDoer }}
{{ $isNotPending := ( not ( eq ( index .comments 0 ) .Review.Type 0 )) }}
2023-06-21 12:08:12 -04:00
{{ $referenceUrl := printf "%s#%s" $.Issue.Link ( index .comments 0 ) .HashTag }}
2021-01-08 16:49:55 -05:00
< 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 }} " >
2020-12-03 10:05:27 -05:00
{{ if $resolved }}
2024-03-22 15:51:29 -04:00
< div class = "ui attached header resolved-placeholder tw-flex tw-items-center tw-justify-between" >
2024-03-24 10:31:35 -04:00
< div class = "ui grey text tw-flex tw-items-center tw-flex-wrap tw-gap-1" >
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 12:42:49 -04:00
{{ svg "octicon-check" 16 "icon tw-mr-1" }}
2023-09-25 04:56:50 -04:00
< b > {{ $resolveDoer .Name }} </ b > {{ ctx .Locale.Tr "repo.issues.review.resolved_by" }}
2023-06-21 12:08:12 -04:00
{{ 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
-->
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 12:42:49 -04:00
< a href = " {{ AppSubUrl }}{{ $referenceUrl }} " class = "ui label basic small tw-ml-2" data-tooltip-content = " {{ ctx .Locale.Tr "repo.issues.review.outdated_description" }} " >
2023-09-25 04:56:50 -04:00
{{ ctx .Locale.Tr "repo.issues.review.outdated" }}
2023-06-21 12:08:12 -04:00
< / a >
{{ end }}
2021-03-31 18:19:53 -04:00
< / div >
2024-03-24 10:31:35 -04:00
< div class = "tw-flex tw-items-center tw-gap-2" >
2024-03-22 15:51:29 -04:00
< button id = "show-outdated- {{ ( index .comments 0 ) .ID }} " data-comment = " {{ ( index .comments 0 ) .ID }} " class = "ui tiny labeled button show-outdated tw-flex tw-items-center" >
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 12:42:49 -04:00
{{ svg "octicon-unfold" 16 "tw-mr-2" }}
2023-09-25 04:56:50 -04:00
{{ ctx .Locale.Tr "repo.issues.review.show_resolved" }}
2021-03-31 18:19:53 -04:00
< / button >
2024-03-24 14:23:38 -04:00
< button id = "hide-outdated- {{ ( index .comments 0 ) .ID }} " data-comment = " {{ ( index .comments 0 ) .ID }} " class = "ui tiny labeled button hide-outdated tw-flex tw-items-center tw-hidden" >
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 12:42:49 -04:00
{{ svg "octicon-fold" 16 "tw-mr-2" }}
2023-09-25 04:56:50 -04:00
{{ ctx .Locale.Tr "repo.issues.review.hide_resolved" }}
2021-03-31 18:19:53 -04:00
< / button >
< / div >
2020-12-03 10:05:27 -05:00
< / div >
{{ end }}
2024-03-24 14:23:38 -04:00
< div id = "code-comments- {{ ( index .comments 0 ) .ID }} " class = "field comment-code-cloud {{ if $resolved }} tw-hidden {{ end }} " >
2020-12-03 10:05:27 -05:00
< div class = "comment-list" >
< ui class = "ui comments" >
{{ template "repo/diff/comments" dict "root" $ "comments" .comments }}
< / ui >
< / div >
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 12:42:49 -04:00
< div class = "tw-flex tw-justify-end tw-items-center tw-flex-wrap tw-mt-2" >
< div class = "ui buttons tw-mr-1" >
2021-06-27 15:57:01 -04:00
< button class = "ui icon tiny basic button previous-conversation" >
2023-09-25 04:56:50 -04:00
{{ svg "octicon-arrow-up" 12 "icon" }} {{ ctx .Locale.Tr "repo.issues.previous" }}
2021-06-27 15:57:01 -04:00
< / button >
< button class = "ui icon tiny basic button next-conversation" >
2023-09-25 04:56:50 -04:00
{{ svg "octicon-arrow-down" 12 "icon" }} {{ ctx .Locale.Tr "repo.issues.next" }}
2021-06-27 15:57:01 -04:00
< / button >
< / div >
2021-05-08 11:28:25 -04:00
{{ 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 }}
2023-09-25 04:56:50 -04:00
{{ ctx .Locale.Tr "repo.issues.review.un_resolve_conversation" }}
2021-05-08 11:28:25 -04:00
{{ else }}
2023-09-25 04:56:50 -04:00
{{ ctx .Locale.Tr "repo.issues.review.resolve_conversation" }}
2021-05-08 11:28:25 -04:00
{{ end }}
< / button >
{{ end }}
{{ if and $.SignedUserID ( not $.Repository.IsArchived ) }}
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 12:42:49 -04:00
< button class = "comment-form-reply ui primary tiny labeled icon button tw-ml-1 tw-mr-0" >
{{ svg "octicon-reply" 16 "reply icon tw-mr-1" }}{{ ctx .Locale.Tr "repo.diff.comment.reply" }}
2021-05-08 11:28:25 -04:00
< / button >
{{ end }}
< / div >
2020-12-03 10:05:27 -05:00
{{ template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" ( index .comments 0 ) .ReviewID "root" $ "comment" ( index .comments 0 ) }}
< / div >
2021-03-31 18:19:53 -04:00
< / div >