Skip to content

Commit 160364d

Browse files
kbhawkeykbhawkey
committed
move search.md
add search bar to search page fix bing anchors
1 parent 94b2f85 commit 160364d

File tree

7 files changed

+59
-52
lines changed

7 files changed

+59
-52
lines changed

‎assets/js/search.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ limitations under the License.
2323
}
2424

2525
var query = $(this).val();
26-
var searchPage = "{{ "docs/search/" | absURL }}?q=" + query;
27-
document.location = searchPage;
26+
document.location = "{{ "search/" | absURL }}?q=" + query;
2827

2928
return false;
3029
});

‎content/en/docs/search.md renamed to ‎content/en/search.md

File renamed without changes.

‎layouts/_default/search.html

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<!doctype html>
2+
<html lang="{{ .Site.Language.Lang }}" class="{{.Params.class}} no-js">
3+
<head>
4+
{{ partial "head.html" . }}
5+
</head>
6+
<body class="td-{{ .Kind }}{{- if ne .Params.cid "" -}}{{- printf " cid-%s" (lower .Params.cid) -}}{{- end -}}">
7+
<header>
8+
{{ partial "navbar.html" . }}
9+
</header>
10+
{{ block "announcement" . }}
11+
{{ if .IsHome }}
12+
{{ partial "frontpage-announcement.html" . }}
13+
{{ else }}
14+
{{ partial "announcement.html" . }}
15+
{{ end }}
16+
{{ end }}
17+
<div class="td-outer">
18+
<main role="main" class="td-main">
19+
<section class="row td-search-result">
20+
<div class="col-12 col-md-4 offset-md-2">
21+
<form class="td-sidebar__search d-flex align-items-center">
22+
{{ partial "search-input.html" . }}
23+
<button class="btn btn-link td-sidebar__toggle d-md-none p-0 ml-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
24+
</button>
25+
</form>
26+
</div>
27+
<div class="col-12 col-md-8 offset-md-2">
28+
<h2 class="ml-4">{{ .Title }}</h2>
29+
{{ if .Site.Params.gcs_engine_id }}
30+
<script>
31+
(function() {
32+
var cx = '{{ . }}';
33+
var gcse = document.createElement('script');
34+
gcse.type = 'text/javascript';
35+
gcse.async = true;
36+
gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
37+
var s = document.getElementsByTagName('script')[0];
38+
s.parentNode.insertBefore(gcse, s);
39+
})();
40+
</script>
41+
<gcse:searchresults-only></gcse:searchresults-only>
42+
{{ else if .Site.Params.k8s_search }}
43+
<script src="{{ "js/search.js" | relURL }}"></script>
44+
<gcse:searchresults-only linktarget="_parent">
45+
<div id="bing-results-container">{{ T "layouts_docs_search_fetching" }}</div>
46+
<div id="bing-pagination-container"></div>
47+
</gcse:searchresults-only>
48+
{{ end }}
49+
</div>
50+
</section>
51+
</main>
52+
{{ partial "footer.html" . }}
53+
</div>
54+
{{ partialCached "scripts.html" . }}
55+
</body>
56+
</html>

‎layouts/docs/search.html

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎layouts/partials/docs/top-menu.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎layouts/partials/head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
{{- if not .Site.Params.deprecated }}
5959
"potentialAction": {
6060
"@type": "SearchAction",
61-
"target": {{ printf "%s%s" ("/docs/search/" | absURL) "?q={search_term_string}" }},
61+
"target": {{ printf "%s%s" ("search/" | absURL) "?q={search_term_string}" }},
6262
"query-input": "required name=search_term_string"
6363
}
6464
{{ end }}

‎static/js/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
for(var i = 1; i <= 10; i++){
1919
if(i > pages) break;
20-
pageAnchors += '<a class="bing-page-anchor" href="/docs/search/?q='+searchTerm+'&page='+i+'">';
20+
pageAnchors += '<a class="bing-page-anchor" href="/search/?q='+searchTerm+'&page='+i+'">';
2121
pageAnchors += (currentPage == i) ? '<b>'+i+'</b>' : i;
2222
pageAnchors += '</a>';
2323
}

0 commit comments

Comments
 (0)