From 729849a2fd026adbb91e3ff3259290f61bd919f0 Mon Sep 17 00:00:00 2001 From: HEREYUA <37935145+HEREYUA@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:43:10 +0800 Subject: [PATCH 1/2] Improve branch select list ui in go templates (#29729) Relate:[#27417](https://github.com/go-gitea/gitea/issues/27471) Reference: [#26631](https://github.com/go-gitea/gitea/pull/26631) Before ![image](https://github.com/go-gitea/gitea/assets/37935145/88ca8da5-25dd-4f60-bea8-a80107f19cc5) After ![image](https://github.com/go-gitea/gitea/assets/37935145/3cb180dc-1331-43e9-8633-be5e288401e8) --------- Co-authored-by: silverwind (cherry picked from commit 2eb7c564df950fb96a1970559719003e979ff30a) --- options/locale/locale_en-US.ini | 3 +- templates/repo/branch_dropdown.tmpl | 2 +- templates/repo/diff/compare.tmpl | 2 +- .../repo/issue/branch_selector_field.tmpl | 13 +++++--- templates/repo/issue/view_title.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- web_src/css/repo.css | 30 +++++++++++++++++++ 7 files changed, 45 insertions(+), 9 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 50871be86d..d046b247b9 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -156,6 +156,8 @@ filter.not_template = Not Template filter.public = Public filter.private = Private +no_results_found = No results found. + [aria] navbar = Navigation Bar footer = Footer @@ -1774,7 +1776,6 @@ pulls.compare_compare = pull from pulls.switch_comparison_type = Switch comparison type pulls.switch_head_and_base = Switch head and base pulls.filter_branch = Filter branch -pulls.no_results = No results found. pulls.show_all_commits = Show all commits pulls.show_changes_since_your_last_review = Show changes since your last review pulls.showing_only_single_commit = Showing only changes of commit %[1]s diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 8a5cdc7cc7..367c6aab98 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -56,7 +56,7 @@ 'repoLink': {{.root.RepoLink}}, 'treePath': {{.root.TreePath}}, 'branchNameSubURL': {{.root.BranchNameSubURL}}, - 'noResults': {{ctx.Locale.Tr "repo.pulls.no_results"}}, + 'noResults': {{ctx.Locale.Tr "no_results_found"}}, }; {{if .release}} data.release = { diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index cd56ebfcb2..32d0dc9858 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -29,7 +29,7 @@ {{- end -}}
{{svg "octicon-git-compare"}} -
+
{{if $.PageIsComparePull}}{{ctx.Locale.Tr "repo.pulls.compare_base"}}{{else}}{{ctx.Locale.Tr "repo.compare.compare_base"}}{{end}}: {{$BaseCompareName}}:{{$.BaseBranch}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 9b7a05ce35..4160e47465 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -4,8 +4,8 @@
{{$.CsrfTokenHtml}}
- -
+{{/* TODO: share this branch selector dropdown with the same in repo page */}} +
{{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}} {{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}} @@ -18,12 +18,12 @@
- + {{svg "octicon-git-branch" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.branches"}} - + {{svg "octicon-tag" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.tags"}} @@ -31,12 +31,15 @@
+
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 764a8b01ab..5a9fcb014a 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -88,7 +88,7 @@
{{svg "octicon-arrow-right"}} -
+
{{ctx.Locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 541b1e9b42..19da3fd199 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -5,7 +5,7 @@
-
+
{{ctx.Locale.Tr "repo.wiki.page"}}: diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 3a1f39d2ce..0eba77dbfe 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -3004,3 +3004,33 @@ tbody.commit-list { #cherry-pick-modal .scrolling.menu { max-height: 200px; } + +/* Branch tag selector - TODO: Merge this into the same selector on repo page */ +.repository .issue-content .issue-content-right .ui.grid .column.row { + padding: 10px; + padding-bottom: 0; +} +.repository .issue-content .issue-content-right .ui.grid .column.muted { + padding: 0; +} +.repository .issue-content .issue-content-right .ui.grid .column.muted .text { + display: inline-block; + padding: 10px; + width: 100%; + text-align: center; + border: 1px solid transparent; + border-bottom: none; +} +.repository .issue-content .issue-content-right .ui.grid .column.muted .text.black { + border-color: var(--color-secondary); + background: var(--color-menu); + border-top-left-radius: var(--border-radius); + border-top-right-radius: var(--border-radius); +} +.repository .issue-content .issue-content-right .ui.dropdown .scrolling.menu { + border-top: none; +} +.repository .issue-content .issue-content-right .branch-tag-divider { + margin-top: -1px; + border-top: 1px solid var(--color-secondary); +} From 3c57a6205056a4e144f138d838684fea1d88b8dd Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Sat, 23 Mar 2024 17:27:31 +0100 Subject: [PATCH 2/2] Restore the "repo.pulls.no_results" translation key The previous (cherry picked) commit changed a translation key, from `repo.pulls.no_results` to `common.no_results_found`. This would break existing translations, and will have to be handled differently, if at all. This changes the affected code to continue using the old key. Signed-off-by: Gergely Nagy --- options/locale/locale_en-US.ini | 3 +-- templates/repo/branch_dropdown.tmpl | 2 +- templates/repo/diff/compare.tmpl | 2 +- templates/repo/issue/branch_selector_field.tmpl | 6 +++--- templates/repo/issue/view_title.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d046b247b9..50871be86d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -156,8 +156,6 @@ filter.not_template = Not Template filter.public = Public filter.private = Private -no_results_found = No results found. - [aria] navbar = Navigation Bar footer = Footer @@ -1776,6 +1774,7 @@ pulls.compare_compare = pull from pulls.switch_comparison_type = Switch comparison type pulls.switch_head_and_base = Switch head and base pulls.filter_branch = Filter branch +pulls.no_results = No results found. pulls.show_all_commits = Show all commits pulls.show_changes_since_your_last_review = Show changes since your last review pulls.showing_only_single_commit = Showing only changes of commit %[1]s diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 367c6aab98..8a5cdc7cc7 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -56,7 +56,7 @@ 'repoLink': {{.root.RepoLink}}, 'treePath': {{.root.TreePath}}, 'branchNameSubURL': {{.root.BranchNameSubURL}}, - 'noResults': {{ctx.Locale.Tr "no_results_found"}}, + 'noResults': {{ctx.Locale.Tr "repo.pulls.no_results"}}, }; {{if .release}} data.release = { diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 32d0dc9858..cd56ebfcb2 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -29,7 +29,7 @@ {{- end -}}
{{svg "octicon-git-compare"}} -
+
{{if $.PageIsComparePull}}{{ctx.Locale.Tr "repo.pulls.compare_base"}}{{else}}{{ctx.Locale.Tr "repo.compare.compare_base"}}{{end}}: {{$BaseCompareName}}:{{$.BaseBranch}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 4160e47465..3974dec2e4 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -5,7 +5,7 @@ {{$.CsrfTokenHtml}} {{/* TODO: share this branch selector dropdown with the same in repo page */}} -
+
{{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}} {{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}} @@ -39,7 +39,7 @@ {{range .Branches}}
{{.}}
{{else}} -
{{ctx.Locale.Tr "no_results_found"}}
+
{{ctx.Locale.Tr "repo.pulls.no_results"}}
{{end}}
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 5a9fcb014a..764a8b01ab 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -88,7 +88,7 @@
{{svg "octicon-arrow-right"}} -
+
{{ctx.Locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 19da3fd199..541b1e9b42 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -5,7 +5,7 @@
-
+
{{ctx.Locale.Tr "repo.wiki.page"}}: