2023-05-03 17:58:59 -04:00
{{ if .Flash }}
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 = "sixteen wide column tw-mb-2" >
2023-05-03 17:58:59 -04:00
{{ template "base/alert" . }}
< / div >
{{ end }}
< div class = "issue-title-header" >
2024-05-20 19:32:48 -04:00
{{ $canEditIssueTitle := and ( or .HasIssuesOrPullsWritePermission .IsIssuePoster ) ( not .Repository.IsArchived ) }}
< div class = "issue-title" id = "issue-title-display" >
2023-05-03 17:58:59 -04:00
< h1 class = "gt-word-break" >
2024-05-20 19:32:48 -04:00
{{ RenderIssueTitle $.Context .Issue.Title ( $.Repository.ComposeMetas ctx ) | RenderCodeBlock }}
< span class = "index" > #{{ .Issue.Index }} </ span >
2015-09-01 19:07:02 -04:00
< / h1 >
2024-04-11 14:02:27 -04:00
< div class = "top-right-buttons" >
2024-05-20 19:32:48 -04:00
{{ if $canEditIssueTitle }}
< button id = "issue-title-edit-show" class = "ui small basic button" > {{ ctx .Locale.Tr "repo.issues.edit" }} </ button >
2023-05-03 17:58:59 -04:00
{{ end }}
{{ if not .Issue.IsPull }}
2024-05-20 19:32:48 -04:00
< a role = "button" class = "ui small primary button" href = " {{ .RepoLink }} /issues/new {{ if .NewIssueChooseTemplate }} /choose {{ end }} " > {{ ctx .Locale.Tr "repo.issues.new" }} </ a >
2023-05-03 17:58:59 -04:00
{{ end }}
< / div >
2015-09-01 19:07:02 -04:00
< / div >
2024-05-20 19:32:48 -04:00
{{ if $canEditIssueTitle }}
< div class = "ui form issue-title tw-hidden" id = "issue-title-editor" >
< div class = "ui input tw-flex-1" >
< input value = " {{ .Issue.Title }} " data-old-title = " {{ .Issue.Title }} " maxlength = "255" autocomplete = "off" class = "js-quick-submit" >
< / div >
< div class = "top-right-buttons" >
< button class = "ui small basic cancel button" > {{ ctx .Locale.Tr "repo.issues.cancel" }} </ button >
< button class = "ui small primary button"
data-update-url="{{ $.RepoLink }} /issues/{{ .Issue.Index }} /title">
{{ ctx .Locale.Tr "repo.issues.save" }}
< / button >
< / div >
< / div >
{{ end }}
2023-05-03 17:58:59 -04:00
< div class = "issue-title-meta" >
{{ if .HasMerged }}
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 = "ui purple label issue-state-label" > {{ svg "octicon-git-merge" 16 "tw-mr-1" }} {{ if eq .Issue.PullRequest.Status 3 }}{{ ctx .Locale.Tr "repo.pulls.manually_merged" }}{{ else }}{{ ctx .Locale.Tr "repo.pulls.merged" }}{{ end }} </ div >
2023-05-03 17:58:59 -04:00
{{ else if .Issue.IsClosed }}
2023-09-25 04:56:50 -04:00
< div class = "ui red label issue-state-label" > {{ if .Issue.IsPull }}{{ svg "octicon-git-pull-request" }}{{ else }}{{ svg "octicon-issue-closed" }}{{ end }} {{ ctx .Locale.Tr "repo.issues.closed_title" }} </ div >
2023-05-03 17:58:59 -04:00
{{ else if .Issue.IsPull }}
{{ if .IsPullWorkInProgress }}
2023-09-25 04:56:50 -04:00
< div class = "ui grey label issue-state-label" > {{ svg "octicon-git-pull-request-draft" }} {{ ctx .Locale.Tr "repo.issues.draft_title" }} </ div >
2019-07-07 22:14:12 -04:00
{{ else }}
2023-09-25 04:56:50 -04:00
< div class = "ui green label issue-state-label" > {{ svg "octicon-git-pull-request" }} {{ ctx .Locale.Tr "repo.issues.open_title" }} </ div >
2019-07-07 22:14:12 -04:00
{{ end }}
2015-09-02 09:26:56 -04:00
{{ else }}
2023-09-25 04:56:50 -04:00
< div class = "ui green label issue-state-label" > {{ svg "octicon-issue-opened" }} {{ ctx .Locale.Tr "repo.issues.open_title" }} </ div >
2023-05-03 17:58:59 -04:00
{{ 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 12:42:49 -04:00
< div class = "tw-ml-2" >
2023-05-03 17:58:59 -04:00
{{ if .Issue.IsPull }}
2024-02-25 05:45:56 -05:00
{{ $headHref := .HeadTarget }}
2023-05-03 17:58:59 -04:00
{{ if .HeadBranchLink }}
2024-02-25 05:45:56 -05:00
{{ $headHref = HTMLFormat `<a href="%s">%s</a>` .HeadBranchLink $headHref }}
2023-05-03 17:58:59 -04:00
{{ end }}
2024-02-22 19:26:17 -05:00
{{ if not .MadeUsingAGit }}
2024-02-25 05:45:56 -05:00
{{ $headHref = HTMLFormat `%s <button class="btn interact-fg" data-tooltip-content="%s" data-clipboard-text="%s">%s</button>` $headHref ( ctx .Locale.Tr "copy_branch" ) .HeadTarget ( svg "octicon-copy" 14 ) }}
2024-02-22 19:26:17 -05:00
{{ end }}
2024-02-25 15:36:45 -05:00
{{ $baseHref := .BaseTarget }}
2023-05-03 17:58:59 -04:00
{{ if .BaseBranchLink }}
2024-02-25 05:45:56 -05:00
{{ $baseHref = HTMLFormat `<a href="%s">%s</a>` .BaseBranchLink $baseHref }}
2023-05-03 17:58:59 -04:00
{{ end }}
{{ if .Issue.PullRequest.HasMerged }}
2023-09-25 08:42:40 -04:00
{{ $mergedStr := TimeSinceUnix .Issue.PullRequest.MergedUnix ctx .Locale }}
2023-05-03 17:58:59 -04:00
{{ if .Issue.OriginalAuthor }}
{{ .Issue.OriginalAuthor }}
2024-03-09 06:36:42 -05:00
< span class = "pull-desc" > {{ ctx .Locale.TrN .NumCommits "repo.pulls.merged_title_desc_one" "repo.pulls.merged_title_desc_few" .NumCommits $headHref $baseHref $mergedStr }} </ span >
2023-05-03 17:58:59 -04:00
{{ else }}
< a {{ if gt .Issue.PullRequest.Merger.ID 0 }} href = " {{ .Issue.PullRequest.Merger.HomeLink }} " {{ end }} > {{ .Issue.PullRequest.Merger.GetDisplayName }} </ a >
2024-03-09 06:36:42 -05:00
< span class = "pull-desc" > {{ ctx .Locale.TrN .NumCommits "repo.pulls.merged_title_desc_one" "repo.pulls.merged_title_desc_few" .NumCommits $headHref $baseHref $mergedStr }} </ span >
2023-05-03 17:58:59 -04:00
{{ end }}
{{ else }}
{{ if .Issue.OriginalAuthor }}
2024-05-20 19:32:48 -04:00
< span id = "pull-desc-display" class = "pull-desc" > {{ .Issue.OriginalAuthor }} {{ ctx .Locale.TrN .NumCommits "repo.pulls.title_desc_one" "repo.pulls.title_desc_few" .NumCommits $headHref $baseHref }} </ span >
2023-05-03 17:58:59 -04:00
{{ else }}
2024-05-20 19:32:48 -04:00
< span id = "pull-desc-display" class = "pull-desc" >
2023-05-03 17:58:59 -04:00
< a {{ if gt .Issue.Poster.ID 0 }} href = " {{ .Issue.Poster.HomeLink }} " {{ end }} > {{ .Issue.Poster.GetDisplayName }} </ a >
2024-03-09 06:36:42 -05:00
{{ ctx .Locale.TrN .NumCommits "repo.pulls.title_desc_one" "repo.pulls.title_desc_few" .NumCommits $headHref $baseHref }}
2023-05-03 17:58:59 -04:00
< / span >
{{ end }}
2024-02-22 19:26:17 -05:00
{{ if .MadeUsingAGit }}
2024-02-27 07:35:21 -05:00
{{/* TODO: Move documentation link to the instructions at the bottom of the PR, show instructions when clicking label */}}
{{/* Note: #agit-label is necessary for testing whether the label appears when it should in tests/integration/git_test.go */}}
< a target = "_blank" rel = "noopener" href = "https://forgejo.org/docs/latest/user/agit-support/" >
< span id = "agit-label" data-tooltip-content = " {{ ctx .Locale.Tr "repo.pulls.agit_explanation" }} " class = "ui small label" >
{{ ctx .Locale.Tr "repo.pulls.made_using_agit" }}
< / span >
< / a >
2024-02-22 19:26:17 -05:00
{{ end }}
2024-05-20 19:32:48 -04:00
< span id = "pull-desc-editor" class = "tw-hidden flex-text-block" data-target-update-url = " {{ $.RepoLink }} /pull/ {{ .Issue.Index }} /target_branch" >
2023-05-03 17:58:59 -04:00
< div class = "ui floating filter dropdown" >
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 = "ui basic small button tw-mr-0" >
2023-09-25 04:56:50 -04:00
< span class = "text" > {{ ctx .Locale.Tr "repo.pulls.compare_compare" }} : {{ $.HeadTarget }} </ span >
2023-05-03 17:58:59 -04:00
< / div >
2021-04-10 23:46:37 -04:00
< / div >
2023-05-03 17:58:59 -04:00
{{ svg "octicon-arrow-right" }}
2023-09-25 04:56:50 -04:00
< div class = "ui floating filter dropdown" data-no-results = " {{ ctx .Locale.Tr "repo.pulls.no_results" }} " >
2023-05-03 17:58:59 -04:00
< div class = "ui basic small button" >
2023-09-25 04:56:50 -04:00
< span class = "text" id = "pull-target-branch" data-basename = " {{ $.BaseName }} " data-branch = " {{ $.BaseBranch }} " > {{ ctx .Locale.Tr "repo.pulls.compare_base" }} : {{ $.BaseName }} :{{ $.BaseBranch }} </ span >
2023-05-03 17:58:59 -04:00
{{ svg "octicon-triangle-down" 14 "dropdown icon" }}
< / div >
< div class = "menu" >
< div class = "ui icon search input" >
2023-06-14 12:40:15 -04:00
< i class = "icon" > {{ svg "octicon-filter" 16 }} </ i >
2023-09-25 04:56:50 -04:00
< input name = "search" placeholder = " {{ ctx .Locale.Tr "repo.pulls.filter_branch" }} ..." >
2023-05-03 17:58:59 -04:00
< / div >
< div class = "scrolling menu" id = "branch-select" >
{{ range .Branches }}
{{ $sameBase := ne $.BaseName $.HeadUserName }}
{{ $differentBranch := ne . $.HeadBranch }}
{{ if or $sameBase $differentBranch }}
< div class = "item {{ if eq $.BaseBranch . }} selected {{ end }} " data-branch = " {{ . }} " > {{ $.BaseName }}{{ if $.HeadRepo }} /{{ $.HeadRepo }}{{ end }} :{{ . }} </ div >
{{ end }}
{{ end }}
< / div >
< / div >
2021-04-10 23:46:37 -04:00
< / div >
2023-05-03 17:58:59 -04:00
< / span >
{{ end }}
2015-12-07 17:30:52 -05:00
{{ else }}
2023-09-25 08:42:40 -04:00
{{ $createdStr := TimeSinceUnix .Issue.CreatedUnix ctx .Locale }}
2023-05-03 17:58:59 -04:00
< span class = "time-desc" >
{{ if .Issue.OriginalAuthor }}
2024-02-25 09:02:20 -05:00
{{ ctx .Locale.Tr "repo.issues.opened_by_fake" $createdStr .Issue.OriginalAuthor }}
2023-05-03 17:58:59 -04:00
{{ else if gt .Issue.Poster.ID 0 }}
2024-02-25 09:02:20 -05:00
{{ ctx .Locale.Tr "repo.issues.opened_by" $createdStr .Issue.Poster.HomeLink .Issue.Poster.GetDisplayName }}
2023-05-03 17:58:59 -04:00
{{ else }}
2024-02-25 09:02:20 -05:00
{{ ctx .Locale.Tr "repo.issues.opened_by_fake" $createdStr .Issue.Poster.GetDisplayName }}
2023-05-03 17:58:59 -04:00
{{ end }}
·
2023-09-25 04:56:50 -04:00
{{ ctx .Locale.TrN .Issue.NumComments "repo.issues.num_comments_1" "repo.issues.num_comments" .Issue.NumComments }}
2023-05-03 17:58:59 -04:00
< / span >
2015-12-07 17:30:52 -05:00
{{ end }}
2023-05-03 17:58:59 -04:00
< / div >
< / div >
2015-12-07 17:30:52 -05:00
< / div >