From ede6e48116236212580b22f9496641973a63c358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20=22St=C3=ADnovlas=22=20Mus=C3=ADlek?=
 <stinovlas@gmail.com>
Date: Sun, 13 Sep 2015 12:24:11 +0200
Subject: [PATCH] =?UTF-8?q?Odstran=C4=9Bn=C3=AD=20zobrazov=C3=A1n=C3=AD=20?=
 =?UTF-8?q?submenu=20u=20polo=C5=BEek=20bez=20submenu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mamweb/templates/base.html                         | 6 ++----
 seminar/templates/seminar/archiv/submenu.html      | 2 ++
 seminar/templates/seminar/clanky/submenu.html      | 2 ++
 seminar/templates/seminar/cojemam/submenu.html     | 2 ++
 seminar/templates/seminar/soustredeni/submenu.html | 2 ++
 seminar/templates/seminar/zadani/submenu.html      | 2 ++
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index c61ff124..3685735c 100644
--- a/mamweb/templates/base.html
+++ b/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'>
diff --git a/seminar/templates/seminar/archiv/submenu.html b/seminar/templates/seminar/archiv/submenu.html
index a0c63c37..c4951f50 100644
--- a/seminar/templates/seminar/archiv/submenu.html
+++ b/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 %}
 
diff --git a/seminar/templates/seminar/clanky/submenu.html b/seminar/templates/seminar/clanky/submenu.html
index 0a19761b..b544520b 100644
--- a/seminar/templates/seminar/clanky/submenu.html
+++ b/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 %}
 
diff --git a/seminar/templates/seminar/cojemam/submenu.html b/seminar/templates/seminar/cojemam/submenu.html
index a86e8f74..18b6901a 100644
--- a/seminar/templates/seminar/cojemam/submenu.html
+++ b/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 %}
 
diff --git a/seminar/templates/seminar/soustredeni/submenu.html b/seminar/templates/seminar/soustredeni/submenu.html
index d3ef4b18..a507a2fb 100644
--- a/seminar/templates/seminar/soustredeni/submenu.html
+++ b/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 %}
diff --git a/seminar/templates/seminar/zadani/submenu.html b/seminar/templates/seminar/zadani/submenu.html
index 0352c77c..84de5d67 100644
--- a/seminar/templates/seminar/zadani/submenu.html
+++ b/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 %}