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

mamweb/templates/flatpages/default.html

@@ -47,11 +47,7 @@
   {% endif %}
   {# zadani #}
   {% if "/zadani/" in flatpage.url %}
-    {% if "/ulohy/" in flatpage.url %}
-      {% with "ulohy" as selected %}
-      {% include "seminar/zadani/submenu.html" %}
-      {% endwith %}
-    {% elif "/aktualni-cislo/" in flatpage.url %}
+    {% if "/aktualni-cislo/" in flatpage.url %}
       {% with "aktualni-cislo" as selected %}
       {% include "seminar/zadani/submenu.html" %}
       {% endwith %}

seminar/templates/seminar/zadani/submenu.html

@@ -2,7 +2,6 @@
 
 <ul>
   <li class="{% if selected == "aktualni" %}selected{% endif %}"><a href="{{cesta}}/aktualni/">Aktuální zadání</a>
-  <li class="{% if selected == "ulohy" %}selected{% endif %}"><a href="{{cesta}}/ulohy/">Úlohy</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>