Skip to content

Commit 0827d70

Browse files
denyskondenyskon
committed
WIP
1 parent cbf68b6 commit 0827d70

File tree

19 files changed

+103
-33
lines changed

19 files changed

+103
-33
lines changed

‎templates/admin/base/search.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="ui secondary filter menu gt-ac gt-mx-0">
22
<form class="ui form ignore-dirty gt-f1">
33
<div class="ui fluid action input">
4-
{{template "shared/searchinput" dict "Value" .Keyword}}
5-
<button class="ui primary button">{{ctx.Locale.Tr "search.search"}}</button>
4+
{{template "shared/search/input" dict "Value" .Keyword}}
5+
{{template "shared/search/button"}}
66
</div>
77
</form>
88
<!-- Sort -->

‎templates/admin/emails/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<div class="ui secondary filter menu gt-ac gt-mx-0">
88
<form class="ui form ignore-dirty gt-f1">
99
<div class="ui fluid action input">
10-
{{template "shared/searchinput" dict "Value" .Keyword}}
11-
<button class="ui primary button">{{ctx.Locale.Tr "search.search"}}</button>
10+
{{template "shared/search/input" dict "Value" .Keyword}}
11+
{{template "shared/search/button"}}
1212
</div>
1313
</form>
1414
<!-- Sort -->

‎templates/admin/packages/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<div class="ui attached segment">
1515
<form class="ui form ignore-dirty">
1616
<div class="ui fluid action input">
17-
{{template "shared/searchinput" dict "Value" .Query}}
17+
{{template "shared/search/input" dict "Value" .Query}}
1818
<select class="ui dropdown" name="type">
1919
<option value="">{{ctx.Locale.Tr "packages.filter.type"}}</option>
2020
<option value="all">{{ctx.Locale.Tr "packages.filter.type.all"}}</option>
2121
{{range $type := .AvailableTypes}}
2222
<option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option>
2323
{{end}}
2424
</select>
25-
<button class="ui primary button">{{ctx.Locale.Tr "search.search"}}</button>
25+
{{template "shared/search/button"}}
2626
</div>
2727
</form>
2828
</div>

‎templates/admin/repo/search.tmpl

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<div class="ui secondary filter menu gt-ac gt-mx-0">
2+
<form class="ui form ignore-dirty gt-f1">
3+
<div class="ui fluid action input">
4+
{{template "shared/search/input" dict "Value" .Keyword}}
5+
{{template "shared/search/button"}}
6+
</div>
7+
</form>
8+
<!-- Sort -->
9+
<div class="ui dropdown type jump item gt-mr-0">
10+
<span class="text">
11+
{{ctx.Locale.Tr "repo.issues.filter_sort"}}
12+
</span>
13+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
14+
<div class="menu">
15+
<a class="{{if or (eq .SortType "oldest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
16+
<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
17+
<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="{{$.Link}}?sort=alphabetically&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
18+
<a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$.Link}}?sort=reversealphabetically&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
19+
<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>
20+
<a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}}</a>
21+
<a class="{{if eq .SortType "moststars"}}active {{end}}item" href="{{$.Link}}?sort=moststars&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}}</a>
22+
<a class="{{if eq .SortType "feweststars"}}active {{end}}item" href="{{$.Link}}?sort=feweststars&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}}</a>
23+
<a class="{{if eq .SortType "mostforks"}}active {{end}}item" href="{{$.Link}}?sort=mostforks&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}}</a>
24+
<a class="{{if eq .SortType "fewestforks"}}active {{end}}item" href="{{$.Link}}?sort=fewestforks&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}}</a>
25+
<a class="{{if eq .SortType "size"}}active {{end}}item" href="{{$.Link}}?sort=size&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.by_size"}}</a>
26+
<a class="{{if eq .SortType "reversesize"}}active {{end}}item" href="{{$.Link}}?sort=reversesize&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_by_size"}}</a>
27+
</div>
28+
</div>
29+
</div>

‎templates/admin/repo/unadopted.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="ui fluid action input">
1212
<input name="search" value="true" type="hidden">
1313
<input name="q" value="{{.Keyword}}" placeholder="{{ctx.Locale.Tr "repo.adopt_search"}}" autofocus>
14-
<button class="ui primary button">{{ctx.Locale.Tr "search.search"}}</button>
14+
{{template "shared/search/button"}}
1515
</div>
1616
</form>
1717
</div>

‎templates/admin/user/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454

5555
<!-- Search Text -->
5656
<div class="ui fluid action input">
57-
{{template "shared/searchinput" dict "Value" .Keyword}}
58-
<button class="ui primary button">{{ctx.Locale.Tr "search.search"}}</button>
57+
{{template "shared/search/input" dict "Value" .Keyword}}
58+
{{template "shared/search/button"}}
5959
</div>
6060
</form>
6161
</div>

‎templates/code/searchform.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<form class="ui form ignore-dirty">
22
<div class="ui fluid action input">
3-
{{template "shared/searchinput" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}}
4-
<div class="ui dropdown selection {{if .CodeIndexerUnavailable}} disabled{{end}}" data-tooltip-content="{{ctx.Locale.Tr "search.type_tooltip"}}">
3+
{{template "shared/search/input" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}}
4+
<div class="ui small dropdown selection {{if .CodeIndexerUnavailable}} disabled{{end}}" data-tooltip-content="{{ctx.Locale.Tr "search.type_tooltip"}}">
55
<input name="t" type="hidden" value="{{.queryType}}"{{if .CodeIndexerUnavailable}} disabled{{end}}>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
66
<div class="text">{{ctx.Locale.Tr (printf "search.%s" (or .queryType "fuzzy"))}}</div>
77
<div class="menu">
88
<div class="item" data-value="" data-tooltip-content="{{ctx.Locale.Tr "search.fuzzy_tooltip"}}">{{ctx.Locale.Tr "search.fuzzy"}}</div>
99
<div class="item" data-value="match" data-tooltip-content="{{ctx.Locale.Tr "search.match_tooltip"}}">{{ctx.Locale.Tr "search.match"}}</div>
1010
</div>
1111
</div>
12-
<button class="ui primary button"{{if .CodeIndexerUnavailable}} disabled{{end}}>{{ctx.Locale.Tr "search.search"}}</button>
12+
{{template "shared/search/button"}}
1313
</div>
1414
</form>

‎templates/explore/repo_search.tmpl

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<div class="ui secondary filter menu gt-ac gt-mx-0">
2+
<form class="ui form ignore-dirty gt-f1">
3+
<input type="hidden" name="sort" value="{{$.SortType}}">
4+
<input type="hidden" name="language" value="{{$.Language}}">
5+
<div class="ui fluid action input">
6+
{{template "shared/search/input" dict "Value" .Keyword}}
7+
{{if .PageIsExploreRepositories}}
8+
<input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}">
9+
{{else if .TabName}}
10+
<input type="hidden" name="tab" value="{{.TabName}}">
11+
{{end}}
12+
{{template "shared/search/button"}}
13+
</div>
14+
</form>
15+
<!-- Sort -->
16+
<div class="ui dropdown type jump item gt-mr-0">
17+
<span class="text">
18+
{{ctx.Locale.Tr "repo.issues.filter_sort"}}
19+
</span>
20+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
21+
<div class="menu">
22+
<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=newest&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
23+
<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=oldest&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
24+
<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=alphabetically&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
25+
<a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=reversealphabetically&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
26+
<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=recentupdate&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>
27+
<a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=leastupdate&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}}</a>
28+
{{if not .DisableStars}}
29+
<a class="{{if eq .SortType "moststars"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=moststars&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}}</a>
30+
<a class="{{if eq .SortType "feweststars"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=feweststars&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}}</a>
31+
{{end}}
32+
<a class="{{if eq .SortType "mostforks"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=mostforks&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}}</a>
33+
<a class="{{if eq .SortType "fewestforks"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=fewestforks&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}}</a>
34+
</div>
35+
</div>
36+
</div>
37+
{{if and .PageIsExploreRepositories .OnlyShowRelevant}}
38+
<div class="ui message explore-relevancy-note">
39+
<span data-tooltip-content="{{ctx.Locale.Tr "explore.relevant_repositories_tooltip"}}">{{ctx.Locale.Tr "explore.relevant_repositories" (printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))}}</span>
40+
</div>
41+
{{end}}
42+
<div class="divider"></div>

‎templates/explore/search.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="ui secondary filter menu gt-ac gt-mx-0">
22
<form class="ui form ignore-dirty gt-f1">
33
<div class="ui fluid action input">
4-
{{template "shared/searchinput" dict "Value" .Keyword}}
5-
<button class="ui primary button">{{ctx.Locale.Tr "search.search"}}</button>
4+
{{template "shared/search/input" dict "Value" .Keyword}}
5+
{{template "shared/search/button"}}
66
</div>
77
</form>
88
<!-- Sort -->

‎templates/package/shared/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
{{if .HasPackages}}
33
<form class="ui form ignore-dirty">
44
<div class="ui fluid action input">
5-
{{template "shared/searchinput" dict "Value" .Query}}
5+
{{template "shared/search/input" dict "Value" .Query}}
66
<select class="ui dropdown" name="type">
77
<option value="">{{ctx.Locale.Tr "packages.filter.type"}}</option>
88
<option value="all">{{ctx.Locale.Tr "packages.filter.type.all"}}</option>
99
{{range $type := .AvailableTypes}}
1010
<option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option>
1111
{{end}}
1212
</select>
13-
<button class="ui primary button">{{ctx.Locale.Tr "search.search"}}</button>
13+
{{template "shared/search/button"}}
1414
</div>
1515
</form>
1616
{{end}}

‎templates/package/shared/versionlist.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<p><a href="{{.PackageDescriptor.PackageWebLink}}">{{.PackageDescriptor.Package.Name}}</a> / <strong>{{ctx.Locale.Tr "packages.versions"}}</strong></p>
22
<form class="ui form ignore-dirty">
33
<div class="ui fluid action input">
4-
{{template "shared/searchinput" dict "Value" .Query}}
4+
{{template "shared/search/input" dict "Value" .Query}}
55
<select class="ui dropdown" name="sort">
66
<option value="version_asc"{{if eq .Sort "version_asc"}} selected="selected"{{end}}>{{ctx.Locale.Tr "filter.string.asc"}}</option>
77
<option value="version_desc"{{if eq .Sort "version_desc"}} selected="selected"{{end}}>{{ctx.Locale.Tr "filter.string.desc"}}</option>
@@ -15,7 +15,7 @@
1515
<option value="untagged"{{if not $isTagged}} selected="selected"{{end}}>{{ctx.Locale.Tr "packages.filter.container.untagged"}}</option>
1616
</select>
1717
{{end}}
18-
<button class="ui primary button">{{ctx.Locale.Tr "search.search"}}</button>
18+
{{template "shared/search/button"}}
1919
</div>
2020
</form>
2121
<div>

‎templates/projects/list.tmpl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323
<form class="list-header-search ui form ignore-dirty">
2424
<div class="ui small search fluid action input">
2525
<input type="hidden" name="state" value="{{$.State}}">
26-
{{template "shared/searchinput" dict "Value" .Keyword}}
27-
<button class="ui small icon button" type="submit" aria-label="{{ctx.Locale.Tr "search.search"}}">
28-
{{svg "octicon-search"}}
29-
</button>
26+
{{template "shared/search/input" dict "Value" .Keyword}}
27+
{{template "shared/search/button"}}
3028
</div>
3129
</form>
3230
<!-- Sort -->

‎templates/repo/issue/search.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<input type="hidden" name="assignee" value="{{$.AssigneeID}}">
1010
<input type="hidden" name="poster" value="{{$.PosterID}}">
1111
{{end}}
12-
{{template "shared/searchinput" dict "Value" .Keyword}}
12+
{{template "shared/search/input" dict "Value" .Keyword}}
1313
{{if .PageIsIssueList}}
1414
<button id="issue-list-quick-goto" class="ui small icon button gt-hidden" data-tooltip-content="{{ctx.Locale.Tr "explore.go_to"}}" data-repo-link="{{.RepoLink}}">{{svg "octicon-hash"}}</button>
1515
{{end}}
16-
<button class="ui small icon button" aria-label="{{ctx.Locale.Tr "search.search"}}">{{svg "octicon-search"}}</button>
16+
{{template "shared/search/button"}}
1717
</div>
1818
</form>

‎templates/shared/actions/runner_list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<form class="ui form ignore-dirty" id="user-list-search-form" action="{{$.Link}}">
3636
<!-- Search Text -->
3737
<div class="ui fluid action input">
38-
{{template "shared/searchinput" dict "Value" .Keyword}}
39-
<button class="ui primary button">{{ctx.Locale.Tr "search.search"}}</button>
38+
{{template "shared/search/input" dict "Value" .Keyword}}
39+
{{template "shared/search/button"}}
4040
</div>
4141
</form>
4242
</div>

‎templates/shared/repo_search.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<form id="repo-search-form" class="ui form ignore-dirty tw-flex-1 tw-flex tw-flex-row tw-gap-x-2">
33
{{if .Language}}<input hidden name="language" value="{{.Language}}">{{end}}
44
<div class="ui fluid action input tw-flex-1">
5-
{{template "shared/searchinput" dict "Value" .Keyword}}
5+
{{template "shared/search/input" dict "Value" .Keyword}}
66
{{if .PageIsExploreRepositories}}
77
<input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}">
88
{{else if .TabName}}
99
<input type="hidden" name="tab" value="{{.TabName}}">
1010
{{end}}
11-
<button class="ui primary button">{{ctx.Locale.Tr "explore.search"}}</button>
11+
{{template "shared/search/button"}}
1212
</div>
1313
<!-- Filter -->
1414
<div class="ui dropdown type jump item tw-mr-0">

‎templates/shared/search/button.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<button class="ui small primary icon button" aria-label="{{ctx.Locale.Tr "search.search"}}" {{with .}}data-tooltip-content="{{.}}"{{end}}>{{svg "octicon-search"}}</button>

‎templates/shared/searchinput.tmpl renamed to ‎templates/shared/search/input.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<input type="search" spellcheck="false" name="q" maxlength="255" placeholder="{{ctx.Locale.Tr "search.search"}}…"{{if .Value}} value="{{.Value}}"{{end}}{{if .Disabled}} disabled{{end}}>
1+
<input type="search" spellcheck="false" name="q" maxlength="255" placeholder="{{ctx.Locale.Tr "search.search"}}…"{{if .Value}} value="{{.Value}}"{{end}}{{if .Disabled}} disabled{{end}} {{if .Autofocus}}autofocus{{end}}>

‎templates/user/dashboard/issues.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
<input type="hidden" name="type" value="{{$.ViewType}}">
5151
<input type="hidden" name="sort" value="{{$.SortType}}">
5252
<input type="hidden" name="state" value="{{$.State}}">
53-
{{template "shared/searchinput" dict "Value" $.Keyword}}
53+
{{template "shared/search/input" dict "Value" $.Keyword}}
5454
<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>
55-
<button class="ui small icon button" aria-label="{{ctx.Locale.Tr "search.search"}}">{{svg "octicon-search"}}</button>
55+
{{template "shared/search/button"}}
5656
</div>
5757
</form>
5858
<!-- Sort -->

‎templates/user/dashboard/milestones.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
<input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}},{{end}}]">
5252
<input type="hidden" name="sort" value="{{$.SortType}}">
5353
<input type="hidden" name="state" value="{{$.State}}">
54-
{{template "shared/searchinput" dict "Value" $.Keyword}}
55-
<button class="ui small icon button" type="submit" aria-label="{{ctx.Locale.Tr "search.search"}}">{{svg "octicon-search"}}</button>
54+
{{template "shared/search/input" dict "Value" $.Keyword}}
55+
{{template "shared/search/button"}}
5656
</div>
5757
</form>
5858
<!-- Sort -->

0 commit comments

Comments
 (0)