mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-09-20 09:45:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Unify search boxes (#29530)

Browse source 
Unify all but a few search boxes to use uniform style, uniform
translations and shared templates where possible.
Remove a few duplicated search templates, e. g. code search.

<details><summary>Example after screenshots:</summary>

![grafik](https://github.com/go-gitea/gitea/assets/47871822/e20e7d6b-c6be-4a47-b132-672766f41421)

![grafik](https://github.com/go-gitea/gitea/assets/47871822/d5b11b9c-c12f-4a29-8fb0-24e5aa511d18)

![grafik](https://github.com/go-gitea/gitea/assets/47871822/d86bb444-36c7-426d-9cf1-c634963dffb1)

![grafik](https://github.com/go-gitea/gitea/assets/47871822/a76c0319-0518-484a-a840-563d02b61198)

</details>

Also includes #29700

Co-authored-by: 6543 <6543@obermui.de>

---------

Co-authored-by: 6543 <m.huber@kithara.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
Conflicts:
	routers/web/repo/search.go
	templates/repo/home.tmpl
	templates/repo/search.tmpl
	templates/shared/repo_search.tmpl
This commit is contained in:
Denys Konovalov 2024-03-15 00:24:59 +01:00 • committed by Shiny Nematoda
commit 847f03b6a6
50 changed files with 354 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/user/code.tmpl
View file

@ -3,7 +3,7 @@
<div role="main" aria-label="{{.Title}}" class="page-content organization code">
{{template "org/header" .}}
<div class="ui container">
{{template "code/searchcombo" .}}
{{template "shared/search/code/search" .}}
</div>
</div>
{{else}}
@ -15,7 +15,7 @@
</div>
<div class="ui twelve wide column">
{{template "user/overview/header" .}}
{{template "code/searchcombo" .}}
{{template "shared/search/code/search" .}}
</div>
</div>
</div>

4
templates/user/dashboard/issues.tmpl
View file

@ -50,9 +50,9 @@
<input type="hidden" name="type" value="{{$.ViewType}}">
<input type="hidden" name="sort" value="{{$.SortType}}">
<input type="hidden" name="state" value="{{$.State}}">
{{template "shared/searchinput" dict "Value" $.Keyword}}
{{template "shared/search/input" dict "Value" $.Keyword}}
<button id="issue-list-quick-goto" class="ui small icon button gt-hidden" data-tooltip-content="{{ctx.Locale.Tr "explore.go_to"}}">{{svg "octicon-hash"}}</button>
<button class="ui small icon button" aria-label="{{ctx.Locale.Tr "explore.search"}}">{{svg "octicon-search"}}</button>
{{template "shared/search/button"}}
</div>
</form>
<!-- Sort -->

7
templates/user/dashboard/milestones.tmpl
View file

@ -46,14 +46,11 @@
</a>
</div>
<form class="list-header-search ui form ignore-dirty">
<div class="ui small search fluid action input">
<input type="hidden" name="type" value="{{$.ViewType}}">
<input type="hidden" name="type" value="{{$.ViewType}}">
<input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}},{{end}}]">
<input type="hidden" name="sort" value="{{$.SortType}}">
<input type="hidden" name="state" value="{{$.State}}">
{{template "shared/searchinput" dict "Value" $.Keyword}}
<button class="ui small icon button" type="submit" aria-label="{{ctx.Locale.Tr "explore.search"}}">{{svg "octicon-search"}}</button>
</div>
{{template "shared/search/combo" dict "Value" $.Keyword}}
</form>
<!-- Sort -->
<div class="list-header-sort ui dropdown type jump item">

2
templates/user/dashboard/repolist.tmpl
View file

@ -6,7 +6,7 @@ const data = {
isStarsEnabled: {{not .IsDisableStars}},
textMyRepos: {{ctx.Locale.Tr "home.my_repos"}},
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"}},