From c24864cea986a337c9b8bb7d11f8a88f3583ae65 Mon Sep 17 00:00:00 2001
From: "Uwe Jandt (DESY)" <uwe.jandt@desy.de>
Date: Thu, 30 Sep 2021 18:55:02 +0200
Subject: [PATCH] stole baseurl treatment from frontpage.html
---
search.json | 9 +++++++--
search.md | 10 ++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/search.json b/search.json
index b1937a0e3..1800f3797 100644
--- a/search.json
+++ b/search.json
@@ -1,11 +1,16 @@
---
---
+{% if site.baseurl != '/' %}
+{% assign base_url = site.baseurl | append: '/' %}
+{% else %}
+{% assign base_url = site.baseurl %}
+{% endif %}
[
{% for post in site.posts %}
{
"title" : "{{ post.title | escape }}",
- "url" : "{{ site.baseurl }}{{ post.url }}",
+ "url" : "{{ baseurl }}{{ post.url }}",
"category" : "{{ post.category }}",
"tags" : "{{ post.tags | join: ', ' }}",
"date" : "{{ post.date }}",
@@ -20,7 +25,7 @@
"title" : "{{ page.title | escape }}",
"category" : "{{ page.category }}",
"tags" : "{{ page.tags | join: ', ' }}",
- "url" : "{{ site.baseurl }}{{ page.url }}",
+ "url" : "{{ baseurl }}{{ page.url }}",
"date" : "{{ page.date }}",
"content" : "{{ page.content | strip_html | strip_newlines | remove_chars | escape }}"
{% endif %}
diff --git a/search.md b/search.md
index 09f3b6923..4cd98baba 100644
--- a/search.md
+++ b/search.md
@@ -6,6 +6,12 @@ excerpt:
Search in hifis.net
---
+{% if site.baseurl != '/' %}
+{% assign base_url = site.baseurl | append: '/' %}
+{% else %}
+{% assign base_url = site.baseurl %}
+{% endif %}
+
# Search in hifis.net
{:.text-success}
@@ -18,13 +24,13 @@ Maximum number of results shown is 20.
<ul id="results-container"></ul>
</div>
-<script src="{{ site.baseurl }}/js/simple-jekyll-search.js"></script>
+<script src="{{ baseurl }}/js/simple-jekyll-search.js"></script>
<script>
window.simpleJekyllSearch = new SimpleJekyllSearch({
searchInput: document.getElementById('search-input'),
resultsContainer: document.getElementById('results-container'),
- json: '{{ site.baseurl }}/search.json',
+ json: '{{ baseurl }}/search.json',
searchResultTemplate: '<li><a href="{url}?query={query}" title="{desc}">{title}</a></li>',
noResultsText: 'No results found',
limit: 20,
--
GitLab