diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2016-01-05 22:20:46 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2016-01-05 22:20:46 +0100 |
| commit | f7aea0e74ec776d0340581f41b16458b587e0f66 (patch) | |
| tree | 134d50aa91093aa3ce8ee6ef4459562142c047ff | |
| parent | 076b38e2339c05fe5cd5a9734e0b471a0f8d34c4 (diff) | |
| parent | bbf939e77fe9fd238818fe3d5e7569ca290cc780 (diff) | |
| download | Chimère - projet de référence-f7aea0e74ec776d0340581f41b16458b587e0f66.tar.bz2 Chimère - projet de référence-f7aea0e74ec776d0340581f41b16458b587e0f66.zip | |
Merge branch 'v2.2'
| -rw-r--r-- | settings.py | 3 | ||||
| -rw-r--r-- | templates/chimere/base.html | 3 | ||||
| -rw-r--r-- | templates/chimere/main_map.html | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/settings.py b/settings.py index 6df6f4e..87e7b16 100644 --- a/settings.py +++ b/settings.py @@ -141,6 +141,9 @@ HAYSTACK_CONNECTIONS = { HAYSTACK_SEARCH_RESULTS_PER_PAGE = 12 HAYSTACK_AUTOCOMPLETE = False +CHIMERE_MODIF_EMAIL = _(u"Hello, I would like to propose you a modification " + u"about this item: ") + CHIMERE_CSV_ENCODING = 'ISO-8859-1' CHIMERE_DEFAULT_ACTIONS = ['view', 'contribute'] diff --git a/templates/chimere/base.html b/templates/chimere/base.html index 9089251..70b5929 100644 --- a/templates/chimere/base.html +++ b/templates/chimere/base.html @@ -13,6 +13,9 @@ <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/form-compat.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/extra-styles.css" /> <script src="{{ STATIC_URL }}bootstrap/bootstrap.min.js" type="text/javascript"></script> + <script type='text/javascript'> + var has_search = {% if has_search %}true{% else %}false{% endif %}; + </script> <script src="{{ STATIC_URL }}chimere/js/interface.js" type="text/javascript"></script> {% endblock %} {% block header %} diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html index ef04334..90b9587 100644 --- a/templates/chimere/main_map.html +++ b/templates/chimere/main_map.html @@ -36,7 +36,6 @@ {% map_menu %} {% map 'main-map' %} <script type='text/javascript'> - var has_search = {% if has_search %}true{% else %}false{% endif %}; // array to keep trace of already displayed items var search_result = new Array(); var search_url = "/search/"; |