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, 17 insertions, 1 deletions

diff --git a/chimere/urls.py b/chimere/urls.py
index f87522e..30ca844 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2008-2013  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2008-2015  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as
@@ -68,6 +68,22 @@ if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') \
                 'route', name="route"),
     )
 
+if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') \
+   and settings.CHIMERE_SEARCH_ENGINE:
+    from chimere.forms import SearchForm
+    from chimere.views import SearchView
+    from haystack.views import search_view_factory
+    urlpatterns += patterns('chimere.views',
+        url(r'^search/?$', search_view_factory(
+            view_class=SearchView,
+            template='search/search.html',
+            form_class=SearchForm
+        ), name='haystack_search'),
+        url(r'^search/autocomplete/$', 'autocomplete',
+            name='autocomplete-search')
+    )
+    #urlpatterns += [url(r'^search/', include('haystack.urls')),]
+
 urlpatterns += patterns('chimere.views',
     url(r'^logout/?$', 'logout_view', name="logout"),
     url(r'^charte/?$', 'charte', name="charte"),