Skip to content

Commit 523e8c9

Browse files
authored
Merge branch 'main' into diffenh
2 parents 94eb1df + af094fb commit 523e8c9

File tree

17 files changed

+24
-23
lines changed

17 files changed

+24
-23
lines changed

templates/admin/base/search.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
</div>
1616
</div>
1717
</div>
18-
<form class="ui form ignore-dirty" style="max-width: 90%;">
18+
<form class="ui form ignore-dirty">
1919
<div class="ui fluid action input">
20-
<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
20+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
2121
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
2222
</div>
2323
</form>

templates/admin/emails/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
</div>
2020
</div>
2121
</div>
22-
<form class="ui form ignore-dirty" style="max-width: 90%">
22+
<form class="ui form ignore-dirty">
2323
<div class="ui fluid action input">
24-
<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
24+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
2525
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
2626
</div>
2727
</form>

templates/admin/packages/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="ui attached segment">
99
<form class="ui form ignore-dirty">
1010
<div class="ui fluid action input">
11-
<input name="q" value="{{.Query}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
11+
{{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}}
1212
<select class="ui dropdown" name="type">
1313
<option value="">{{.locale.Tr "packages.filter.type"}}</option>
1414
<option value="all">{{.locale.Tr "packages.filter.type.all"}}</option>

templates/admin/repo/search.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</div>
2222
</div>
2323
</div>
24-
<form class="ui form ignore-dirty" style="max-width: 90%">
24+
<form class="ui form ignore-dirty">
2525
<div class="ui fluid action input">
26-
<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
26+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
2727
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
2828
</div>
2929
</form>

templates/admin/user/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
</div>
5252

5353
<!-- Search Text -->
54-
<div class="ui fluid action input" style="max-width: 70%;">
55-
<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
54+
<div class="ui fluid action input">
55+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
5656
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
5757
</div>
5858
</form>

templates/code/searchform.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<form class="ui form ignore-dirty" style="max-width: 100%">
22
<div class="ui fluid action input">
3-
<input name="q" value="{{.Keyword}}"{{if .CodeIndexerUnavailable}} disabled{{end}} placeholder="{{.locale.Tr "explore.search"}}…" autofocus>
3+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true "Disabled" .CodeIndexerUnavailable}}
44
<div class="ui dropdown selection {{if .CodeIndexerUnavailable}} disabled{{end}}" data-tooltip-content="{{.locale.Tr "explore.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">{{.locale.Tr (printf "explore.search.%s" (or .queryType "fuzzy"))}}</div>

templates/explore/repo_search.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
</div>
2222
</div>
2323
</div>
24-
<form class="ui form ignore-dirty" style="max-width: 90%">
24+
<form class="ui form ignore-dirty">
2525
<input type="hidden" name="sort" value="{{$.SortType}}">
2626
<input type="hidden" name="language" value="{{$.Language}}">
2727
<div class="ui fluid action input">
28-
<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}…" autofocus>
28+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
2929
{{if .PageIsExploreRepositories}}
3030
<input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}">
3131
{{end}}

templates/explore/search.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
</div>
1616
</div>
1717
</div>
18-
<form class="ui form ignore-dirty" style="max-width: 90%">
18+
<form class="ui form ignore-dirty">
1919
<div class="ui fluid action input">
20-
<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}…" autofocus>
20+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
2121
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
2222
</div>
2323
</form>

templates/package/shared/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{template "base/alert" .}}
33
<form class="ui form ignore-dirty">
44
<div class="ui fluid action input">
5-
<input name="q" value="{{.Query}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
5+
{{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}}
66
<select class="ui dropdown" name="type">
77
<option value="">{{.locale.Tr "packages.filter.type"}}</option>
88
<option value="all">{{.locale.Tr "packages.filter.type.all"}}</option>

templates/package/shared/versionlist.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<p><a href="{{.PackageDescriptor.PackageWebLink}}">{{.PackageDescriptor.Package.Name}}</a> / <strong>{{.locale.Tr "packages.versions"}}</strong></p>
33
<form class="ui form ignore-dirty">
44
<div class="ui fluid action input">
5-
<input name="q" value="{{.Query}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
5+
{{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}}
66
<select class="ui dropdown" name="sort">
77
<option value="version_asc"{{if eq .Sort "version_asc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.asc"}}</option>
88
<option value="version_desc"{{if eq .Sort "version_desc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.desc"}}</option>

templates/repo/issue/milestones.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<form class="list-header-search ui form ignore-dirty">
2929
<div class="ui small search fluid action input">
3030
<input type="hidden" name="state" value="{{$.State}}">
31-
<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}...">
31+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword}}
3232
<button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}">
3333
{{svg "octicon-search"}}
3434
</button>

templates/repo/issue/search.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<input type="hidden" name="project" value="{{$.ProjectID}}">
88
<input type="hidden" name="assignee" value="{{$.AssigneeID}}">
99
<input type="hidden" name="poster" value="{{$.PosterID}}">
10-
<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." maxlength="255">
10+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword}}
1111
{{if .PageIsIssueList}}
1212
<button id="issue-list-quick-goto" class="ui small icon button gt-hidden" data-tooltip-content="{{.locale.Tr "explore.go_to"}}" data-repo-link="{{.RepoLink}}">{{svg "octicon-hash"}}</button>
1313
{{end}}

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
<div class="ui attached segment">
3636
<form class="ui form ignore-dirty" id="user-list-search-form" action="{{$.Link}}">
3737
<!-- Search Text -->
38-
<div class="ui fluid action input" style="max-width: 70%;">
39-
<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
38+
<div class="ui fluid action input">
39+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
4040
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
4141
</div>
4242
</form>

templates/shared/searchinput.tmpl

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

templates/user/dashboard/issues.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}}%2C{{end}}]">
7878
<input type="hidden" name="sort" value="{{$.SortType}}">
7979
<input type="hidden" name="state" value="{{$.State}}">
80-
<input name="q" value="{{$.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}...">
80+
{{template "shared/searchinput" dict "locale" .locale "Value" $.Keyword}}
8181
<button id="issue-list-quick-goto" class="ui small icon button gt-hidden" data-tooltip-content="{{.locale.Tr "explore.go_to"}}">{{svg "octicon-hash"}}</button>
8282
<button class="ui small icon button" aria-label="{{.locale.Tr "explore.search"}}">{{svg "octicon-search"}}</button>
8383
</div>

templates/user/dashboard/milestones.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
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-
<input name="q" value="{{$.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}...">
54+
{{template "shared/searchinput" dict "locale" .locale "Value" $.Keyword}}
5555
<button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}">{{svg "octicon-search"}}</button>
5656
</div>
5757
</form>

web_src/js/components/DashboardRepoList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</h4>
1717
<div class="ui attached segment repos-search">
1818
<div class="ui fluid right action left icon input" :class="{loading: isLoading}">
19-
<input @input="changeReposFilter(reposFilter)" v-model="searchQuery" ref="search" @keydown="reposFilterKeyControl" :placeholder="textSearchRepos">
19+
<input type="search" spellcheck="false" maxlength="255" @input="changeReposFilter(reposFilter)" v-model="searchQuery" ref="search" @keydown="reposFilterKeyControl" :placeholder="textSearchRepos">
2020
<i class="icon gt-df gt-ac gt-jc"><svg-icon name="octicon-search" :size="16"/></i>
2121
<div class="ui dropdown icon button" :title="textFilter">
2222
<svg-icon name="octicon-filter" :size="16"/>

0 commit comments

Comments
 (0)