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 %}
-
- Tady bude novinka.
- {{ novinka.text }}
-
-
+ {% block nadpis1a %}{% block nadpis1b %}
+ Tož vitajte!
+ {% endblock %}{% endblock %}
+
+ Uvítací text či-co.
+
+ {# Novinky #}
+ Novinky
+
+ {% for novinka in object_list %}
+ {# pripravene div-y na stylovani#}
+
+ {# datum #}
+
{{novinka.datum}}
+ {# text #}
+ {% autoescape off %}{{novinka.text}}{% endautoescape %}
+ {# obrazek #}
+ {% if novinka.obrazek %}
+
+
+
+ {% endif %}
+ {# autor #}
+
{{novinka.autor.first_name}}
+ {% if novinka.autor.organizator.prezdivka%}
+ „{{novinka.autor.organizator.prezdivka}}“
+ {% endif %}
+ {{novinka.autor.last_name}}
+
+
+ {% 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