2018-08-06 04:43:22 +00:00
|
|
|
{{range .comments}}
|
|
|
|
|
2024-11-04 11:30:00 +00:00
|
|
|
{{$createdStr:= DateUtils.TimeSince .CreatedUnix}}
|
2018-08-06 04:43:22 +00:00
|
|
|
<div class="comment" id="{{.HashTag}}">
|
2022-08-31 15:58:54 +00:00
|
|
|
{{if .OriginalAuthor}}
|
2024-02-02 10:01:11 +00:00
|
|
|
<span class="avatar">{{ctx.AvatarUtils.Avatar nil}}</span>
|
2020-01-23 17:28:15 +00:00
|
|
|
{{else}}
|
2023-08-10 03:19:39 +00:00
|
|
|
{{template "shared/user/avatarlink" dict "user" .Poster}}
|
2020-01-23 17:28:15 +00:00
|
|
|
{{end}}
|
2020-11-07 23:15:09 +00:00
|
|
|
<div class="content comment-container">
|
2024-03-22 19:51:29 +00:00
|
|
|
<div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between">
|
|
|
|
<div class="comment-header-left tw-flex tw-items-center">
|
2022-08-31 15:58:54 +00:00
|
|
|
{{if .OriginalAuthor}}
|
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 16:42:49 +00:00
|
|
|
<span class="text black tw-font-semibold tw-mr-1">
|
2021-09-18 16:22:51 +00:00
|
|
|
{{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}}
|
2022-08-31 15:58:54 +00:00
|
|
|
{{.OriginalAuthor}}
|
2020-10-31 22:15:11 +00:00
|
|
|
</span>
|
2023-05-28 01:34:18 +00:00
|
|
|
<span class="text grey muted-links">
|
2024-02-25 14:02:20 +00:00
|
|
|
{{ctx.Locale.Tr "repo.issues.commented_at" .HashTag $createdStr}}
|
2020-10-31 22:15:11 +00:00
|
|
|
</span>
|
|
|
|
<span class="text migrate">
|
|
|
|
{{if $.root.Repository.OriginalURL}}
|
2024-02-25 14:02:20 +00:00
|
|
|
({{ctx.Locale.Tr "repo.migrated_from" $.root.Repository.OriginalURL $.root.Repository.GetOriginalURLHostname}})
|
2020-10-31 22:15:11 +00:00
|
|
|
{{end}}
|
|
|
|
</span>
|
2020-01-23 17:28:15 +00:00
|
|
|
{{else}}
|
2023-05-28 01:34:18 +00:00
|
|
|
<span class="text grey muted-links">
|
2022-09-03 09:33:34 +00:00
|
|
|
{{template "shared/user/namelink" .Poster}}
|
2024-02-25 14:02:20 +00:00
|
|
|
{{ctx.Locale.Tr "repo.issues.commented_at" .HashTag $createdStr}}
|
2020-10-31 22:15:11 +00:00
|
|
|
</span>
|
2020-01-23 17:28:15 +00:00
|
|
|
{{end}}
|
2020-10-31 22:15:11 +00:00
|
|
|
</div>
|
2024-03-22 19:51:29 +00:00
|
|
|
<div class="comment-header-right actions tw-flex tw-items-center">
|
2023-06-21 16:08:12 +00:00
|
|
|
{{if .Invalidated}}
|
|
|
|
{{$referenceUrl := printf "%s#%s" $.root.Issue.Link .HashTag}}
|
2023-09-24 20:31:58 +00:00
|
|
|
<a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label basic small" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
|
|
|
|
{{ctx.Locale.Tr "repo.issues.review.outdated"}}
|
2023-06-21 16:08:12 +00:00
|
|
|
</a>
|
|
|
|
{{end}}
|
2020-10-31 22:15:11 +00:00
|
|
|
{{if and .Review}}
|
|
|
|
{{if eq .Review.Type 0}}
|
2023-09-24 20:31:58 +00:00
|
|
|
<div class="ui label basic small yellow pending-label" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.pending.tooltip" (ctx.Locale.Tr "repo.diff.review") (ctx.Locale.Tr "repo.diff.review.approve") (ctx.Locale.Tr "repo.diff.review.comment") (ctx.Locale.Tr "repo.diff.review.reject")}}">
|
|
|
|
{{ctx.Locale.Tr "repo.issues.review.pending"}}
|
2020-10-31 22:15:11 +00:00
|
|
|
</div>
|
|
|
|
{{else}}
|
|
|
|
<div class="ui label basic small">
|
2023-09-24 20:31:58 +00:00
|
|
|
{{ctx.Locale.Tr "repo.issues.review.review"}}
|
2020-10-31 22:15:11 +00:00
|
|
|
</div>
|
|
|
|
{{end}}
|
2018-08-06 04:43:22 +00:00
|
|
|
{{end}}
|
2023-04-08 13:15:22 +00:00
|
|
|
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $.root "ActionURL" (printf "%s/comments/%d/reactions" $.root.RepoLink .ID)}}
|
2023-04-07 14:39:08 +00:00
|
|
|
{{template "repo/issue/view_content/context_menu" dict "ctxData" $.root "item" . "delete" true "issue" false "diff" true "IsCommentPoster" (and $.root.IsSigned (eq $.root.SignedUserID .PosterID))}}
|
2018-08-06 04:43:22 +00:00
|
|
|
</div>
|
|
|
|
</div>
|
2020-11-05 19:34:04 +00:00
|
|
|
<div class="ui attached segment comment-body">
|
2024-10-23 23:07:53 +00:00
|
|
|
<div id="issuecomment-{{.ID}}-content" class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.root.IsSigned (eq $.root.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
|
2018-08-06 04:43:22 +00:00
|
|
|
{{if .RenderedContent}}
|
2024-03-01 07:11:51 +00:00
|
|
|
{{.RenderedContent}}
|
2018-08-06 04:43:22 +00:00
|
|
|
{{else}}
|
2023-09-24 20:31:58 +00:00
|
|
|
<span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span>
|
2018-08-06 04:43:22 +00:00
|
|
|
{{end}}
|
|
|
|
</div>
|
2024-03-24 18:23:38 +00:00
|
|
|
<div id="issuecomment-{{.ID}}-raw" class="raw-content tw-hidden">{{.Content}}</div>
|
2024-05-27 15:34:18 +00:00
|
|
|
<div class="edit-content-zone tw-hidden" data-update-url="{{$.root.RepoLink}}/comments/{{.ID}}" data-content-version="{{.ContentVersion}}" data-context="{{$.root.RepoLink}}" data-attachment-url="{{$.root.RepoLink}}/comments/{{.ID}}/attachments"></div>
|
2024-02-25 06:00:55 +00:00
|
|
|
{{if .Attachments}}
|
2024-03-05 04:59:16 +00:00
|
|
|
{{template "repo/issue/view_content/attachments" dict "Attachments" .Attachments "RenderedContent" .RenderedContent}}
|
2024-02-25 06:00:55 +00:00
|
|
|
{{end}}
|
2018-08-06 04:43:22 +00:00
|
|
|
</div>
|
|
|
|
{{$reactions := .Reactions.GroupByType}}
|
|
|
|
{{if $reactions}}
|
2023-04-08 13:15:22 +00:00
|
|
|
{{template "repo/issue/view_content/reactions" dict "ctxData" $.root "ActionURL" (printf "%s/comments/%d/reactions" $.root.RepoLink .ID) "Reactions" $reactions}}
|
2018-08-06 04:43:22 +00:00
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
{{end}}
|