Browse Source

Odstranění zobrazování submenu u položek bez submenu.

remotes/origin/noc deploy-prod-2015-09-13-13-00-xlfd
Honza "Stínovlas" Musílek 9 years ago
parent
commit
ede6e48116
  1. 6
      mamweb/templates/base.html
  2. 2
      seminar/templates/seminar/archiv/submenu.html
  3. 2
      seminar/templates/seminar/clanky/submenu.html
  4. 2
      seminar/templates/seminar/cojemam/submenu.html
  5. 2
      seminar/templates/seminar/soustredeni/submenu.html
  6. 2
      seminar/templates/seminar/zadani/submenu.html

6
mamweb/templates/base.html

@ -74,10 +74,8 @@
</div>
<div class='row'>
<div class='col-md-12'>
<div id='submenu'>
{% block submenu %}
{% endblock %}
</div>
{% block submenu %}
{% endblock %}
</div>
</div>
<div class='row content'>

2
seminar/templates/seminar/archiv/submenu.html

@ -1,11 +1,13 @@
{% with "/archiv" as cesta %}
<div id='submenu'>
<ul>
<li class="{% if selected == "cisla" %}selected{% endif %}"><a href="{{cesta}}/cisla/">Čísla</a>
{# TODO zprovoznit až budou témata v db <li class="{% if selected == "temata" %}selected{% endif %}"><a href="{{cesta}}/temata/">Témata</a> #}
{# TODO zprovoznit až budou úlohy v db <li class="{% if selected == "ulohy" %}selected{% endif %}"><a href="{{cesta}}/ulohy/">Úlohy</a> #}
<li class="{% if selected == "vysledky" %}selected{% endif %}"><a href="{{cesta}}/vysledky/">Výsledkové listiny</a>
</ul>
</div>
{% endwith %}

2
seminar/templates/seminar/clanky/submenu.html

@ -1,11 +1,13 @@
{% with "/clanky" as cesta %}
<div id='submenu'>
<ul>
<li class="{% if selected == "uvod" %}selected{% endif %}"><a href="{{cesta}}/uvod/">Úvod</a>
{# TODO až budou <li class="{% if selected == "org" %}selected{% endif %}"><a href="{{cesta}}/org/">Organizátorské články</a> #}
{# TODO až budou <li class="{% if selected == "resitel" %}selected{% endif %}"><a href="{{cesta}}/resitel/">Řešitelské články</a> #}
<li class="{% if selected == "jak-psat-vedecky-clanek" %}selected{% endif %}"><a href="{{cesta}}/jak-psat-vedecky-clanek/">Jak napsat článek</a>
</ul>
</div>
{% endwith %}

2
seminar/templates/seminar/cojemam/submenu.html

@ -1,11 +1,13 @@
{% with "/co-je-MaM" as cesta %}
<div id='submenu'>
<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 == "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>
</div>
{% endwith %}

2
seminar/templates/seminar/soustredeni/submenu.html

@ -1,9 +1,11 @@
{% with "/soustredeni" as cesta %}
<div id='submenu'>
<ul>
<li class="{% if selected == "uvod" %}selected{% endif %}"><a href="{{cesta}}/">Úvod</a>
<li class="{% if selected == "pripravujeme" %}selected{% endif %}"><a href="{{cesta}}/pripravujeme/">Připravujeme</a>
<li class="{% if selected == "probehlo" %}selected{% endif %}"><a href="{{cesta}}/probehlo/">Proběhlo</a>
</ul>
</div>
{% endwith %}

2
seminar/templates/seminar/zadani/submenu.html

@ -1,10 +1,12 @@
{% with "/zadani" as cesta %}
<div id='submenu'>
<ul>
<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 == "vysledkova-listina" %}selected{% endif %}"><a href="{{cesta}}/vysledkova-listina/">Výsledková listina</a>
</ul>
</div>
{% endwith %}

Loading…
Cancel
Save