From 5543e368d28d148dd5f6e13616e22d0a0b3508d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= <matej.kocian@gmail.com>
Date: Tue, 8 Sep 2015 12:02:03 +0200
Subject: [PATCH] =?UTF-8?q?Drobn=C3=A1=20oprava=20tituln=C3=AD=20strany?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/templates/seminar/novinky.html       |  8 ++------
 seminar/templates/seminar/titulnistrana.html |  5 ++---
 seminar/views.py                             | 10 ++--------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/seminar/templates/seminar/novinky.html b/seminar/templates/seminar/novinky.html
index 88336670..ad7207f7 100644
--- a/seminar/templates/seminar/novinky.html
+++ b/seminar/templates/seminar/novinky.html
@@ -1,13 +1,9 @@
-{% extends 'titulnistrana.html'}
-
 {% block body %}
-	{% for novinka in novinky %}
-		{% if novinka.datum > pred_2_mesici and novinka.zverejneno %}
+	{% for novinka in object_list %}
 			<p>
 			Tady bude novinka.
 			{{ novinka.text }}
 			</p>
-			<img src='{{ novinka.obrazek }}'
-		{% endif %}
+			<img src='{{ novinka.obrazek.url }}'
 	{% endfor%}
 {% endblock %}
diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html
index 424efdee..4502fe2e 100644
--- a/seminar/templates/seminar/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana.html
@@ -1,8 +1,7 @@
-Trala!
 {% extends 'base.html' %}
 
 HU!
-{% block novinky %}
+{% block content %}
 	Tady bude nadpis pro novinky.
-	{% include 'novinky.html' %}
+	{% include 'seminar/novinky.html' %}
 {% endblock %}
diff --git a/seminar/views.py b/seminar/views.py
index b4139989..33fd1f89 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -41,17 +41,11 @@ def TemataView(request):
 class TitulniStranaView(generic.ListView):
     model = Novinky
     template_name='seminar/titulnistrana.html'
+    pred_dvema_mesici = (datetime.date.today() - datetime.timedelta(2*365/12))
+    queryset = Novinky.objects.filter(datum__range=(pred_dvema_mesici, datetime.date.today()))
 
     def get_context_data(self, **kwargs):
         context = super(TitulniStranaView, self).get_context_data(**kwargs)
-        context['pred_2_mesici'] = (datetime.date.today() - datetime.timedelta(2*365/12)).isoformat()
-        #ulozi datum pred dvema mesici
-        #elegantneji mozne pomoci dateutil:
-        '''
-        from dateutil.relativedelta import relativedelta
-
-        date.today() + relativedelta(month=-2)
-        '''
         return context
 
 ### Co je M&M