Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb

mamweb/templates/flatpages/default.html

@@ -51,8 +51,8 @@
       {% with "aktualni-cislo" as selected %}
       {% include "seminar/zadani/submenu.html" %}
       {% endwith %}
-    {% elif "/vysledkove-listiny/" in flatpage.url %}
+    {% elif "/vysledkova-listina/" in flatpage.url %}
-      {% with "vysledkove-listiny" as selected %}
+      {% with "vysledkova-listina" as selected %}
       {% include "seminar/zadani/submenu.html" %}
       {% endwith %}
     {% else %}

seminar/templates/seminar/zadani/submenu.html

@@ -4,7 +4,7 @@
   <li class="{% if selected == "aktualni" %}selected{% endif %}"><a href="{{cesta}}/aktualni/">Aktuální zadání</a>
   <li class="{% if selected == "temata" %}selected{% endif %}"><a href="{{cesta}}/temata/">Témata</a>
   <li class="{% if selected == "aktualni-cislo" %}selected{% endif %}"><a href="{{cesta}}/aktualni-cislo/">Aktuální číslo</a>
-  <li class="{% if selected == "vysledkove-listiny" %}selected{% endif %}"><a href="{{cesta}}/vysledkove-listiny/">Výsledkové listiny</a>
+  <li class="{% if selected == "vysledkova-listina" %}selected{% endif %}"><a href="{{cesta}}/vysledkova-listina/">Výsledková listina</a>
 </ul>
 
 {% endwith %}