Merge branch 'master' into saclay

2 files changed, 6 insertions, 1 deletions

diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 3f04fc6..a14ea3f 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -88,7 +88,11 @@
         </a>
     </div>{% endif %}
     <div id='permalink'></div>
-    {% display_welcome news_visible %}
+    {% if simple %}
+        {% display_welcome 0 %}
+    {%else%}
+        {% display_welcome news_visible %}
+    {% endif %}
     {% display_news news_visible %}
     {{ block.super }}
     <div id='map-shadow'></div>
diff --git a/views.py b/views.py
index 86b3d61..86729bb 100644
--- a/views.py
+++ b/views.py
@@ -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))