diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-04 20:21:56 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-04 20:21:56 +0200 |
commit | 7af3588c0ab756a491827f2cc17c6ab0a597a298 (patch) | |
tree | c3abb4accf58f3c3ff956bc4966f82db02270664 /views.py | |
parent | 6276e56a0c0b847ffc7dd36ff226a7042e0293d0 (diff) | |
parent | 9debc5422a42e743e8a7de6365cec7971c4a1c7d (diff) | |
download | Chimère - projet Saclay-7af3588c0ab756a491827f2cc17c6ab0a597a298.tar.bz2 Chimère - projet Saclay-7af3588c0ab756a491827f2cc17c6ab0a597a298.zip |
Merge branch 'saclay' into saclay-mobilesaclay-mobile
Conflicts:
static/saclay/css/saclay.css
static/saclay/css/styles.css
templates/chimere/base.html
templates/chimere/detail.html
templates/chimere/main_map.html
Diffstat (limited to 'views.py')
-rw-r--r-- | views.py | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -31,6 +31,7 @@ def index_saclay(request, area_name=None, default_area=None, simple=False): tpl, response_dct = index(request, area_name, default_area, simple, get_response=True) response_dct['news_visible'] = False if request.GET else True + response_dct['simple'] = simple return render_to_response(tpl, response_dct, context_instance=RequestContext(request)) |