Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb

seminar/templates/seminar/clanky/organizatorske_clanky.html

@@ -1,5 +1,11 @@
 {% extends 'seminar/clanky/resitelske_clanky.html' %}
 
+{% block submenu %}
+  {% with "org" as selected %}
+  {% include "seminar/clanky/submenu.html" %}
+  {% endwith %}
+{% endblock submenu %}
+
 {% block nadpis1a %}{% block nadpis1b %}
 Organizátorské články
 {% endblock %}{% endblock %}

seminar/templates/seminar/clanky/resitelske_clanky.html

@@ -1,5 +1,13 @@
 {% extends 'base.html' %}
 
+{% block menu_clanky %}selected{% endblock %}
+
+{% block submenu %}
+  {% with "resitel" as selected %}
+  {% include "seminar/clanky/submenu.html" %}
+  {% endwith %}
+{% endblock submenu %}
+
 {% block content %}
 
 <h2>