Merge pull request #50 from ahornos/main

Fix #42 bug "Search 404 error"

CONTRIBUTORS.yaml

@@ -17,12 +17,42 @@
 ---
 # Please add yourself below in alphabetical order
 
+ahornos:
+    name: Albert Hornos Vidal
+    email: [email protected]
+    orcid: 0000-0002-7330-668X
+    elixir_node: es
+
+alex-dem:
+    name: Alexandros Dimopoulos
+    email: [email protected]
+    orcid: 0000-0002-4602-2040
+    elixir_node: gr
+
+blankdots:
+    name: Stefan Negru
+    email: [email protected]
+    orcid: 0000-0002-6544-5022
+    elixir_node: fi
+
+d-salgado:
+    name: David Salgado
+    email: [email protected]
+    orcid: 0000-0002-5905-3591
+    elixir_node: fr
+
 jmenglund:
     name: Markus Englund
     email: [email protected]
     orcid: 0000-0003-1688-7112
     elixir_node: se
 
+lilachic:
+    name: Liisa Lado-Villar
+    email: [email protected]
+    orcid:
+    elixir_node: fi
+
 mfreeberg:
     name: Mallory Freeberg
     email: [email protected]
@@ -42,33 +72,3 @@ silviabah:
     email: [email protected]
     orcid: 0000-0002-2734-0449
     elixir_node: embl
-
-ahornos:
-    name: Albert Hornos Vidal
-    email: [email protected]
-    orcid: 0000-0002-7330-668X
-    elixir_node: es
-
-blankdots:
-    name: Stefan Negru
-    email:
-    orcid:
-    elixir_node: fi
-
-alex-dem:
-    name: Alexandros Dimopoulos
-    email: [email protected]
-    orcid: 0000-0002-4602-2040
-    elixir_node: gr
-
-d-salgado:
-    name: David Salgado
-    email: [email protected]
-    orcid: 0000-0002-5905-3591
-    elixir_node: fr
-
-lilachic:
-    name: Liisa Lado-Villar
-    email: [email protected]
-    orcid:
-    elixir_node: fi

_config.yml

@@ -7,6 +7,7 @@ webrick:
     Access-Control-Allow-Origin: "*"
 
 # Specific to this theme
+baseurl: /FEGA-onboarding
 site_author: Federated EGA Knowledge base team
 repo_url: ''
 edit_on_github: false

docs/_includes/searchbox.html

@@ -0,0 +1,5 @@
+<div role="search">
+  <form id ="rtd-search-form" class="wy-form" action="{{ site.baseurl }}/search.html" method="get">
+    <input type="text" name="q" id="search-query" placeholder="Search docs" title="Type search term here" />
+  </form>
+</div>

docs/search.html

@@ -64,7 +64,7 @@ <h1 id="search">Search Results</h1>
           this.field('author');
           this.field('content');
         });
-        $.getJSON('/search_data.json').then(function(search_data) {
+        $.getJSON('search_data.json').then(function(search_data) {
           var idx = lunr(function() {
             this.field('id');
             this.field('title', { boost: 10 });

docs/search_data.json

@@ -9,7 +9,7 @@ search_exclude: true
     "{{ site_page.url | slugify }}": {
         "title": "{{ site_page.title | xml_escape }}",
         "content": {{site_page.content | markdownify | newline_to_br | replace: '<br />', ' ' | strip_html | normalize_whitespace | jsonify }},
-        "url": " {{ site_page.url | xml_escape }}",
+        "url": " {{ site_page.url | absolute_url }}",
         "author": "{{ site_page.author | xml_escape }}"
     },
 {%- endunless %}
@@ -19,7 +19,7 @@ search_exclude: true
     "{{ site_post.url | slugify }}": {
         "title": "{{ site_post.title | xml_escape }}",
         "content": {{site_post.content | markdownify | newline_to_br | replace: '<br />', ' ' | strip_html | normalize_whitespace | jsonify }},
-        "url": " {{ site_post.url | xml_escape }}",
+        "url": " {{ site_post.url | absolute_url }}",
         "author": "{{ site_post.author | xml_escape }}"
     }{%- unless forloop.last %},{%- endunless %}
 {%- endunless %}