diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html
new file mode 100644
index 00000000..d0af5551
--- /dev/null
+++ b/mamweb/templates/menu.html
@@ -0,0 +1,17 @@
+{% load i18n cache mam_menu %}
+{% aktualni_rocniky as rs %}
+
+
+
+
diff --git a/seminar/models.py b/seminar/models.py
index c5a80b27..86b2061a 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 10bf0007..9fc98570 100644
--- a/seminar/templates/seminar/novinky.html
+++ b/seminar/templates/seminar/novinky.html
@@ -29,3 +29,4 @@
{% endif %}
{% endfor%}
+