diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 836703a480..8c014955d0 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -155,6 +155,27 @@ filter.not_template = Not Template filter.public = Public filter.private = Private +[search] +search = Search... +type_tooltip = Search type +fuzzy = Fuzzy +fuzzy_tooltip = Include results that also match the search term closely +match = Match +match_tooltip = Include only results that match the exact search term +repo_kind = Search repos... +user_kind = Search users... +org_kind = Search orgs... +team_kind = Search teams... +code_kind = Search code... +code_search_unavailable = Code search is currently not available. Please contact the site administrator. +package_kind = Search packages... +project_kind = Search projects... +branch_kind = Search branches... +commit_kind = Search commits... +runner_kind = Search runners... +no_results = No matching results found. +keyword_search_unavailable = Searching by keyword is currently not available. Please contact the site administrator. + [aria] navbar = Navigation Bar footer = Footer @@ -330,7 +351,6 @@ collaborative_repos = Collaborative Repositories my_orgs = My Organizations my_mirrors = My Mirrors view_home = View %s -search_repos = Find a repository… filter = Other Filters filter_by_team_repositories = Filter by team repositories feed_of = Feed of "%s" @@ -351,20 +371,8 @@ issues.in_your_repos = In your repositories repos = Repositories users = Users organizations = Organizations -search = Search go_to = Go to code = Code -search.type.tooltip = Search type -search.fuzzy = Fuzzy -search.fuzzy.tooltip = Include results that also matches the search term closely -search.match = Match -search.match.tooltip = Include only results that matches the exact search term -code_search_unavailable = Currently code search is not available. Please contact your site administrator. -repo_no_results = No matching repositories found. -user_no_results = No matching users found. -org_no_results = No matching organizations found. -code_no_results = No source code matching your search term found. -code_search_results = Search results for "%s" code_last_indexed_at = Last indexed %s relevant_repositories_tooltip = Repositories that are forks or that have no topic, no icon, and no description are hidden. relevant_repositories = Only relevant repositories are being shown, show unfiltered results. @@ -1324,9 +1332,8 @@ commits.desc = Browse source code change history. commits.commits = Commits commits.no_commits = No commits in common. "%s" and "%s" have entirely different histories. commits.nothing_to_compare = These branches are equal. -commits.search = Search commits… commits.search.tooltip = You can prefix keywords with "author:", "committer:", "after:", or "before:", e.g. "revert author:Alice before:2019-01-13". -commits.find = Search +commits.search_branch = This Branch commits.search_all = All Branches commits.author = Author commits.message = Message @@ -1502,7 +1509,6 @@ issues.filter_sort.moststars = Most stars issues.filter_sort.feweststars = Fewest stars issues.filter_sort.mostforks = Most forks issues.filter_sort.fewestforks = Fewest forks -issues.keyword_search_unavailable = Searching by keyword is currently not available. Please contact your site administrator. issues.action_open = Open issues.action_close = Close issues.action_label = Label @@ -2035,17 +2041,6 @@ contributors.contribution_type.commits = Commits contributors.contribution_type.additions = Additions contributors.contribution_type.deletions = Deletions -search = Search -search.search_repo = Search repository -search.type.tooltip = Search type -search.fuzzy = Fuzzy -search.fuzzy.tooltip = Include results that also matches the search term closely -search.match = Match -search.match.tooltip = Include only results that matches the exact search term -search.results = Search results for "%s" in %s -search.code_no_results = No source code matching your search term found. -search.code_search_unavailable = Currently code search is not available. Please contact your site administrator. - settings = Settings settings.desc = Settings is where you can manage the settings for the repository settings.options = Repository @@ -2206,7 +2201,6 @@ settings.delete_collaborator = Remove settings.collaborator_deletion = Remove Collaborator settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue? settings.remove_collaborator_success = The collaborator has been removed. -settings.search_user_placeholder = Search user… settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a collaborator. settings.change_team_access_not_allowed = Changing team access for repository has been restricted to organization owner settings.team_not_in_organization = The team is not in the same organization as the repository @@ -2214,7 +2208,6 @@ settings.teams = Teams settings.add_team = Add Team settings.add_team_duplicate = Team already has the repository settings.add_team_success = The team now have access to the repository. -settings.search_team = Search Team… settings.change_team_permission_tip = Team's permission is set on the team setting page and can't be changed per repository settings.delete_team_tip = This team has access to all repositories and can't be removed settings.remove_team_success = The team's access to the repository has been removed. @@ -2367,9 +2360,7 @@ settings.protect_whitelist_committers = Whitelist Restricted Push settings.protect_whitelist_committers_desc = Only whitelisted users or teams will be allowed to push to this branch (but not force push). settings.protect_whitelist_deploy_keys = Whitelist deploy keys with write access to push. settings.protect_whitelist_users = Whitelisted users for pushing: -settings.protect_whitelist_search_users = Search users… settings.protect_whitelist_teams = Whitelisted teams for pushing: -settings.protect_whitelist_search_teams = Search teams… settings.protect_merge_whitelist_committers = Enable Merge Whitelist settings.protect_merge_whitelist_committers_desc = Allow only whitelisted users or teams to merge pull requests into this branch. settings.protect_merge_whitelist_users = Whitelisted users for merging: @@ -2614,7 +2605,6 @@ branch.default_deletion_failed = Branch "%s" is the default branch. It cannot be branch.restore = Restore Branch "%s" branch.download = Download Branch "%s" branch.rename = Rename Branch "%s" -branch.search = Search Branch branch.included_desc = This branch is part of the default branch branch.included = Included branch.create_new_branch = Create branch from branch: @@ -2760,7 +2750,6 @@ teams.write_permission_desc = This team grants Write access: me teams.admin_permission_desc = This team grants Admin access: members can read from, push to and add collaborators to team repositories. teams.create_repo_permission_desc = Additionally, this team grants Create repository permission: members can create new repositories in organization. teams.repositories = Team Repositories -teams.search_repo_placeholder = Search repository… teams.remove_all_repos_title = Remove all team repositories teams.remove_all_repos_desc = This will remove all repositories from the team. teams.add_all_repos_title = Add all repositories diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index a6bc71ac9c..7ba5984002 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -34,12 +34,11 @@ func Code(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - queryType := ctx.FormTrim("t") - isFuzzy := queryType != "match" + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language - ctx.Data["queryType"] = queryType + ctx.Data["IsFuzzy"] = isFuzzy ctx.Data["PageIsViewCode"] = true if keyword == "" { diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index 16da917d22..1b99f4183c 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -203,7 +203,7 @@ func SearchCommits(ctx *context.Context) { ctx.Data["Keyword"] = query if all { - ctx.Data["All"] = "checked" + ctx.Data["All"] = true } ctx.Data["Username"] = ctx.Repo.Owner.Name ctx.Data["Reponame"] = ctx.Repo.Repository.Name diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index 766dd5726a..16e620f57d 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -24,12 +24,11 @@ func Search(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - queryType := ctx.FormTrim("t") - isFuzzy := queryType != "match" + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language - ctx.Data["queryType"] = queryType + ctx.Data["IsFuzzy"] = isFuzzy ctx.Data["PageIsViewCode"] = true if keyword == "" { @@ -54,7 +53,7 @@ func Search(ctx *context.Context) { ctx.Data["CodeIndexerUnavailable"] = !code_indexer.IsAvailable(ctx) } - ctx.Data["SourcePath"] = ctx.Repo.Repository.Link() + ctx.Data["Repo"] = ctx.Repo.Repository ctx.Data["SearchResults"] = searchResults ctx.Data["SearchResultLanguages"] = searchResultLanguages diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 8613d38b65..92911edfe9 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -39,12 +39,11 @@ func CodeSearch(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - queryType := ctx.FormTrim("t") - isFuzzy := queryType != "match" + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) ctx.Data["Keyword"] = keyword ctx.Data["Language"] = language - ctx.Data["queryType"] = queryType + ctx.Data["IsFuzzy"] = isFuzzy ctx.Data["IsCodePage"] = true if keyword == "" { diff --git a/services/context/pagination.go b/services/context/pagination.go index 68237c630c..655a278f9f 100644 --- a/services/context/pagination.go +++ b/services/context/pagination.go @@ -53,5 +53,5 @@ func (p *Pagination) SetDefaultParams(ctx *Context) { p.AddParam(ctx, "sort", "SortType") p.AddParam(ctx, "q", "Keyword") // do not add any more uncommon params here! - p.AddParam(ctx, "t", "queryType") + p.AddParam(ctx, "fuzzy", "IsFuzzy") } diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl deleted file mode 100644 index 0fecb61d9e..0000000000 --- a/templates/admin/base/search.tmpl +++ /dev/null @@ -1,23 +0,0 @@ -
-
-
- {{template "shared/searchinput" dict "Value" .Keyword}} - -
-
- -
- - {{ctx.Locale.Tr "repo.issues.filter_sort"}} - - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
- {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} -
-
-
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 29fbb5f039..1e552fba88 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -6,10 +6,7 @@
-
- {{template "shared/searchinput" dict "Value" .Keyword}} - -
+ {{template "shared/search/combo" dict "Value" .Keyword}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 0d79456b47..efb0a8847e 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -7,7 +7,26 @@
- {{template "admin/base/search" .}} +
+
+ {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}} +
+ +
+ + {{ctx.Locale.Tr "repo.issues.filter_sort"}} + + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+ {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} +
+
+
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index aef4815424..863f11da25 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -13,16 +13,16 @@
-
- {{template "shared/searchinput" dict "Value" .Query}} - {{range $type := .AvailableTypes}} {{$type.Name}} {{end}} - + {{template "shared/search/button"}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index fb4f16791d..c65cfd9db4 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -8,10 +8,10 @@
-
- - - +
+ + + {{template "shared/search/button"}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index e9ce17ac90..11c2fa5940 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -52,11 +52,7 @@
- -
- {{template "shared/searchinput" dict "Value" .Keyword}} - -
+ {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
diff --git a/templates/code/searchcombo.tmpl b/templates/code/searchcombo.tmpl deleted file mode 100644 index d451bc0ad8..0000000000 --- a/templates/code/searchcombo.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -{{template "code/searchform" .}} -
-
- {{if .CodeIndexerUnavailable}} -
-

{{ctx.Locale.Tr "explore.code_search_unavailable"}}

-
- {{else if .SearchResults}} -

- {{ctx.Locale.Tr "explore.code_search_results" .Keyword}} -

- {{template "code/searchresults" .}} - {{else if .Keyword}} -
{{ctx.Locale.Tr "explore.code_no_results"}}
- {{end}} -
-{{template "base/paginate" .}} diff --git a/templates/code/searchform.tmpl b/templates/code/searchform.tmpl deleted file mode 100644 index fae1340046..0000000000 --- a/templates/code/searchform.tmpl +++ /dev/null @@ -1,14 +0,0 @@ -
-
- {{template "shared/searchinput" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}} -
- {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
{{ctx.Locale.Tr (printf "explore.search.%s" (or .queryType "fuzzy"))}}
-
-
{{ctx.Locale.Tr "explore.search.fuzzy"}}
-
{{ctx.Locale.Tr "explore.search.match"}}
-
-
- -
- diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index 2298575887..039933fa2d 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -2,7 +2,7 @@
{{template "explore/navbar" .}}
- {{template "code/searchcombo" .}} + {{template "shared/search/code/search" .}}
{{template "base/footer" .}} diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index c51dcaa3ff..17c8bcb6a3 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -58,7 +58,7 @@
{{else}}
- {{ctx.Locale.Tr "explore.repo_no_results"}} + {{ctx.Locale.Tr "search.no_results"}}
{{end}} diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 2bb5f319d1..54d995989a 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -1,12 +1,13 @@ -
+
-
- {{template "shared/searchinput" dict "Value" .Keyword}} - -
+ {{if .PageIsExploreUsers}} + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}} + {{else}} + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}} + {{end}} -
+
{{ctx.Locale.Tr "repo.issues.filter_sort"}} diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl index 0d661d53cb..fb86fbbea2 100644 --- a/templates/explore/user_list.tmpl +++ b/templates/explore/user_list.tmpl @@ -26,6 +26,8 @@
{{else}} -
{{ctx.Locale.Tr "explore.user_no_results"}}
+
+ {{ctx.Locale.Tr "search.no_results"}} +
{{end}}
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 7e15ae3d47..e9046125c6 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -3,9 +3,7 @@ {{template "explore/navbar" .}}
{{template "explore/search" .}} - {{template "explore/user_list" .}} - {{template "base/paginate" .}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index adaf83ae15..02220a917a 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -14,7 +14,7 @@ diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 5a32eea64f..bd38cda6d1 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -14,7 +14,7 @@ {{.CsrfTokenHtml}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 09205b19a5..a9ee023061 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,16 +1,16 @@ {{template "base/alert" .}} {{if .HasPackages}} -
- {{template "shared/searchinput" dict "Value" .Query}} - {{range $type := .AvailableTypes}} {{$type.Name}} {{end}} - + {{template "shared/search/button"}}
{{end}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 59d6d89b53..fc34ccc938 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,21 +1,21 @@

{{.PackageDescriptor.Package.Name}} / {{ctx.Locale.Tr "packages.versions"}}

-
- {{template "shared/searchinput" dict "Value" .Query}} - {{if eq .PackageDescriptor.Package.Type "container"}} - {{$isTagged := or (eq .Tagged "") (eq .Tagged "tagged")}} {{end}} - + {{template "shared/search/button"}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 54a41221bf..414c9dca2e 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -21,13 +21,8 @@
-
- - {{template "shared/searchinput" dict "Value" .Keyword}} - -
+ + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.project_kind")}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 916111faca..48c14cf343 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -67,140 +67,136 @@
{{end}} - {{if .Branches}} -

-
- {{ctx.Locale.Tr "repo.branches"}} -
-
-
-
- -
- - -
-

- -
-
- - {{range .Branches}} - - - - - - - {{end}} - -
- {{if .DBBranch.IsDeleted}} -
- {{.DBBranch.Name}} - -
-

{{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{TimeSinceUnix .DBBranch.DeletedUnix ctx.Locale}}

- {{else}} -
- {{if .IsProtected}}{{svg "octicon-shield-lock"}}{{end}} - {{.DBBranch.Name}} - - {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}} -
-

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

- {{end}} - 		- {{if and (not .DBBranch.IsDeleted) $.DefaultBranchBranch}} -
-
-
{{.CommitsBehind}}
- {{/* old code bears 0/0.0 = NaN output, so it might output invalid "width: NaNpx", it just works and doesn't caues any problem. */}} -
-
-
-
{{.CommitsAhead}}
-
-
-
- {{end}} - 		- {{if not .LatestPullRequest}} - {{if .IsIncluded}} - - {{svg "octicon-git-pull-request"}} {{ctx.Locale.Tr "repo.branch.included"}} - - {{else if and (not .DBBranch.IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} - - - - {{end}} - {{else if and .LatestPullRequest.HasMerged .MergeMovedOn}} - {{if and (not .DBBranch.IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} - - - - {{end}} - {{else}} - {{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}} - {{if .LatestPullRequest.HasMerged}} - {{svg "octicon-git-merge" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.pulls.merged"}} - {{else if .LatestPullRequest.Issue.IsClosed}} - {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.issues.closed_title"}} - {{else}} - {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.issues.open_title"}} - {{end}} - {{end}} - - {{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted)}} - - {{end}} - {{if $.EnableFeed}} - {{svg "octicon-rss"}} - {{end}} - {{if and (not .DBBranch.IsDeleted) (not $.DisableDownloadSourceArchives)}} -
- {{svg "octicon-download"}} -
- {{svg "octicon-file-zip"}} ZIP - {{svg "octicon-file-zip"}} TAR.GZ -
-
- {{end}} - {{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted) (not $.IsMirror)}} - - {{end}} - {{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}} - {{if .DBBranch.IsDeleted}} - - {{else}} - - {{end}} - {{end}} -
+

+
+ {{ctx.Locale.Tr "repo.branches"}}
- {{template "base/paginate" .}} - {{end}} +

+ +
+
+ {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.branch_kind")}} +
+
+ +
+ + + {{range .Branches}} + + + + + + + {{end}} + +
+ {{if .DBBranch.IsDeleted}} +
+ {{.DBBranch.Name}} + +
+

{{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{TimeSinceUnix .DBBranch.DeletedUnix ctx.Locale}}

+ {{else}} +
+ {{if .IsProtected}}{{svg "octicon-shield-lock"}}{{end}} + {{.DBBranch.Name}} + + {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}} +
+

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

+ {{end}} + 		+ {{if and (not .DBBranch.IsDeleted) $.DefaultBranchBranch}} +
+
+
{{.CommitsBehind}}
+ {{/* old code bears 0/0.0 = NaN output, so it might output invalid "width: NaNpx", it just works and doesn't caues any problem. */}} +
+
+
+
{{.CommitsAhead}}
+
+
+
+ {{end}} + 		+ {{if not .LatestPullRequest}} + {{if .IsIncluded}} + + {{svg "octicon-git-pull-request"}} {{ctx.Locale.Tr "repo.branch.included"}} + + {{else if and (not .DBBranch.IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} + + + + {{end}} + {{else if and .LatestPullRequest.HasMerged .MergeMovedOn}} + {{if and (not .DBBranch.IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} + + + + {{end}} + {{else}} + {{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}} + {{if .LatestPullRequest.HasMerged}} + {{svg "octicon-git-merge" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.pulls.merged"}} + {{else if .LatestPullRequest.Issue.IsClosed}} + {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.issues.closed_title"}} + {{else}} + {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.issues.open_title"}} + {{end}} + {{end}} + + {{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted)}} + + {{end}} + {{if $.EnableFeed}} + {{svg "octicon-rss"}} + {{end}} + {{if and (not .DBBranch.IsDeleted) (not $.DisableDownloadSourceArchives)}} +
+ {{svg "octicon-download"}} +
+ {{svg "octicon-file-zip"}} ZIP + {{svg "octicon-file-zip"}} TAR.GZ +
+
+ {{end}} + {{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted) (not $.IsMirror)}} + + {{end}} + {{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}} + {{if .DBBranch.IsDeleted}} + + {{else}} + + {{end}} + {{end}} +
+
+ {{template "base/paginate" .}}
diff --git a/templates/repo/commits_search_dropdown.tmpl b/templates/repo/commits_search_dropdown.tmpl new file mode 100644 index 0000000000..5aa3f4f320 --- /dev/null +++ b/templates/repo/commits_search_dropdown.tmpl @@ -0,0 +1,8 @@ +
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{if .All}}{{ctx.Locale.Tr "repo.commits.search_all"}}{{else}}{{ctx.Locale.Tr "repo.commits.search_branch"}}{{end}}
+
+
{{ctx.Locale.Tr "repo.commits.search_branch"}}
+
{{ctx.Locale.Tr "repo.commits.search_all"}}
+
+
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 70f673e27e..221ee8d99b 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -8,27 +8,27 @@ {{ctx.Locale.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch}} {{end}}
-
- {{if .PageIsCommits}} -
-
- -
- -
- - -
- -
- {{else if .IsDiffCompare}} + {{if .IsDiffCompare}} +
{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} ... {{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}} - {{end}} -
+
+ {{end}} +{{if .PageIsCommits}} +
+
+
+ {{template "shared/search/input" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.commit_kind")}} + {{template "repo/commits_search_dropdown" .}} + {{template "shared/search/button" dict "Tooltip" (ctx.Locale.Tr "repo.commits.search.tooltip")}} +
+
+
+{{end}} + {{if and .Commits (gt .CommitCount 0)}} {{template "repo/commits_list" .}} {{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index a98dcb8c28..ef10904bcc 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -15,14 +15,12 @@
-
- +
+ {{if .CodeIndexerUnavailable}} {{svg "octicon-alert"}} {{end}} - + {{template "shared/search/button" dict "Disabled" .CodeIndexerUnavailable}}
diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index 361f16fd3b..4727b26154 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -9,10 +9,10 @@ {{end}} - {{template "shared/searchinput" dict "Value" .Keyword}} + {{template "shared/search/input" dict "Value" .Keyword}} {{if .PageIsIssueList}} {{end}} - + {{template "shared/search/button"}}
diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index 7513d444cc..3f5b22b0ce 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -2,59 +2,7 @@
{{template "repo/header" .}}
-
-
-
- -
- {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
{{ctx.Locale.Tr (printf "repo.search.%s" (or .queryType "fuzzy"))}}
-
-
{{ctx.Locale.Tr "repo.search.fuzzy"}}
-
{{ctx.Locale.Tr "repo.search.match"}}
-
-
- -
-
-
- {{if .CodeIndexerUnavailable}} -
-

{{ctx.Locale.Tr "repo.search.code_search_unavailable"}}

-
- {{else if .Keyword}} -

- {{ctx.Locale.Tr "repo.search.results" .Keyword .RepoLink .RepoName}} -

- {{if .SearchResults}} -
- {{range $term := .SearchResultLanguages}} - - - {{$term.Language}} -
{{$term.Count}}
- - {{end}} -
-
- {{range $result := .SearchResults}} -
-

- {{.Filename}} - {{ctx.Locale.Tr "repo.diff.view_file"}} -

-
- {{template "shared/searchfile" dict "RepoLink" $.SourcePath "SearchResult" .}} -
- {{template "shared/searchbottom" dict "root" $ "result" .}} -
- {{end}} -
- {{template "base/paginate" .}} - {{else}} -
{{ctx.Locale.Tr "repo.search.code_no_results"}}
- {{end}} - {{end}} + {{template "shared/search/code/search" .}}
{{template "base/footer" .}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 19abf1bee8..d7b5c96bab 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -42,7 +42,7 @@
{{.CsrfTokenHtml}}
@@ -90,7 +90,7 @@
{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 6bbcc9f6ec..e95dd831c9 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -52,7 +52,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_users"}}
+
{{ctx.Locale.Tr "search.user_kind"}}
{{range .Users}}
@@ -67,7 +67,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_teams"}}
+
{{ctx.Locale.Tr "search.team_kind"}}
{{range .Teams}}
@@ -113,7 +113,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_users"}}
+
{{ctx.Locale.Tr "search.user_kind"}}
{{range .Users}}
@@ -128,7 +128,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_teams"}}
+
{{ctx.Locale.Tr "search.team_kind"}}
{{range .Teams}}
@@ -210,7 +210,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_users"}}
+
{{ctx.Locale.Tr "search.user_kind"}}
{{range .Users}}
@@ -225,7 +225,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_teams"}}
+
{{ctx.Locale.Tr "search.team_kind"}}
{{range .Teams}}
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index 31fb59e5e3..4c196f0f99 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -28,7 +28,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_users"}}
+
{{ctx.Locale.Tr "search.user_kind"}}
{{range .Users}}
@@ -43,7 +43,7 @@
-
{{ctx.Locale.Tr "repo.settings.protect_whitelist_search_teams"}}
+
{{ctx.Locale.Tr "search.team_kind"}}
{{range .Teams}}
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 443c455faf..8163007993 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -33,11 +33,7 @@
- -
- {{template "shared/searchinput" dict "Value" .Keyword}} - -
+ {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.runner_kind")}}
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index cffe579741..fb502413fa 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -153,7 +153,7 @@ {{end}} {{if .IssueIndexerUnavailable}}
-

{{ctx.Locale.Tr "repo.issues.keyword_search_unavailable"}}

+

{{ctx.Locale.Tr "search.keyword_search_unavailable"}}

{{end}}
diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl index 2ea4bfaad7..7ba0070863 100644 --- a/templates/shared/repo_search.tmpl +++ b/templates/shared/repo_search.tmpl @@ -1,17 +1,17 @@ -
-
+
+ {{if .Language}}{{end}} -
- {{template "shared/searchinput" dict "Value" .Keyword}} +
+ {{template "shared/search/input" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.repo_kind")}} {{if .PageIsExploreRepositories}} {{else if .TabName}} {{end}} - + {{template "shared/search/button"}}
-
+
{{ctx.Locale.Tr "filter"}} @@ -36,7 +36,7 @@
-
+
{{ctx.Locale.Tr "repo.issues.filter_sort"}} @@ -65,3 +65,4 @@ {{ctx.Locale.Tr "explore.relevant_repositories" (printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))}}
{{end}} +
diff --git a/templates/shared/search/button.tmpl b/templates/shared/search/button.tmpl new file mode 100644 index 0000000000..7bb1662e15 --- /dev/null +++ b/templates/shared/search/button.tmpl @@ -0,0 +1,3 @@ +{{/* Disable (optional) - if search button has to be disabled */}} +{{/* Tooltip (optional) - a tooltip to be displayed on hover */}} + diff --git a/templates/code/searchresults.tmpl b/templates/shared/search/code/results.tmpl similarity index 70% rename from templates/code/searchresults.tmpl rename to templates/shared/search/code/results.tmpl index 08bb12951d..de5ee0c311 100644 --- a/templates/code/searchresults.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -1,6 +1,7 @@
{{range $term := .SearchResultLanguages}} - + {{$term.Language}}
{{$term.Count}}
@@ -9,16 +10,20 @@
{{range $result := .SearchResults}} - {{$repo := (index $.RepoMaps .RepoID)}} + {{$repo := or $.Repo (index $.RepoMaps .RepoID)}}

- - {{$repo.FullName}} + {{if not $.Repo}} + + {{$repo.FullName}} {{if $repo.IsArchived}} {{ctx.Locale.Tr "repo.desc.archived"}} {{end}} - - {{.Filename}} - + - {{.Filename}} + + {{else}} + {{.Filename}} + {{end}} {{ctx.Locale.Tr "repo.diff.view_file"}}

@@ -28,3 +33,4 @@
{{end}}
+{{template "base/paginate" .}} diff --git a/templates/shared/search/code/search.tmpl b/templates/shared/search/code/search.tmpl new file mode 100644 index 0000000000..545ec1ea65 --- /dev/null +++ b/templates/shared/search/code/search.tmpl @@ -0,0 +1,15 @@ + + {{template "shared/search/combo_fuzzy" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable "IsFuzzy" .IsFuzzy "Placeholder" (ctx.Locale.Tr "search.code_kind")}} + +
+
+ {{if .CodeIndexerUnavailable}} +
+

{{ctx.Locale.Tr "search.code_search_unavailable"}}

+
+ {{else if .SearchResults}} + {{template "shared/search/code/results" .}} + {{else if .Keyword}} +
{{ctx.Locale.Tr "search.no_results"}}
+ {{end}} +
diff --git a/templates/shared/search/combo.tmpl b/templates/shared/search/combo.tmpl new file mode 100644 index 0000000000..788db95cc1 --- /dev/null +++ b/templates/shared/search/combo.tmpl @@ -0,0 +1,8 @@ +{{/* Value - value of the search field (for search results page) */}} +{{/* Disabled (optional) - if search field/button has to be disabled */}} +{{/* Placeholder (optional) - placeholder text to be used */}} +{{/* Tooltip (optional) - a tooltip to be displayed on button hover */}} +
+ {{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} + {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}} +
diff --git a/templates/shared/search/combo_fuzzy.tmpl b/templates/shared/search/combo_fuzzy.tmpl new file mode 100644 index 0000000000..3540a89ecb --- /dev/null +++ b/templates/shared/search/combo_fuzzy.tmpl @@ -0,0 +1,10 @@ +{{/* Value - value of the search field (for search results page) */}} +{{/* Disabled (optional) - if search field/button has to be disabled */}} +{{/* Placeholder (optional) - placeholder text to be used */}} +{{/* IsFuzzy - state of the fuzzy search toggle */}} +{{/* Tooltip (optional) - a tooltip to be displayed on button hover */}} +
+ {{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} + {{template "shared/search/fuzzy" dict "Disabled" .Disabled "IsFuzzy" .IsFuzzy}} + {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}} +
diff --git a/templates/shared/search/fuzzy.tmpl b/templates/shared/search/fuzzy.tmpl new file mode 100644 index 0000000000..6ddb03c004 --- /dev/null +++ b/templates/shared/search/fuzzy.tmpl @@ -0,0 +1,10 @@ +{{/* Disabled (optional) - if dropdown has to be disabled */}} +{{/* IsFuzzy - state of the fuzzy search toggle */}} +
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{if .IsFuzzy}}{{ctx.Locale.Tr "search.fuzzy"}}{{else}}{{ctx.Locale.Tr "search.match"}}{{end}}
+
+
{{ctx.Locale.Tr "search.fuzzy"}}
+
{{ctx.Locale.Tr "search.match"}}
+
+
diff --git a/templates/shared/search/input.tmpl b/templates/shared/search/input.tmpl new file mode 100644 index 0000000000..195cefc2f6 --- /dev/null +++ b/templates/shared/search/input.tmpl @@ -0,0 +1,4 @@ +{{/* Value - value of the search field (for search results page) */}} +{{/* Disabled (optional) - if search field has to be disabled */}} +{{/* Placeholder (optional) - placeholder text to be used */}} + diff --git a/templates/shared/searchinput.tmpl b/templates/shared/searchinput.tmpl deleted file mode 100644 index 48b288c299..0000000000 --- a/templates/shared/searchinput.tmpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl index f71f55c474..ff6c69d615 100644 --- a/templates/user/code.tmpl +++ b/templates/user/code.tmpl @@ -3,7 +3,7 @@
{{template "org/header" .}}
- {{template "code/searchcombo" .}} + {{template "shared/search/code/search" .}}
{{else}} @@ -15,7 +15,7 @@
{{template "user/overview/header" .}} - {{template "code/searchcombo" .}} + {{template "shared/search/code/search" .}}
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 7b7023cfaa..0fbf9a7361 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -50,9 +50,9 @@ - {{template "shared/searchinput" dict "Value" $.Keyword}} + {{template "shared/search/input" dict "Value" $.Keyword}} - + {{template "shared/search/button"}}
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index fd684fcabf..7b62c9fc27 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -46,14 +46,11 @@
-
- + - {{template "shared/searchinput" dict "Value" $.Keyword}} - -
+ {{template "shared/search/combo" dict "Value" $.Keyword}}
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index ed6f906822..a879f1fb9d 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -9,7 +9,7 @@ const data = { textOrganization: {{ctx.Locale.Tr "organization"}}, textMyRepos: {{ctx.Locale.Tr "home.my_repos"}}, textNewRepo: {{ctx.Locale.Tr "new_repo"}}, - textSearchRepos: {{ctx.Locale.Tr "home.search_repos"}}, + textSearchRepos: {{ctx.Locale.Tr "search.repo_kind"}}, textFilter: {{ctx.Locale.Tr "home.filter"}}, textShowArchived: {{ctx.Locale.Tr "home.show_archived"}}, textShowPrivate: {{ctx.Locale.Tr "home.show_private"}}, diff --git a/web_src/css/base.css b/web_src/css/base.css index e53e0619c8..1c6b3fa488 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -282,16 +282,26 @@ ol.ui.list li, .ui.action.input:not([class*="left action"]) > .ui.dropdown.selection { min-width: 10em; } - -.ui.action.input:not([class*="left action"]) > .ui.dropdown.selection:not(:focus,:hover) { - border-right-color: transparent; +.ui.action.input:not([class*="left action"]) > .ui.dropdown.selection:not(:focus) { + border-right: none; +} +.ui.action.input:not([class*="left action"]) > .ui.dropdown.selection:not(.active):hover { + border-color: var(--color-input-border); +} +.ui.action.input:not([class*="left action"]) .ui.dropdown.selection.upward.visible { + border-bottom-left-radius: 0 !important; + border-bottom-right-radius: 0 !important; } - .ui.action.input:not([class*="left action"]) > input, .ui.action.input:not([class*="left action"]) > input:hover { - border-right: 1px solid transparent; + border-right: none; +} +.ui.action.input:not([class*="left action"]) > input:focus + .ui.dropdown.selection, +.ui.action.input:not([class*="left action"]) > input:focus + .ui.dropdown.selection:hover, +.ui.action.input:not([class*="left action"]) > input:focus + .button, +.ui.action.input:not([class*="left action"]) > input:focus + .button:hover { + border-left-color: var(--color-primary); } - .ui.action.input:not([class*="left action"]) > input:focus { border-right-color: var(--color-primary); } @@ -610,10 +620,6 @@ ol.ui.list li, border-color: var(--color-primary); } -.ui.selection.dropdown .menu { - margin: 0 -1.25px; -} - .ui.pointing.dropdown > .menu:not(.hidden)::after { background: var(--color-menu); box-shadow: -1px -1px 0 0 var(--color-secondary); diff --git a/web_src/css/form.css b/web_src/css/form.css index 1580a0b4cc..ca65b677d7 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -41,6 +41,11 @@ textarea, color: var(--color-input-text); } +/* fix fomantic small dropdown having inconsistent padding with input */ +.ui.small.selection.dropdown { + padding: .67857143em 3.2em .67857143em 1em; +} + input:hover, textarea:hover, .ui.input input:hover, diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 6f742bbea0..2e8f335ce5 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -355,7 +355,7 @@ export default sfc; // activate the IDE's Vue plugin
-
+