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

This commit is contained in:
Jethro 2015-09-12 14:45:16 +02:00
commit 3e7fe43d35
2 changed files with 1 additions and 6 deletions

View file

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

View file

@ -2,7 +2,6 @@
<ul> <ul>
<li class="{% if selected == "aktualni" %}selected{% endif %}"><a href="{{cesta}}/aktualni/">Aktuální zadání</a> <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 == "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 == "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 == "vysledkove-listiny" %}selected{% endif %}"><a href="{{cesta}}/vysledkove-listiny/">Výsledkové listiny</a>