Merge branch 'master' into stable

Přidání odkazu na odměny

mamweb/templates/flatpages/default.html

@@ -22,6 +22,10 @@
       {% with "jak-resit" as selected %}
       {% include "seminar/cojemam/submenu.html" %}
       {% endwith %}
+    {% elif "odmeny" in flatpage.url %}
+      {% with "odmeny" as selected %}
+      {% include "seminar/cojemam/submenu.html" %}
+      {% endwith %}
     {% elif "FAQ" in flatpage.url %}
       {% with "FAQ" as selected %}
       {% include "seminar/cojemam/submenu.html" %}

seminar/templates/seminar/cojemam/submenu.html

@@ -4,6 +4,7 @@
 <ul>
   <li class="{% if selected == "uvod" %}selected{% endif %}"><a href="{{cesta}}/uvod/">Úvod</a>
   <li class="{% if selected == "jak-resit" %}selected{% endif %}"><a href="{{cesta}}/jak-resit/">Jak řešit</a>
+  <li class="{% if selected == "odmeny" %}selected{% endif %}"><a href="{{cesta}}/odmeny/">Odměny</a>
   <li class="{% if selected == "org" %}selected{% endif %}"><a href="{{cesta}}/organizatori/">Organizátoři</a>
   <li class="{% if selected == "FAQ" %}selected{% endif %}"><a href="{{cesta}}/FAQ/">Často kladené dotazy</a>
 </ul>