summaryrefslogtreecommitdiff
path: root/settings.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-06-16 19:49:26 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-06-16 19:49:26 +0200
commite0d1b71fce2f62a81df082e28aa3430ba76cb07f (patch)
treeef4d23635c460c95352d971565ff66fb975893c4 /settings.py
parent5c805cfe9351664485862d0811ea940d988eef8e (diff)
parent72905a236226e28cb0f33918d85790141952f22b (diff)
downloadChimère - projet Saclay-e0d1b71fce2f62a81df082e28aa3430ba76cb07f.tar.bz2
Chimère - projet Saclay-e0d1b71fce2f62a81df082e28aa3430ba76cb07f.zip
Merge branch 'master-v2.2' into saclay-v2.2
Conflicts: templates/chimere/blocks/map.html
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py21
1 files changed, 19 insertions, 2 deletions
diff --git a/settings.py b/settings.py
index f84e7db..99117a6 100644
--- a/settings.py
+++ b/settings.py
@@ -57,6 +57,8 @@ CHIMERE_DAYS_BEFORE_EVENT = 30
CHIMERE_ALL_DATED_ARE_FRONT = True
# allow feeds
CHIMERE_FEEDS = True
+# display a directory of items
+CHIMERE_DIRECTORY = False
CHIMERE_ICON_WIDTH = 36
CHIMERE_ICON_HEIGHT = 42
@@ -107,7 +109,7 @@ CHIMERE_ROUTING_ENGINE = {
}
CHIMERE_ROUTING_FAIL_MESSAGE = u"""<h3 class='warn'>Attention</h3>
-<p>Le moteur de routage a échoué dans sa recherche de trajet. Les points de
+<p>Le moteur de routage a échoué dans sa recherche de trajet. Les points de
départ ou d'arrivée sont peut-être trop loin d'une voie existante ou le trajet
est trop dangereux.</p>"""
@@ -117,13 +119,25 @@ NOMINATIM_URL = 'http://nominatim.openstreetmap.org/search'
CHIMERE_THUMBS_SCALE_HEIGHT=250
CHIMERE_THUMBS_SCALE_WIDTH=None
+# search engine
+CHIMERE_SEARCH_ENGINE = False
+HAYSTACK_CONNECTIONS = {
+ 'default': {
+ 'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
+ 'URL': 'http://127.0.0.1:8080/solr',
+ 'INCLUDE_SPELLING': True,
+ },
+}
+HAYSTACK_SEARCH_RESULTS_PER_PAGE = 12
+HAYSTACK_AUTOCOMPLETE = False
+
# length of short description
CHIMERE_SHORT_DESC_LENGTH = 400
CHIMERE_MODIF_EMAIL = _(u"""Hello, I would like to propose you a modification about this item: """)
CHIMERE_ROUTING_WARN_MESSAGE = u"""<h3 class='warn'>Attention</h3>
-<p>Cet itinéraire comporte des passages dangereux, nous vous conseillons de
+<p>Cet itinéraire comporte des passages dangereux, nous vous conseillons de
modifier votre recherche.</p>
"""
@@ -288,6 +302,9 @@ try:
except ImportError, e:
print 'Unable to load local_settings.py:', e
+if CHIMERE_SEARCH_ENGINE:
+ INSTALLED_APPS.insert(INSTALLED_APPS.index('south'), 'haystack')
+
if DJANGO_EXTENSIONS:
INSTALLED_APPS.append('django_extensions')