Merge branch 'master' into nef

Conflicts:
	chimere/admin.py
	chimere/forms.py
	chimere/models.py
	chimere/settings.sample.py
	chimere/static/chimere/js/jquery.chimere-ol.js
	chimere/templates/chimere/base.html
	chimere/templates/chimere/blocks/head_chimere.html
	chimere/templates/chimere/blocks/map.html
	chimere/templates/chimere/main_map.html
	chimere/templatetags/chimere_tags.py
	chimere/tests.py
	chimere/urls.py
	chimere/views.py
	chimere/widgets.py

1 files changed, 54 insertions, 0 deletions

diff --git a/chimere/templates/search/search.html b/chimere/templates/search/search.html
new file mode 100644
index 0000000..b40359a
--- /dev/null
+++ b/chimere/templates/search/search.html
@@ -0,0 +1,54 @@
+{% load url from future %}{% load i18n %}
+{% if query %}
+<script type='text/javascript'>
+var geo_objects = [{% for result in page.object_list %}{{result.object.getGeoJSON|safe}}{% if not forloop.last %}, {% endif %}{% endfor %}];
+var geo_features = {};
+for (idx=0 ; idx < geo_objects.length ; idx++){
+    var c_idx = geo_objects[idx].properties.pk;
+    if (search_result.indexOf(c_idx) == -1){
+        search_result.push(c_idx);
+        geo_features[c_idx] = $('#main-map').chimere('addMarker',
+                                                     geo_objects[idx]);
+    }
+}
+{% if page.object_list.count %}$("#main-map").chimere("zoomToMarkerExtent");{% endif %}
+</script>
+<div id='search-listing'>
+  <ul>
+{% for result in page.object_list %}
+    <li>
+        <img src='{{MEDIA_URL}}{{result.object.default_category.icon.image}}'/><a href="#" onclick="$('#main-map').chimere('showPopup', {{result.object.pk}});return false;">{{ result.object }}</a>
+    </li>
+{% empty %}
+    <li>{% trans "No results found." %}</li>
+{% endfor %}
+  </ul>
+</div>
+{% if page.has_previous or page.has_next %}
+    <div id='search-nav'>
+        {% if page.has_previous %}<a href="#" onclick="haystack_search(this, {{ page.previous_page_number }});">{% trans "Previous" %}</a>{% endif %}
+        {% if page.has_next %}<a href="#" onclick="haystack_search(this, {{ page.next_page_number }});">{% trans "More results..." %}</a>{% endif %}
+    </div>
+{% endif %}
+
+{% else %}
+<form id='search-form' class='autocomplete-me'>
+    <input type="text" id="id_q" name="q" autocomplete="off"/>
+    <button name='haystack-search' id='haystack-search' type='button' disabled='disabled' class="btn btn-default">{% trans "Search" %}</button>
+</form>
+<div id='search-result'></div>
+<script type='text/javascript'>
+no_result_message = "{% trans 'No exact match.' %}";
+$(function(){
+    $('#haystack-search').click(
+        function(evt){
+            $("#main-map").chimere("razMap");
+            haystack_search(evt);
+    });
+    window.autocomplete = new Autocomplete({
+        form_selector: '.autocomplete-me'
+    });
+    window.autocomplete.setup();
+});
+</script>
+{% endif %}