News and welcome message improvment (choose the news available on welcome and add a specific page for news)

1 files changed, 12 insertions, 3 deletions

diff --git a/chimere/views.py b/chimere/views.py
index 1a6078f..a9b75a2 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -116,6 +116,7 @@ def index(request, area_name=None, default_area=None, simple=False):
        request.session['last_visit'] != today:
         request.session['last_visit'] = today
         news_visible = True
+    news_visible = True
     response_dct, redir = get_base_response(area_name)
     if redir:
         return redir
@@ -398,12 +399,20 @@ def welcome(request, display=None):
     Welcome string
     """
     response_dct = {'display':display}
-    news = list(News.objects.filter(available=True).all())
+    news = list(News.objects.filter(available=True, is_front_page=True).all())
     if settings.CHIMERE_DAYS_BEFORE_EVENT:
-        q = checkDate(Q(status='A', start_date__isnull=False))
+        q = checkDate(Q(status='A', start_date__isnull=False,
+                        is_front_page=True))
         news += list(Marker.objects.filter(q).all())
-    news.sort(key=lambda x:x.date, reverse=True)
+    news.sort(key=lambda x:x.date, reverse=True)[:3]
     response_dct['news_lst'] = news
+    if "area_name" in context:
+        try:
+            area = Area.objects.get(urn=context["area_name"])
+            context_data['area_name'] = context['area_name']
+            context_data['welcome_message'] = area.welcome_message
+        except ObjectDoesNotExist:
+            pass
     return loader.render_to_string('chimere/blocks/welcome.html', response_dct,
                                        context_instance=RequestContext(request))