summaryrefslogtreecommitdiff
path: root/chimere/templates/search/search.html
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/templates/search/search.html')
-rw-r--r--chimere/templates/search/search.html9
1 files changed, 5 insertions, 4 deletions
diff --git a/chimere/templates/search/search.html b/chimere/templates/search/search.html
index b7e6d69..e2f7619 100644
--- a/chimere/templates/search/search.html
+++ b/chimere/templates/search/search.html
@@ -1,4 +1,4 @@
-{% load url from future %}{% load i18n %}
+{% load i18n %}
<script type='text/javascript'>
var do_you_mean = "{% trans 'Do you mean: ' %}";
var end_do_you_mean = "{% trans '?' %}";
@@ -7,11 +7,11 @@ var end_do_you_mean = "{% trans '?' %}";
{% include "search/search_js.html" %}
<div id='search-listing'>
<ul>
-{% for result in page.object_list %}{% if result.object %}
+{% for result in results %}
<li>
- <img src='{{MEDIA_URL}}{{result.object.default_category.icon.image}}'/><a href="#" onclick="$('#main-map').chimere('showPopup', '{{result.object.full_id}}');return false;">{{ result.object }}</a>
+ <img src='{{MEDIA_URL}}{{result.properties.icon_path}}'/><a href="#" onclick="$('#main-map').chimere('showPopup', '{{result.properties.key}}');return false;">{{ result.properties.name }}</a>
</li>
-{% endif %}{% empty %}
+{% empty %}
<li>{% trans "No results found." %}</li>
{% endfor %}
</ul>
@@ -30,6 +30,7 @@ var end_do_you_mean = "{% trans '?' %}";
{% else %}
<form id='search-form' class='autocomplete-me'>
<input type="text" id="id_q" name="q" autocomplete="off"/>
+ <input type="hidden" id="id_area" name="area" value="{{area_name}}"/>
<button name='haystack-search' id='haystack-search' type='button' class="btn btn-default"><span class='action-label'>{% trans "Search" %} </span><span class="glyphicon glyphicon-search"></span></button>
</form>
<div id='spelling'></div>