From 347b3e07e250603b6f136635dfda3c49bffd908f Mon Sep 17 00:00:00 2001
From: Aneta <aneta.stastna@email.cz>
Date: Sat, 12 Sep 2015 12:27:38 +0200
Subject: [PATCH 1/4] =?UTF-8?q?Smaz=C3=A1n=C3=AD=20koment=C3=A1=C5=99e=20u?=
 =?UTF-8?q?=20odkazu=20v=20menu.=20A.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mamweb/templates/menu.html             |  2 +-
 seminar/models.py                      | 46 +++++++++++++-------------
 seminar/templates/seminar/novinky.html |  8 +++--
 seminar/views.py                       |  2 +-
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html
index 110e91f7..d0af5551 100644
--- a/mamweb/templates/menu.html
+++ b/mamweb/templates/menu.html
@@ -7,7 +7,7 @@
   <li><a href="/zadani/aktualni/">Zadání</a>
   <li><a href="/clanky/uvod/">Články</a>
   <li><a href="/archiv/cisla/">Archiv</a>
-  <li>{#<a href="/odevzdat-reseni/muj-ucet">#}Odeslat řešení{#</a>#}
+  <li><a href="/odevzdat-reseni/muj-ucet">Odeslat řešení</a>
 </ul>
 
 <!-- TODO smazat <ul>
diff --git a/seminar/models.py b/seminar/models.py
index 59d3f4a7..d39d735f 100644
--- a/seminar/models.py
+++ b/seminar/models.py
@@ -211,32 +211,32 @@ class Resitel(SeminarModelBase):
             }
 
     def rocnik(self, rocnik):
-		"""Vrati skolni rocnik resitele pro zadany Rocnik.
+        """Vrati skolni rocnik resitele pro zadany Rocnik.
                 Vraci '' pro neznamy rok maturity resitele, Z* pro ekvivalent ZŠ."""
-                if self.rok_maturity is None:
-                    return ''
-		rozdil = 5 - (self.rok_maturity - rocnik.prvni_rok)
-                if rozdil >= 1:
-                    return str(rozdil)
-                else:
-                    return 'Z' + str(rozdil + 9)
+        if self.rok_maturity is None:
+            return ''
+        rozdil = 5 - (self.rok_maturity - rocnik.prvni_rok)
+        if rozdil >= 1:
+            return str(rozdil)
+        else:
+            return 'Z' + str(rozdil + 9)
 
     def get_titul(self, celkove_body):
-		"Vrati titul podle zadaneho poctu bodu."
-		if celkove_body < 10:
-			return ''
-		elif celkove_body < 20:
-			return 'Bc.'
-		elif celkove_body < 50:
-			return 'Mgr.'
-		elif celkove_body < 100:
-			return 'Dr.'
-		elif celkove_body < 200:
-			return 'Doc.'
-		elif celkove_body < 500:
-			return 'Prof.'
-		else:
-			return 'Akad.'
+        "Vrati titul podle zadaneho poctu bodu."
+        if celkove_body < 10:
+            return ''
+        elif celkove_body < 20:
+            return 'Bc.'
+        elif celkove_body < 50:
+            return 'Mgr.'
+        elif celkove_body < 100:
+            return 'Dr.'
+        elif celkove_body < 200:
+            return 'Doc.'
+        elif celkove_body < 500:
+            return 'Prof.'
+        else:
+            return 'Akad.'
 
 
 
diff --git a/seminar/templates/seminar/novinky.html b/seminar/templates/seminar/novinky.html
index 88336670..c3b2e3f6 100644
--- a/seminar/templates/seminar/novinky.html
+++ b/seminar/templates/seminar/novinky.html
@@ -1,13 +1,15 @@
-{% extends 'titulnistrana.html'}
-
+{% extends 'base.html' %}
+Před začátkem bloku.
 {% block body %}
+Tady bude začátek.
 	{% for novinka in novinky %}
 		{% if novinka.datum > pred_2_mesici and novinka.zverejneno %}
 			<p>
 			Tady bude novinka.
 			{{ novinka.text }}
 			</p>
-			<img src='{{ novinka.obrazek }}'
+			<img src='{{ novinka.obrazek }}'>
 		{% endif %}
 	{% endfor%}
+Tady bude konec.
 {% endblock %}
diff --git a/seminar/views.py b/seminar/views.py
index b4139989..cb8d4f20 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -40,7 +40,7 @@ def TemataView(request):
 
 class TitulniStranaView(generic.ListView):
     model = Novinky
-    template_name='seminar/titulnistrana.html'
+    template_name='seminar/novinky.html'
 
     def get_context_data(self, **kwargs):
         context = super(TitulniStranaView, self).get_context_data(**kwargs)

From 7828f343151e51d8af40bfcedc001cfc477e4522 Mon Sep 17 00:00:00 2001
From: Jethro <xtompok@gmail.com>
Date: Sat, 12 Sep 2015 12:33:38 +0200
Subject: [PATCH 2/4] Nezobrazovat nazev stranky na zacatku textu.

---
 mamweb/templates/flatpages/default.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html
index d90bab4b..3adf4eb6 100644
--- a/mamweb/templates/flatpages/default.html
+++ b/mamweb/templates/flatpages/default.html
@@ -2,12 +2,11 @@
 
 {% block title %}{{ flatpage.title }}{% endblock title %}
 
+{% block nadpis1a %}{% block nadpis1b%}
+  {{ flatpage.title }}
+{% endblock %}{% endblock %}
+
 {% block content %}
-<h2>
-  {% block nadpis1a %}{% block nadpis1b%}
-    {{ flatpage.title }}
-  {% endblock %}{% endblock %}
-</h2>
 
 <div>
 {{ flatpage.content }}

From 5e68a7d3db204b1e4b3e79987f8967073ca83b06 Mon Sep 17 00:00:00 2001
From: Aneta <aneta.stastna@email.cz>
Date: Sat, 12 Sep 2015 12:51:33 +0200
Subject: [PATCH 3/4] =?UTF-8?q?Odkomentov=C3=A1n=C3=AD=20odkazu=20pro=20od?=
 =?UTF-8?q?eslat=20=C5=99e=C5=A1en=C3=AD=20a=20smaz=C3=A1n=C3=AD=20zmrtv?=
 =?UTF-8?q?=C3=BDchvstal=C3=A9ho=20=20souboru=20menu.html.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mamweb/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index 05063dbc..f8254ba5 100644
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@@ -65,7 +65,7 @@
             <li class="{% block menu_zadani %}{% endblock %}"><a href="/zadani/aktualni/">Zadání</a>
             <li class="{% block menu_clanky %}{% endblock %}"><a href="/clanky/uvod/">Články</a>
             <li class="{% block menu_archiv %}{% endblock %}"><a href="/archiv/cisla/">Archiv</a>
-            <li class="{% block menu_odevzdat %}{% endblock %}">{#<a href="/odevzdat-reseni/muj-ucet">#}Odeslat řešení{#</a>#}
+            <li class="{% block menu_odevzdat %}{% endblock %}"><a href="/odevzdat-reseni/muj-ucet">Odeslat řešení</a>
           </ul>
           {# ======== KONEC MENU =============#}
 	      </div>

From b9b6e2feb772834df18ee2327bb5141bee0d8982 Mon Sep 17 00:00:00 2001
From: Aneta <aneta.stastna@email.cz>
Date: Sat, 12 Sep 2015 12:56:08 +0200
Subject: [PATCH 4/4] =?UTF-8?q?P=C5=99id=C3=A1n=C3=AD=20lom=C3=ADtka=20u?=
 =?UTF-8?q?=20odkazu=20na=20odeslat=20=C5=99e=C5=A1en=C3=AD=20v=20menu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mamweb/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index f8254ba5..73a73647 100644
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@@ -65,7 +65,7 @@
             <li class="{% block menu_zadani %}{% endblock %}"><a href="/zadani/aktualni/">Zadání</a>
             <li class="{% block menu_clanky %}{% endblock %}"><a href="/clanky/uvod/">Články</a>
             <li class="{% block menu_archiv %}{% endblock %}"><a href="/archiv/cisla/">Archiv</a>
-            <li class="{% block menu_odevzdat %}{% endblock %}"><a href="/odevzdat-reseni/muj-ucet">Odeslat řešení</a>
+            <li class="{% block menu_odevzdat %}{% endblock %}"><a href="/odevzdat-reseni/muj-ucet/">Odeslat řešení</a>
           </ul>
           {# ======== KONEC MENU =============#}
 	      </div>