remove roll from news page

diff --git a/panikweb/views.py b/panikweb/views.py
index 259e897f6e943ca4942df708203e7ff3807c1b7f..261648deb53fefcfe209c281d126fe4f8a734578 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -437,8 +437,7 @@ class News(TemplateView):
     def get_context_data(self, **kwargs):
         context = super(News, self).get_context_data(**kwargs)
         context['sectionName'] = "News"
-        context['focus'] = NewsItem.objects.select_related('category').filter(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[:9]
-        context['news'] = NewsItem.objects.all().exclude(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[3:14]
+        context['news'] = NewsItem.objects.all().exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[:14]
         return context
 
 news = News.as_view()

diff --git a/panikweb_templates/templates/news.html b/panikweb_templates/templates/news.html
index 174b8144bbf2a35214c831e541eef5cb1e11e57a..2f3274bddccf3a9e77433765488d97f84d7269a2 100644 (file)
--- a/panikweb_templates/templates/news.html
+++ b/panikweb_templates/templates/news.html
@@ -3,9 +3,6 @@
 {% block title %}News{% endblock %}
 {% block nav %}
        {% news_nav %}
-       {% with focus as news %}
-               {% newsroll %}
-       {% endwith %}
 {% endblock %}
 {% block main %}
 <div class="news">