From ea690c27e9a729a028232f26090f30a9f59159a2 Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Tue, 15 Aug 2017 15:16:30 +0200
Subject: [PATCH] Fixing Tipue search

---
 static/js/tipuesearch.js    | 4 ++--
 templates/base.html         | 2 +-
 templates/tipue_search.html | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/static/js/tipuesearch.js b/static/js/tipuesearch.js
index 68907ca..10ef6ca 100644
--- a/static/js/tipuesearch.js
+++ b/static/js/tipuesearch.js
@@ -97,7 +97,7 @@ http://www.tipue.com/search
                }
                if (getURLP('q'))
                {
-                    $('.tipue_search')[0].val(getURLP('q'));
+                    $('main .tipue_search').val(getURLP('q'));
                     getTipueSearch(0, true);
                }
 
@@ -120,7 +120,7 @@ http://www.tipue.com/search
                     var c = 0;
                     found = new Array();
 
-                    var d = $('.tipue_search')[0].val().toLowerCase();
+                    var d = $('main .tipue_search').val().toLowerCase();
                     d = $.trim(d);
 
                     if ((d.match("^\"") && d.match("\"$")) || (d.match("^'") && d.match("'$")))
diff --git a/templates/base.html b/templates/base.html
index 196c980..58f2247 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -19,7 +19,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <base href="{{ SITEURL }}">
+    <base href="{{ SITEURL }}/">
 
     <title>{% block title %}{{ SITENAME }}{% endblock %}</title>
     <meta name="description" content="{% block description %}{{ DESCRIPTION }}{% endblock %}">
diff --git a/templates/tipue_search.html b/templates/tipue_search.html
index 014c895..e196176 100644
--- a/templates/tipue_search.html
+++ b/templates/tipue_search.html
@@ -4,9 +4,9 @@
         {% for item in articles + pages %}
         {{comma()}}
         {
-            "title": "{{item.title|striptags|e}}",
-            "text":"{{item.content|striptags|e}}",
-            "tags": "{{item.tags}}",
+            "title": {{item.title|striptags|tojson}},
+            "text": {{item.content|striptags|tojson}},
+            "tags": "{{' '.join(item.tags|map(attribute="name"))}}",
             "loc": "{{ SITEURL }}/{{item.url}}"
         }
         {% endfor %}