From 301e47c701cc91faa0260534603cb99b4e074e62 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Thu, 10 Sep 2015 19:46:38 +0200
Subject: [PATCH] Zobrazeni novinek na titulni strance

---
 seminar/templates/seminar/novinky.html       |  9 ----
 seminar/templates/seminar/titulnistrana.html | 45 ++++++++++++++++++--
 seminar/views.py                             |  8 ++--
 3 files changed, 46 insertions(+), 16 deletions(-)
 delete mode 100644 seminar/templates/seminar/novinky.html

diff --git a/seminar/templates/seminar/novinky.html b/seminar/templates/seminar/novinky.html
deleted file mode 100644
index ad7207f7..00000000
--- a/seminar/templates/seminar/novinky.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% block body %}
-	{% for novinka in object_list %}
-			<p>
-			Tady bude novinka.
-			{{ novinka.text }}
-			</p>
-			<img src='{{ novinka.obrazek.url }}'
-	{% endfor%}
-{% endblock %}
diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html
index 4502fe2e..89a0f566 100644
--- a/seminar/templates/seminar/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana.html
@@ -1,7 +1,46 @@
 {% extends 'base.html' %}
 
-HU!
+
 {% block content %}
-	Tady bude nadpis pro novinky.
-	{% include 'seminar/novinky.html' %}
+
+  {# Uvitaci text #}
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Tož vitajte!
+    {% endblock %}{% endblock %}
+  </h2>
+  <p> Uvítací text či-co.</p>
+
+  {# Novinky #}
+  <h2>Novinky</h2>
+   
+  {% for novinka in object_list %}
+  {# pripravene div-y na stylovani#}
+  <div>
+    {# datum #}
+    <div><b>{{novinka.datum}}</b></div>
+    {# text #}
+    {% autoescape off %}{{novinka.text}}{% endautoescape %}
+    {# obrazek #}
+    {% if novinka.obrazek %}
+      <div>
+        <img src='{{novinka.obrazek.url}}'
+        height='
+        {% if novinka.obrazek.height > 200 %} {# vyska obrazku natvrdo #}
+          200
+        {% else %}
+          {{novinka.obrazek.height}}
+        {% endif%}
+        '>
+      </div>
+    {% endif %}
+    {# autor #}
+    <div>{{novinka.autor.first_name}}
+      {% if novinka.autor.organizator.prezdivka%}
+        &bdquo;{{novinka.autor.organizator.prezdivka}}&ldquo;
+      {% endif %}
+      {{novinka.autor.last_name}}
+    </div>
+  </div>
+  {% endfor%}
 {% endblock %}
diff --git a/seminar/views.py b/seminar/views.py
index 09878434..6263bb34 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -43,11 +43,11 @@ class TitulniStranaView(generic.ListView):
     model = Novinky
     template_name='seminar/titulnistrana.html'
     pred_dvema_mesici = (date.today() - timedelta(2*365/12))
-    queryset = Novinky.objects.filter(datum__range=(pred_dvema_mesici, date.today()))
+    queryset = Novinky.objects.filter(datum__range=(pred_dvema_mesici, date.today())).filter(zverejneno=True).order_by('-datum')
 
-    def get_context_data(self, **kwargs):
-        context = super(TitulniStranaView, self).get_context_data(**kwargs)
-        return context
+    #def get_context_data(self, **kwargs):
+    #    context = super(TitulniStranaView, self).get_context_data(**kwargs)
+    #    return context
 
 ### Co je M&M