diff options
| author | HEREYUA <37935145+HEREYUA@users.noreply.github.com> | 2024-03-15 11:43:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-15 11:43:10 +0800 |
| commit | 2eb7c564df950fb96a1970559719003e979ff30a (patch) | |
| tree | 1778c3476cd2be76e81461534e02ff63647d57aa /templates/repo/issue | |
| parent | 94512ee0628dc0d2b697441a4355ace54b6515cd (diff) | |
| download | gitea-2eb7c564df950fb96a1970559719003e979ff30a.tar.gz gitea-2eb7c564df950fb96a1970559719003e979ff30a.zip | |
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
After
---------
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/branch_selector_field.tmpl | 13 | ||||
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 2 |
2 files changed, 10 insertions, 5 deletions
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 @@ <form method="post" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/ref" id="update_issueref_form"> {{$.CsrfTokenHtml}} </form> - -<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating filter select-branch dropdown" data-no-results="{{ctx.Locale.Tr "repo.pulls.no_results"}}"> +{{/* TODO: share this branch selector dropdown with the same in repo page */}} +<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating filter select-branch dropdown" data-no-results="{{ctx.Locale.Tr "no_results_found"}}"> <div class="ui basic small button"> <span class="text branch-name">{{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}}</span> {{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}} @@ -18,12 +18,12 @@ <div class="header"> <div class="ui grid"> <div class="two column row"> - <a class="reference column" href="#" data-target="#branch-list"> + <a class="reference column muted" href="#" data-target="#branch-list"> <span class="text black"> {{svg "octicon-git-branch" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.branches"}} </span> </a> - <a class="reference column" href="#" data-target="#tag-list"> + <a class="reference column muted" href="#" data-target="#tag-list"> <span class="text"> {{svg "octicon-tag" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.tags"}} </span> @@ -31,12 +31,15 @@ </div> </div> </div> + <div class="branch-tag-divider"></div> <div id="branch-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}}"> {{if .Reference}} <div class="item text small" data-id="" data-id-selector="#ref_selector"><strong><a href="#">{{ctx.Locale.Tr "repo.clear_ref"}}</a></strong></div> {{end}} {{range .Branches}} <div class="item" data-id="refs/heads/{{.}}" data-name="{{.}}" data-id-selector="#ref_selector">{{.}}</div> + {{else}} + <div class="item">{{ctx.Locale.Tr "no_results_found"}}</div> {{end}} </div> <div id="tag-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}} gt-hidden"> @@ -45,6 +48,8 @@ {{end}} {{range .Tags}} <div class="item" data-id="refs/tags/{{.}}" data-name="tags/{{.}}" data-id-selector="#ref_selector">{{.}}</div> + {{else}} + <div class="item">{{ctx.Locale.Tr "no_results_found"}}</div> {{end}} </div> </div> diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index e98e27924d..370826e0fd 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -77,7 +77,7 @@ </div> </div> {{svg "octicon-arrow-right"}} - <div class="ui floating filter dropdown" data-no-results="{{ctx.Locale.Tr "repo.pulls.no_results"}}"> + <div class="ui floating filter dropdown" data-no-results="{{ctx.Locale.Tr "no_results_found"}}"> <div class="ui basic small button"> <span class="text" id="pull-target-branch" data-basename="{{$.BaseName}}" data-branch="{{$.BaseBranch}}">{{ctx.Locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span> {{svg "octicon-triangle-down" 14 "dropdown icon"}} |