2023-05-29 05:44:03 -05:00
< div class = "issue-content-right ui segment" >
2024-04-24 13:41:35 -05:00
{{ template "repo/issue/view_content/sidebar/branch_selector_field" . }}
2023-05-29 05:44:03 -05:00
{{ if .Issue.IsPull }}
2024-04-24 14:06:22 -05:00
{{ template "repo/issue/view_content/sidebar/pull_review" . }}
{{ template "repo/issue/view_content/sidebar/pull_wip" . }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2023-05-29 05:44:03 -05:00
{{ end }}
{{ template "repo/issue/labels/labels_selector_field" . }}
{{ template "repo/issue/labels/labels_sidebar" dict "root" $ }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2020-04-06 11:33:34 -05:00
2024-04-24 15:54:55 -05:00
{{ template "repo/issue/view_content/sidebar/milestones" . }}
2024-03-07 23:33:52 -05:00
< div class = "divider" > < / div >
2017-03-17 00:57:43 -05:00
2024-04-24 15:54:55 -05:00
{{ template "repo/issue/view_content/sidebar/projects" . }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2020-11-29 01:22:04 -05:00
2024-04-24 15:58:03 -05:00
{{ template "repo/issue/view_content/sidebar/assignees" . }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2017-03-17 00:57:43 -05:00
2023-05-29 05:44:03 -05:00
{{ if .Participants }}
2024-04-24 16:01:03 -05:00
{{ template "repo/issue/view_content/sidebar/participants" . }}
2023-05-29 05:44:03 -05:00
{{ end }}
2017-03-17 00:57:43 -05:00
2023-05-29 05:44:03 -05:00
{{ if and $.IssueWatch ( not .Repository.IsArchived ) }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2017-03-17 00:57:43 -05:00
2024-04-24 16:03:47 -05:00
{{ template "repo/issue/view_content/sidebar/watch" . }}
2023-05-29 05:44:03 -05:00
{{ end }}
2024-04-24 16:03:47 -05:00
2023-05-29 05:44:03 -05:00
{{ if .Repository.IsTimetrackerEnabled $.Context }}
{{ if and .CanUseTimetracker ( not .Repository.IsArchived ) }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2023-05-29 05:44:03 -05:00
< div class = "ui timetrack" >
2023-09-25 03:56:50 -05:00
< span class = "text" >< strong > {{ ctx .Locale.Tr "repo.issues.tracker" }} </ strong ></ span >
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 11:42:49 -05:00
< div class = "tw-mt-2" >
2023-06-14 13:17:58 -05:00
< form method = "post" action = " {{ .Issue.Link }} /times/stopwatch/toggle" id = "toggle_stopwatch_form" >
2017-09-12 01:48:13 -05:00
{{ $.CsrfTokenHtml }}
< / form >
2023-06-14 13:17:58 -05:00
< form method = "post" action = " {{ .Issue.Link }} /times/stopwatch/cancel" id = "cancel_stopwatch_form" >
2023-05-29 05:44:03 -05:00
{{ $.CsrfTokenHtml }}
< / form >
2023-06-14 13:17:58 -05:00
{{ if $.IsStopwatchRunning }}
2023-07-30 17:46:53 -05:00
< button class = "ui fluid button issue-stop-time" >
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 11:42:49 -05:00
{{ svg "octicon-stopwatch" 16 "tw-mr-2" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.stop_tracking" }}
2023-07-30 17:46:53 -05:00
< / button >
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 11:42:49 -05:00
< button class = "ui fluid button issue-cancel-time tw-mt-2" >
{{ svg "octicon-trash" 16 "tw-mr-2" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.cancel_tracking" }}
2023-07-30 17:46:53 -05:00
< / button >
2023-05-29 05:44:03 -05:00
{{ else }}
{{ if .HasUserStopwatch }}
< div class = "ui warning message" >
2024-02-25 09:02:20 -05:00
{{ ctx .Locale.Tr "repo.issues.tracking_already_started" .OtherStopwatchURL }}
2023-05-29 05:44:03 -05:00
< / div >
{{ end }}
2023-09-25 03:56:50 -05:00
< button class = "ui fluid button issue-start-time" data-tooltip-content = ' {{ ctx .Locale.Tr "repo.issues.start_tracking" }} ' >
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 11:42:49 -05:00
{{ svg "octicon-stopwatch" 16 "tw-mr-2" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.start_tracking_short" }}
2023-07-30 17:46:53 -05:00
< / button >
2023-05-29 05:44:03 -05:00
< div class = "ui mini modal issue-start-time-modal" >
2023-09-25 03:56:50 -05:00
< div class = "header" > {{ ctx .Locale.Tr "repo.issues.add_time" }} </ div >
2023-05-29 05:44:03 -05:00
< div class = "content" >
2024-03-24 09:31:35 -05:00
< form method = "post" id = "add_time_manual_form" action = " {{ .Issue.Link }} /times/add" class = "ui input fluid tw-gap-2" >
2023-05-29 05:44:03 -05:00
{{ $.CsrfTokenHtml }}
2023-09-25 03:56:50 -05:00
< input placeholder = ' {{ ctx .Locale.Tr "repo.issues.add_time_hours" }} ' type = "number" name = "hours" >
< input placeholder = ' {{ ctx .Locale.Tr "repo.issues.add_time_minutes" }} ' type = "number" name = "minutes" class = "ui compact" >
2023-05-29 05:44:03 -05:00
< / form >
< / div >
< div class = "actions" >
2023-09-25 03:56:50 -05:00
< button class = "ui primary approve button" > {{ ctx .Locale.Tr "repo.issues.add_time_short" }} </ button >
< button class = "ui cancel button" > {{ ctx .Locale.Tr "repo.issues.add_time_cancel" }} </ button >
2023-05-29 05:44:03 -05:00
< / div >
< / 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 11:42:49 -05:00
< button class = "ui fluid button issue-add-time tw-mt-2" data-tooltip-content = ' {{ ctx .Locale.Tr "repo.issues.add_time" }} ' >
{{ svg "octicon-plus" 16 "tw-mr-2" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.add_time_short" }}
2023-07-30 17:46:53 -05:00
< / button >
2023-05-29 05:44:03 -05:00
{{ end }}
2017-09-12 01:48:13 -05:00
< / div >
< / div >
{{ end }}
2023-12-04 16:48:42 -05:00
{{ if .WorkingUsers }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2023-05-29 05:44:03 -05:00
< div class = "ui comments" >
2024-02-22 12:02:33 -05:00
< span class = "text" >< strong > {{ ctx .Locale.Tr "repo.issues.time_spent_from_all_authors" ( $.Issue.TotalTrackedTime | Sec2Time ) }} </ strong ></ span >
2023-05-29 05:44:03 -05:00
< div >
{{ range $user , $trackedtime := .WorkingUsers }}
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 11:42:49 -05:00
< div class = "comment tw-mt-2" >
2023-05-29 05:44:03 -05:00
< a class = "avatar" >
2023-08-09 22:19:39 -05:00
{{ ctx .AvatarUtils.Avatar $user }}
2023-05-29 05:44:03 -05:00
< / a >
< div class = "content" >
{{ template "shared/user/authorlink" $user }}
< div class = "text" >
2023-06-19 11:40:06 -05:00
{{ $trackedtime | Sec2Time }}
2017-09-12 01:48:13 -05:00
< / div >
< / div >
2023-05-29 05:44:03 -05:00
< / div >
{{ end }}
2017-09-12 01:48:13 -05:00
< / div >
2023-05-29 05:44:03 -05:00
< / div >
{{ end }}
{{ end }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2023-09-25 03:56:50 -05:00
< span class = "text" >< strong > {{ ctx .Locale.Tr "repo.issues.due_date" }} </ strong ></ span >
2023-05-29 05:44:03 -05:00
< div class = "ui form" id = "deadline-loader" >
2024-03-24 13:23:38 -05:00
< div class = "ui negative message tw-hidden" id = "deadline-err-invalid-date" >
2023-05-29 05:44:03 -05:00
{{ svg "octicon-x" 16 "close icon" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.due_date_invalid" }}
2023-05-29 05:44:03 -05:00
< / div >
{{ if ne .Issue.DeadlineUnix 0 }}
< p >
2024-03-22 14:51:29 -05:00
< div class = "tw-flex tw-justify-between tw-items-center" >
2023-09-25 03:56:50 -05:00
< div class = "due-date {{ if .Issue.IsOverdue }} text red {{ end }} " {{ if .Issue.IsOverdue }} data-tooltip-content = " {{ ctx .Locale.Tr "repo.issues.due_date_overdue" }} " {{ end }} >
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 11:42:49 -05:00
{{ svg "octicon-calendar" 16 "tw-mr-2" }}
2023-08-01 09:21:04 -05:00
{{ DateTime "long" .Issue.DeadlineUnix.FormatDate }}
2023-05-29 05:44:03 -05:00
< / div >
2017-09-12 01:48:13 -05:00
< div >
2023-05-29 05:44:03 -05:00
{{ if and .HasIssuesOrPullsWritePermission ( 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 11:42:49 -05:00
< a class = "issue-due-edit muted" data-tooltip-content = " {{ ctx .Locale.Tr "repo.issues.due_date_form_edit" }} " > {{ svg "octicon-pencil" 16 "tw-mr-1" }} </ a >
2023-09-25 03:56:50 -05:00
< a class = "issue-due-remove muted" data-tooltip-content = " {{ ctx .Locale.Tr "repo.issues.due_date_form_remove" }} " > {{ svg "octicon-trash" }} </ a >
2017-09-12 01:48:13 -05:00
{{ end }}
< / div >
< / div >
2023-05-29 05:44:03 -05:00
< / p >
{{ else }}
2023-09-25 03:56:50 -05:00
< p > {{ ctx .Locale.Tr "repo.issues.due_date_not_set" }} </ p >
2017-04-29 00:52:25 -05:00
{{ end }}
2018-05-01 14:05:28 -05:00
2023-05-29 05:44:03 -05:00
{{ if and .HasIssuesOrPullsWritePermission ( not .Repository.IsArchived ) }}
2024-03-24 13:23:38 -05:00
< div {{ if ne .Issue.DeadlineUnix 0 }} class = "tw-hidden" {{ end }} id = "deadlineForm" >
2023-05-29 05:44:03 -05:00
< form class = "ui fluid action input issue-due-form" action = " {{ AppSubUrl }} / {{ PathEscape .Repository.Owner.Name }} / {{ PathEscape .Repository.Name }} /issues/ {{ .Issue.Index }} /deadline" method = "post" id = "update-issue-deadline-form" >
{{ $.CsrfTokenHtml }}
2023-12-28 05:09:57 -05:00
< input required placeholder = " {{ ctx .Locale.Tr "repo.issues.due_date_form" }} " {{ if gt .Issue.DeadlineUnix 0 }} value = " {{ .Issue.DeadlineUnix.FormatDate }} " {{ end }} type = "date" name = "deadlineDate" id = "deadlineDate" >
2023-07-30 17:46:53 -05:00
< button class = "ui icon button" >
2023-05-29 05:44:03 -05:00
{{ if ne .Issue.DeadlineUnix 0 }}
{{ svg "octicon-pencil" }}
{{ else }}
{{ svg "octicon-plus" }}
{{ end }}
< / button >
< / form >
2018-07-16 07:43:00 -05:00
< / div >
2023-05-29 05:44:03 -05:00
{{ end }}
< / div >
{{ if .Repository.IsDependenciesEnabled $.Context }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2023-05-29 05:44:03 -05:00
< div class = "ui depending" >
{{ if ( and ( not .BlockedByDependencies ) ( not .BlockedByDependenciesNotPermitted ) ( not .BlockingDependencies ) ( not .BlockingDependenciesNotPermitted )) }}
2023-09-25 03:56:50 -05:00
< span class = "text" >< strong > {{ ctx .Locale.Tr "repo.issues.dependency.title" }} </ strong ></ span >
2023-05-29 05:44:03 -05:00
< br >
2018-07-16 07:43:00 -05:00
< p >
2023-05-29 05:44:03 -05:00
{{ if .Issue.IsPull }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.dependency.pr_no_dependencies" }}
2023-05-29 05:44:03 -05:00
{{ else }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.dependency.issue_no_dependencies" }}
2023-05-29 05:44:03 -05:00
{{ end }}
2018-07-16 07:43:00 -05:00
< / p >
{{ end }}
2018-05-01 14:05:28 -05:00
2023-05-29 05:44:03 -05:00
{{ if or .BlockingDependencies .BlockingDependenciesNotPermitted }}
2023-09-25 07:42:40 -05:00
< span class = "text" data-tooltip-content = " {{ if .Issue.IsPull }}{{ ctx .Locale.Tr "repo.issues.dependency.pr_close_blocks" }}{{ else }}{{ ctx .Locale.Tr "repo.issues.dependency.issue_close_blocks" }}{{ end }} " >
2023-09-25 03:56:50 -05:00
< strong > {{ ctx .Locale.Tr "repo.issues.dependency.blocks_short" }} </ strong >
2023-05-29 05:44:03 -05:00
< / span >
< div class = "ui relaxed divided list" >
{{ range .BlockingDependencies }}
2024-03-22 14:51:29 -05:00
< div class = "item dependency {{ if .Issue.IsClosed }} is-closed {{ end }} tw-flex tw-items-center tw-justify-between" >
2024-03-22 08:45:10 -05:00
< div class = "item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis" >
2023-07-30 17:46:53 -05:00
< a class = "title muted" href = " {{ .Issue.Link }} " data-tooltip-content = "# {{ .Issue.Index }} {{ .Issue.Title | RenderEmoji $.Context }} " >
2023-05-29 05:44:03 -05:00
#{{ .Issue.Index }} {{ .Issue.Title | RenderEmoji $.Context }}
< / a >
2023-10-09 18:04:31 -05:00
< div class = "text small gt-ellipsis" data-tooltip-content = " {{ .Repository.OwnerName }} / {{ .Repository.Name }} " >
2023-05-29 05:44:03 -05:00
{{ .Repository.OwnerName }} /{{ .Repository.Name }}
< / div >
< / 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 11:42:49 -05:00
< div class = "item-right tw-flex tw-items-center tw-m-1" >
2023-05-29 05:44:03 -05:00
{{ if and $.CanCreateIssueDependencies ( not $.Repository.IsArchived ) }}
2023-09-25 03:56:50 -05:00
< a class = "delete-dependency-button ci muted" data-id = " {{ .Issue.ID }} " data-type = "blocking" data-tooltip-content = " {{ ctx .Locale.Tr "repo.issues.dependency.remove_info" }} " >
2023-05-29 05:44:03 -05:00
{{ svg "octicon-trash" 16 }}
< / a >
{{ end }}
< / div >
< / div >
{{ end }}
{{ if .BlockingDependenciesNotPermitted }}
2024-03-22 14:51:29 -05:00
< div class = "item tw-flex tw-items-center tw-justify-between gt-ellipsis" >
2023-09-25 03:56:50 -05:00
< span > {{ ctx .Locale.TrN ( len .BlockingDependenciesNotPermitted ) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" ( len .BlockingDependenciesNotPermitted ) }} </ span >
2023-05-29 05:44:03 -05:00
< / div >
{{ end }}
2018-07-16 07:43:00 -05:00
< / div >
{{ end }}
2018-07-17 16:23:58 -05:00
2023-05-29 05:44:03 -05:00
{{ if or .BlockedByDependencies .BlockedByDependenciesNotPermitted }}
2023-09-25 07:42:40 -05:00
< span class = "text" data-tooltip-content = " {{ if .Issue.IsPull }}{{ ctx .Locale.Tr "repo.issues.dependency.pr_closing_blockedby" }}{{ else }}{{ ctx .Locale.Tr "repo.issues.dependency.issue_closing_blockedby" }}{{ end }} " >
2023-09-25 03:56:50 -05:00
< strong > {{ ctx .Locale.Tr "repo.issues.dependency.blocked_by_short" }} </ strong >
2023-05-29 05:44:03 -05:00
< / span >
< div class = "ui relaxed divided list" >
{{ range .BlockedByDependencies }}
2024-03-22 14:51:29 -05:00
< div class = "item dependency {{ if .Issue.IsClosed }} is-closed {{ end }} tw-flex tw-items-center tw-justify-between" >
2024-03-22 08:45:10 -05:00
< div class = "item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis" >
2023-07-30 17:46:53 -05:00
< a class = "title muted" href = " {{ .Issue.Link }} " data-tooltip-content = "# {{ .Issue.Index }} {{ .Issue.Title | RenderEmoji $.Context }} " >
2023-05-29 05:44:03 -05:00
#{{ .Issue.Index }} {{ .Issue.Title | RenderEmoji $.Context }}
< / a >
2023-10-09 18:04:31 -05:00
< div class = "text small gt-ellipsis" data-tooltip-content = " {{ .Repository.OwnerName }} / {{ .Repository.Name }} " >
2023-05-29 05:44:03 -05:00
{{ .Repository.OwnerName }} /{{ .Repository.Name }}
2018-07-17 16:23:58 -05:00
< / div >
< / 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 11:42:49 -05:00
< div class = "item-right tw-flex tw-items-center tw-m-1" >
2023-05-29 05:44:03 -05:00
{{ if and $.CanCreateIssueDependencies ( not $.Repository.IsArchived ) }}
2023-09-25 03:56:50 -05:00
< a class = "delete-dependency-button ci muted" data-id = " {{ .Issue.ID }} " data-type = "blockedBy" data-tooltip-content = " {{ ctx .Locale.Tr "repo.issues.dependency.remove_info" }} " >
2023-05-29 05:44:03 -05:00
{{ svg "octicon-trash" 16 }}
< / a >
{{ end }}
2023-03-28 12:23:25 -05:00
< / div >
2023-05-29 05:44:03 -05:00
< / div >
{{ end }}
{{ if $.CanCreateIssueDependencies }}
{{ range .BlockedByDependenciesNotPermitted }}
2024-03-22 14:51:29 -05:00
< div class = "item dependency {{ if .Issue.IsClosed }} is-closed {{ end }} tw-flex tw-items-center tw-justify-between" >
2024-03-22 08:45:10 -05:00
< div class = "item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis" >
2023-10-09 18:04:31 -05:00
< div class = "gt-ellipsis" >
2023-09-25 03:56:50 -05:00
< span data-tooltip-content = " {{ ctx .Locale.Tr "repo.issues.dependency.no_permission.can_remove" }} " > {{ svg "octicon-lock" 16 }} </ span >
2023-05-29 05:44:03 -05:00
< span class = "title" data-tooltip-content = "# {{ .Issue.Index }} {{ .Issue.Title | RenderEmoji $.Context }} " >
#{{ .Issue.Index }} {{ .Issue.Title | RenderEmoji $.Context }}
< / span >
< / div >
2023-10-09 18:04:31 -05:00
< div class = "text small gt-ellipsis" data-tooltip-content = " {{ .Repository.OwnerName }} / {{ .Repository.Name }} " >
2020-11-10 13:28:07 -05:00
{{ .Repository.OwnerName }} /{{ .Repository.Name }}
< / div >
< / 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 11:42:49 -05:00
< div class = "item-right tw-flex tw-items-center tw-m-1" >
Allow cross-repository dependencies on issues (#7901)
* in progress changes for #7405, added ability to add cross-repo dependencies
* removed unused repolink var
* fixed query that was breaking ci tests; fixed check in issue dependency add so that the id of the issue and dependency is checked rather than the indexes
* reverted removal of string in local files becasue these are done via crowdin, not updated manually
* removed 'Select("issue.*")' from getBlockedByDependencies and getBlockingDependencies based on comments in PR review
* changed getBlockedByDependencies and getBlockingDependencies to use a more xorm-like query, also updated the sidebar as a result
* simplified the getBlockingDependencies and getBlockedByDependencies methods; changed the sidebar to show the dependencies in a different format where you can see the name of the repository
* made some changes to the issue view in the dependencies (issue name on top, repo full name on separate line). Change view of issue in the dependency search results (also showing the full repo name on separate line)
* replace call to FindUserAccessibleRepoIDs with SearchRepositoryByName. The former was hardcoded to use isPrivate = false on the repo search, but this code needed it to be true. The SearchRepositoryByName method is used more in the code including on the user's dashboard
* some more tweaks to the layout of the issues when showing dependencies and in the search box when you add new dependencies
* added Name to the RepositoryMeta struct
* updated swagger doc
* fixed total count for link header on SearchIssues
* fixed indentation
* fixed aligment of remove icon on dependencies in issue sidebar
* removed unnecessary nil check (unnecessary because issue.loadRepo is called prior to this block)
* reverting .css change, somehow missed or forgot that less is used
* updated less file and generated css; updated sidebar template with styles to line up delete and issue index
* added ordering to the blocked by/depends on queries
* fixed sorting in issue dependency search and the depends on/blocks views to show issues from the current repo first, then by created date descending; added a "all cross repository dependencies" setting to allow this feature to be turned off, if turned off, the issue dependency search will work the way it did before (restricted to the current repository)
* re-applied my swagger changes after merge
* fixed split string condition in issue search
* changed ALLOW_CROSS_REPOSITORY_DEPENDENCIES description to sound more global than just the issue dependency search; returning 400 in the cross repo issue search api method if not enabled; fixed bug where the issue count did not respect the state parameter
* when adding a dependency to an issue, added a check to make sure the issue and dependency are in the same repo if cross repo dependencies is not enabled
* updated sortIssuesSession call in PullRequests, another commit moved this method from pull.go to pull_list.go so I had to re-apply my change here
* fixed incorrect setting of user id parameter in search repos call
2019-10-31 00:06:10 -05:00
{{ if and $.CanCreateIssueDependencies ( not $.Repository.IsArchived ) }}
2023-09-25 03:56:50 -05:00
< a class = "delete-dependency-button ci muted" data-id = " {{ .Issue.ID }} " data-type = "blocking" data-tooltip-content = " {{ ctx .Locale.Tr "repo.issues.dependency.remove_info" }} " >
2021-03-21 23:04:19 -05:00
{{ svg "octicon-trash" 16 }}
2018-07-17 16:23:58 -05:00
< / a >
{{ end }}
< / div >
< / div >
{{ end }}
2023-05-29 05:44:03 -05:00
{{ else if .BlockedByDependenciesNotPermitted }}
2024-03-22 14:51:29 -05:00
< div class = "item tw-flex tw-items-center tw-justify-between gt-ellipsis" >
2023-09-25 03:56:50 -05:00
< span > {{ ctx .Locale.TrN ( len .BlockedByDependenciesNotPermitted ) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" ( len .BlockedByDependenciesNotPermitted ) }} </ span >
2023-05-29 05:44:03 -05:00
< / div >
{{ end }}
< / div >
{{ end }}
2018-07-17 16:23:58 -05:00
2023-05-29 05:44:03 -05:00
{{ if and .CanCreateIssueDependencies ( not .Repository.IsArchived ) }}
< div >
2023-06-14 13:17:58 -05:00
< form method = "post" action = " {{ .Issue.Link }} /dependency/add" id = "addDependencyForm" >
2023-05-29 05:44:03 -05:00
{{ $.CsrfTokenHtml }}
< div class = "ui fluid action input" >
< div class = "ui search selection dropdown" id = "new-dependency-drop-list" data-issue-id = " {{ .Issue.ID }} " >
< input name = "newDependency" type = "hidden" >
{{ svg "octicon-triangle-down" 14 "dropdown icon" }}
< input type = "text" class = "search" >
2023-09-25 03:56:50 -05:00
< div class = "default text" > {{ ctx .Locale.Tr "repo.issues.dependency.add" }} </ div >
2018-07-17 16:23:58 -05:00
< / div >
2023-07-30 17:46:53 -05:00
< button class = "ui icon button" >
2023-05-29 05:44:03 -05:00
{{ svg "octicon-plus" }}
< / button >
< / div >
< / form >
< / div >
{{ end }}
< / div >
2019-02-18 15:55:04 -05:00
2023-05-29 05:44:03 -05:00
{{ if and .CanCreateIssueDependencies ( not .Repository.IsArchived ) }}
< input type = "hidden" id = "crossRepoSearch" value = " {{ .AllowCrossRepositoryDependencies }} " >
2021-02-28 09:05:55 -05:00
2023-05-29 05:44:03 -05:00
< div class = "ui g-modal-confirm modal remove-dependency" >
< div class = "header" >
{{ svg "octicon-trash" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.dependency.remove_header" }}
2021-02-28 09:05:55 -05:00
< / div >
2023-05-29 05:44:03 -05:00
< div class = "content" >
2023-06-14 13:17:58 -05:00
< form method = "post" action = " {{ .Issue.Link }} /dependency/delete" id = "removeDependencyForm" >
2023-05-29 05:44:03 -05:00
{{ $.CsrfTokenHtml }}
< input type = "hidden" value = "" name = "removeDependencyID" id = "removeDependencyID" >
< input type = "hidden" value = "" name = "dependencyType" id = "dependencyType" >
< / form >
< p > {{ if .Issue.IsPull }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.dependency.pr_remove_text" }}
2023-05-29 05:44:03 -05:00
{{ else }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.dependency.issue_remove_text" }}
2023-05-29 05:44:03 -05:00
{{ end }} </ p >
< / div >
2023-09-25 03:56:50 -05:00
{{ $ModalButtonCancelText := ctx .Locale.Tr "repo.issues.dependency.cancel" }}
{{ $ModalButtonOkText := ctx .Locale.Tr "repo.issues.dependency.remove" }}
2023-05-29 05:44:03 -05:00
{{ template "base/modal_actions_confirm" ( dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText ) }}
< / div >
2021-02-28 09:05:55 -05:00
{{ end }}
2023-05-29 05:44:03 -05:00
{{ end }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2023-05-29 05:44:03 -05:00
< div class = "ui equal width compact grid" >
{{ $issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index }}
2024-03-22 14:51:29 -05:00
< div class = "row tw-items-center" data-tooltip-content = " {{ $issueReferenceLink }} " >
2023-09-25 03:56:50 -05:00
< span class = "text column truncate" > {{ ctx .Locale.Tr "repo.issues.reference_link" $issueReferenceLink }} </ span >
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 11:42:49 -05:00
< button class = "ui two wide button column tw-p-2" data-clipboard-text = " {{ $issueReferenceLink }} " > {{ svg "octicon-copy" 14 }} </ button >
2023-05-29 05:44:03 -05:00
< / div >
< / div >
2021-02-28 09:05:55 -05:00
2023-05-29 05:44:03 -05:00
{{ if and .IsRepoAdmin ( not .Repository.IsArchived ) }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2022-05-05 13:58:37 -05:00
2023-05-29 05:44:03 -05:00
{{ if or .PinEnabled .Issue.IsPinned }}
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 11:42:49 -05:00
< form class = "tw-mt-1 form-fetch-action single-button-form" method = "post" {{ if $.NewPinAllowed }} action = " {{ .Issue.Link }} /pin" {{ else }} data-tooltip-content = " {{ ctx .Locale.Tr "repo.issues.max_pinned" }} " {{ end }} >
2023-05-29 05:44:03 -05:00
{{ $.CsrfTokenHtml }}
2023-06-14 11:40:15 -05:00
< button class = "fluid ui button {{ if not $.NewPinAllowed }} disabled {{ end }} " >
2023-05-29 05:44:03 -05:00
{{ if not .Issue.IsPinned }}
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 11:42:49 -05:00
{{ svg "octicon-pin" 16 "tw-mr-2" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "pin" }}
2023-05-29 05:44:03 -05:00
{{ else }}
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 11:42:49 -05:00
{{ svg "octicon-pin-slash" 16 "tw-mr-2" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "unpin" }}
2023-05-29 05:44:03 -05:00
{{ end }}
< / button >
< / form >
{{ end }}
2023-05-25 08:17:19 -05:00
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 11:42:49 -05:00
< button class = "tw-mt-1 fluid ui show-modal button {{ if .Issue.IsLocked }} negative {{ end }} " data-modal = "#lock" >
2023-05-29 05:44:03 -05:00
{{ if .Issue.IsLocked }}
{{ svg "octicon-key" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.unlock" }}
2023-05-29 05:44:03 -05:00
{{ else }}
{{ svg "octicon-lock" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.lock" }}
2023-05-25 08:17:19 -05:00
{{ end }}
2023-05-29 05:44:03 -05:00
< / button >
< div class = "ui tiny modal" id = "lock" >
< div class = "header" >
2023-05-25 08:17:19 -05:00
{{ if .Issue.IsLocked }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.unlock.title" }}
2023-05-25 08:17:19 -05:00
{{ else }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.lock.title" }}
2023-05-25 08:17:19 -05:00
{{ end }}
2023-05-29 05:44:03 -05:00
< / div >
< div class = "content" >
< div class = "ui warning message" >
2022-08-31 10:58:54 -05:00
{{ if .Issue.IsLocked }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.unlock.notice_1" }} < br >
{{ ctx .Locale.Tr "repo.issues.unlock.notice_2" }} < br >
2021-02-28 09:05:55 -05:00
{{ else }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.lock.notice_1" }} < br >
{{ ctx .Locale.Tr "repo.issues.lock.notice_2" }} < br >
{{ ctx .Locale.Tr "repo.issues.lock.notice_3" }} < br >
2021-02-28 09:05:55 -05:00
{{ end }}
2019-02-18 15:55:04 -05:00
< / div >
2023-06-28 23:16:04 -05:00
< form class = "ui form form-fetch-action" action = " {{ .Issue.Link }}{{ if .Issue.IsLocked }} /unlock {{ else }} /lock {{ end }} "
2023-05-29 05:44:03 -05:00
method="post">
{{ .CsrfTokenHtml }}
2019-02-18 15:55:04 -05:00
2023-05-29 05:44:03 -05:00
{{ if not .Issue.IsLocked }}
< div class = "field" >
2023-09-25 03:56:50 -05:00
< strong > {{ ctx .Locale.Tr "repo.issues.lock.reason" }} </ strong >
2023-05-29 05:44:03 -05:00
< / div >
2019-02-18 15:55:04 -05:00
2023-05-29 05:44:03 -05:00
< div class = "field" >
2023-08-25 21:44:00 -05:00
< div class = "ui fluid dropdown selection" >
2019-02-18 15:55:04 -05:00
2023-05-29 05:44:03 -05:00
< select name = "reason" >
< option value = "" > < / option >
{{ range .LockReasons }}
< option value = " {{ . }} " > {{ . }} </ option >
{{ end }}
< / select >
{{ svg "octicon-triangle-down" 14 "dropdown icon" }}
2019-02-18 15:55:04 -05:00
2023-05-29 05:44:03 -05:00
< div class = "default text" > < / div >
2019-02-18 15:55:04 -05:00
2023-05-29 05:44:03 -05:00
< div class = "menu" >
{{ range .LockReasons }}
< div class = "item" data-value = " {{ . }} " > {{ . }} </ div >
{{ end }}
2021-02-28 09:05:55 -05:00
< / div >
2019-02-18 15:55:04 -05:00
< / div >
2021-03-21 13:58:28 -05:00
< / div >
2023-05-29 05:44:03 -05:00
{{ end }}
< div class = "text right actions" >
2023-09-25 03:56:50 -05:00
< button class = "ui cancel button" > {{ ctx .Locale.Tr "settings.cancel" }} </ button >
2023-05-29 05:44:03 -05:00
< button class = "ui red button" >
{{ if .Issue.IsLocked }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.unlock_confirm" }}
2023-05-29 05:44:03 -05:00
{{ else }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.lock_confirm" }}
2023-05-29 05:44:03 -05:00
{{ end }}
< / button >
< / div >
< / form >
2018-07-17 16:23:58 -05:00
< / div >
2023-05-29 05:44:03 -05:00
< / 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 11:42:49 -05:00
< button class = "tw-mt-1 fluid ui show-modal button" data-modal = "#sidebar-delete-issue" >
2023-05-29 05:44:03 -05:00
{{ svg "octicon-trash" }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.delete" }}
2023-05-29 05:44:03 -05:00
< / button >
2023-09-11 12:06:05 -05:00
< div class = "ui g-modal-confirm modal" id = "sidebar-delete-issue" >
2023-05-29 05:44:03 -05:00
< div class = "header" >
{{ if .Issue.IsPull }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.pulls.delete.title" }}
2023-05-29 05:44:03 -05:00
{{ else }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.delete.title" }}
2023-05-29 05:44:03 -05:00
{{ end }}
< / div >
< div class = "content" >
< p >
2022-06-19 05:05:15 -05:00
{{ if .Issue.IsPull }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.pulls.delete.text" }}
2022-06-19 05:05:15 -05:00
{{ else }}
2023-09-25 03:56:50 -05:00
{{ ctx .Locale.Tr "repo.issues.delete.text" }}
2022-06-19 05:05:15 -05:00
{{ end }}
2023-05-29 05:44:03 -05:00
< / p >
2022-03-08 19:38:11 -05:00
< / div >
2023-05-29 05:44:03 -05:00
< form action = " {{ .Issue.Link }} /delete" method = "post" >
{{ .CsrfTokenHtml }}
{{ template "base/modal_actions_confirm" . }}
< / form >
< / div >
{{ end }}
2022-04-28 10:45:33 -05:00
2023-05-29 05:44:03 -05:00
{{ if and .Issue.IsPull .IsIssuePoster ( not .Issue.IsClosed ) .Issue.PullRequest.HeadRepo }}
{{ if and ( not ( eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName )) .CanWriteToHeadRepo }}
2023-06-29 07:24:22 -05:00
< div class = "divider" > < / div >
2023-05-29 05:44:03 -05:00
< div class = "inline field" >
2024-03-31 11:06:06 -05:00
< div class = "ui checkbox loading-icon-2px" id = "allow-edits-from-maintainers"
2023-05-29 05:44:03 -05:00
data-url="{{ .Issue.Link }} "
2023-09-25 03:56:50 -05:00
data-tooltip-content="{{ ctx .Locale.Tr "repo.pulls.allow_edits_from_maintainers_desc" }} "
data-prompt-error="{{ ctx .Locale.Tr "repo.pulls.allow_edits_from_maintainers_err" }} "
2023-05-29 05:44:03 -05:00
>
2023-09-25 03:56:50 -05:00
< label >< strong > {{ ctx .Locale.Tr "repo.pulls.allow_edits_from_maintainers" }} </ strong ></ label >
2023-05-29 05:44:03 -05:00
< input type = "checkbox" {{ if .Issue.PullRequest.AllowMaintainerEdit }} checked {{ end }} >
2022-04-28 10:45:33 -05:00
< / div >
2023-05-29 05:44:03 -05:00
< / div >
2022-04-28 10:45:33 -05:00
{{ end }}
2023-05-29 05:44:03 -05:00
{{ end }}
2021-02-28 09:05:55 -05:00
< / div >
