diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index 43618f06..e930820c 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -57,7 +57,16 @@
diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index 47060987..d90bab4b 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -14,21 +14,91 @@ {% endblock content %} +{# nahraj spravne submenu #} {% block submenu %} + {# co-je-MaM #} {% if "/co-je-MaM/" in flatpage.url %} - {% include "seminar/cojemam/submenu.html" %} + {% if "/uvod/" in flatpage.url %} + {% with "uvod" as selected %} + {% include "seminar/cojemam/submenu.html" %} + {% endwith %} + {% elif "jak-resit" in flatpage.url %} + {% with "jak-resit" as selected %} + {% include "seminar/cojemam/submenu.html" %} + {% endwith %} + {% elif "FAQ" in flatpage.url %} + {% with "FAQ" as selected %} + {% include "seminar/cojemam/submenu.html" %} + {% endwith %} + {% else %} + {% include "seminar/cojemam/submenu.html" %} + {% endif %} {% endif %} + {# soustredeni #} {% if "/soustredeni/" in flatpage.url %} - {% include "seminar/soustredeni/submenu.html" %} + {% if "/pripravujeme/" in flatpage.url %} + {% with "pripravujeme" as selected %} + {% include "seminar/soustredeni/submenu.html" %} + {% endwith %} + {% else %} + {% with "uvod" as selected %} + {% include "seminar/soustredeni/submenu.html" %} + {% endwith %} + {% endif %} {% endif %} + {# zadani #} {% if "/zadani/" in flatpage.url %} - {% include "seminar/zadani/submenu.html" %} + {% if "/ulohy/" in flatpage.url %} + {% with "ulohy" as selected %} + {% include "seminar/zadani/submenu.html" %} + {% endwith %} + {% elif "/aktualni-cislo/" in flatpage.url %} + {% with "aktualni-cislo" as selected %} + {% include "seminar/zadani/submenu.html" %} + {% endwith %} + {% elif "/vysledkove-listiny/" in flatpage.url %} + {% with "vysledkove-listiny" as selected %} + {% include "seminar/zadani/submenu.html" %} + {% endwith %} + {% else %} + {% include "seminar/zadani/submenu.html" %} + {% endif %} {% endif %} + {# clanky #} {% if "/clanky/" in flatpage.url %} - {% include "seminar/clanky/submenu.html" %} + {% if "/uvod/" in flatpage.url %} + {% with "uvod" as selected %} + {% include "seminar/clanky/submenu.html" %} + {% endwith %} + {% elif "/org/" in flatpage.url %} + {% with "org" as selected %} + {% include "seminar/clanky/submenu.html" %} + {% endwith %} + {% elif "/resitel/" in flatpage.url %} + {% with "resitel" as selected %} + {% include "seminar/clanky/submenu.html" %} + {% endwith %} + {% else %} + {% include "seminar/clanky/submenu.html" %} + {% endif %} {% endif %} + {# archiv #} {% if "/archiv/" in flatpage.url %} - {% include "seminar/archiv/submenu.html" %} + {% if "/ulohy/" in flatpage.url %} + {% with "ulohy" as selected %} + {% include "seminar/archiv/submenu.html" %} + {% endwith %} + {% else %} + {% include "seminar/archiv/submenu.html" %} + {% endif %} {% endif %} {% endblock %} +{# zvirazneni menu #} +{% block menu_uvod %}{% if "/co-je-MaM/" in flatpage.url %}selected{% endif %}{% endblock %} +{% block menu_soustredeni %}{% if "/soustredeni/" in flatpage.url %}selected{% endif %}{% endblock %} +{% block menu_zadani %}{% if "/zadani/" in flatpage.url %}selected{% endif %}{% endblock %} +{% block menu_clanky %}{% if "/clanky/" in flatpage.url %}selected{% endif %}{% endblock %} +{% block menu_archiv %}{% if "/archiv/" in flatpage.url %}selected{% endif %}{% endblock %} + +{# TODO zvirazneni submenu #} diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html deleted file mode 100644 index 110e91f7..00000000 --- a/mamweb/templates/menu.html +++ /dev/null @@ -1,17 +0,0 @@ -{% load i18n cache mam_menu %} -{% aktualni_rocniky as rs %} - - - - diff --git a/seminar/templates/seminar/archiv/base.html b/seminar/templates/seminar/archiv/base.html index 2eb6110a..e972c130 100644 --- a/seminar/templates/seminar/archiv/base.html +++ b/seminar/templates/seminar/archiv/base.html @@ -1,6 +1,4 @@ {% extends "base.html" %} -{% block submenu %} - {% include "seminar/archiv/submenu.html" %} -{% endblock %} +{% block menu_archiv %}selected{% endblock %} diff --git a/seminar/templates/seminar/archiv/base_cisla.html b/seminar/templates/seminar/archiv/base_cisla.html new file mode 100644 index 00000000..deb371eb --- /dev/null +++ b/seminar/templates/seminar/archiv/base_cisla.html @@ -0,0 +1,8 @@ +{% extends "seminar/archiv/base.html" %} + +{% block submenu %} + {% with "cisla" as selected %} + {% include "seminar/archiv/submenu.html" %} + {% endwith %} +{% endblock %} + diff --git a/seminar/templates/seminar/archiv/base_temata.html b/seminar/templates/seminar/archiv/base_temata.html new file mode 100644 index 00000000..47089bbf --- /dev/null +++ b/seminar/templates/seminar/archiv/base_temata.html @@ -0,0 +1,8 @@ +{% extends "seminar/archiv/base.html" %} + +{% block submenu %} + {% with "temata" as selected %} + {% include "seminar/archiv/submenu.html" %} + {% endwith %} +{% endblock %} + diff --git a/seminar/templates/seminar/archiv/base_ulohy.html b/seminar/templates/seminar/archiv/base_ulohy.html new file mode 100644 index 00000000..0dcd546a --- /dev/null +++ b/seminar/templates/seminar/archiv/base_ulohy.html @@ -0,0 +1,10 @@ +{% extends "seminar/archiv/base.html" %} + +{% block menu_archiv %}selected{% endblock %} + +{% block submenu %} + {% with "ulohy" as selected %} + {% include "seminar/archiv/submenu.html" %} + {% endwith %} +{% endblock %} + diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html index f16580c6..bacb5e67 100644 --- a/seminar/templates/seminar/archiv/cisla.html +++ b/seminar/templates/seminar/archiv/cisla.html @@ -1,8 +1,4 @@ -{% extends "seminar/archiv/base.html" %} - -{% block submenu %} - {% include "seminar/archiv/submenu.html" %} -{% endblock %} +{% extends "seminar/archiv/base_cisla.html" %} {% block content %}
diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html index b20346fc..89e25c17 100644 --- a/seminar/templates/seminar/archiv/cislo.html +++ b/seminar/templates/seminar/archiv/cislo.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "seminar/archiv/base_cisla.html" %} {% block content %}
diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html index 0fafb2b4..87dd9bce 100644 --- a/seminar/templates/seminar/archiv/problem.html +++ b/seminar/templates/seminar/archiv/problem.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "seminar/archiv/base_ulohy.html" %} {% load comments %} diff --git a/seminar/templates/seminar/archiv/rocnik.html b/seminar/templates/seminar/archiv/rocnik.html index 5cdb6dd3..80cd9142 100644 --- a/seminar/templates/seminar/archiv/rocnik.html +++ b/seminar/templates/seminar/archiv/rocnik.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "seminar/archiv/base_cisla.html" %} {% block content %}
diff --git a/seminar/templates/seminar/archiv/submenu.html b/seminar/templates/seminar/archiv/submenu.html index fb0bd921..234a0f7c 100644 --- a/seminar/templates/seminar/archiv/submenu.html +++ b/seminar/templates/seminar/archiv/submenu.html @@ -1,9 +1,9 @@ {% with "/archiv" as cesta %} {% endwith %} diff --git a/seminar/templates/seminar/archiv/temata.html b/seminar/templates/seminar/archiv/temata.html index 640d047b..44e40ef2 100644 --- a/seminar/templates/seminar/archiv/temata.html +++ b/seminar/templates/seminar/archiv/temata.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "seminar/archiv/base_temata.html" %} {% block content %}

diff --git a/seminar/templates/seminar/clanky/base.html b/seminar/templates/seminar/clanky/base.html index 8698808e..45c022aa 100644 --- a/seminar/templates/seminar/clanky/base.html +++ b/seminar/templates/seminar/clanky/base.html @@ -1,5 +1,7 @@ {% extends "base.html" %} +{% block menu_clanky %}selected{% endblock %} + {% block submenu %} {% include "seminar/clanky/submenu.html" %} {% endblock %} diff --git a/seminar/templates/seminar/clanky/submenu.html b/seminar/templates/seminar/clanky/submenu.html index ee6ebcdc..e909c7f1 100644 --- a/seminar/templates/seminar/clanky/submenu.html +++ b/seminar/templates/seminar/clanky/submenu.html @@ -1,9 +1,9 @@ {% with "/clanky" as cesta %} {% endwith %} diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index d3b79982..f384dc10 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -7,6 +7,13 @@ {% endif %} {% endblock%}{% endblock%} +{% block menu_uvod %}selected{% endblock %} +{% block submenu %} + {% with "org" as selected %} + {% include "seminar/cojemam/submenu.html" %} + {% endwith %} +{% endblock %} + {% block content %}
{% if not aktivni %} diff --git a/seminar/templates/seminar/cojemam/submenu.html b/seminar/templates/seminar/cojemam/submenu.html index f130e583..2fe62d2f 100644 --- a/seminar/templates/seminar/cojemam/submenu.html +++ b/seminar/templates/seminar/cojemam/submenu.html @@ -1,10 +1,10 @@ {% with "/co-je-MaM" as cesta %} {% endwith %} diff --git a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html index e1b12482..a6c07ea0 100644 --- a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html +++ b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html @@ -1,5 +1,12 @@ {% extends "seminar/soustredeni/base.html" %} +{% block menu_soustredeni %}selected{% endblock %} +{% block submenu %} + {% with "probehlo" as selected %} + {% include "seminar/soustredeni/submenu.html" %} + {% endwith %} +{% endblock submenu %} + {% block content %}{% if user.is_authenticated %}{# PRACUJE SE STRANKA #}

diff --git a/seminar/templates/seminar/soustredeni/submenu.html b/seminar/templates/seminar/soustredeni/submenu.html index c1e9deed..d3ef4b18 100644 --- a/seminar/templates/seminar/soustredeni/submenu.html +++ b/seminar/templates/seminar/soustredeni/submenu.html @@ -1,9 +1,9 @@ {% with "/soustredeni" as cesta %} {% endwith %} diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 8ae89be1..2bda6387 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -1,5 +1,11 @@ {% extends "seminar/zadani/base.html" %} +{% block submenu %} + {% with "aktualni" as selected %} + {% include 'seminar/zadani/submenu.html' %} + {% endwith %} +{% endblock submenu %} + {% block content %}

diff --git a/seminar/templates/seminar/zadani/Temata.html b/seminar/templates/seminar/zadani/Temata.html index ca1c31b4..87aa8e33 100644 --- a/seminar/templates/seminar/zadani/Temata.html +++ b/seminar/templates/seminar/zadani/Temata.html @@ -1,5 +1,12 @@ {% extends "seminar/zadani/base.html" %} +{% block submenu %} + {% with "temata" as selected %} + {% include 'seminar/zadani/submenu.html' %} + {% endwith %} +{% endblock submenu %} + + {% block content %} {% with nastaveni.aktualni_rocnik as ar %}
diff --git a/seminar/templates/seminar/zadani/base.html b/seminar/templates/seminar/zadani/base.html index ba4148aa..043fe401 100644 --- a/seminar/templates/seminar/zadani/base.html +++ b/seminar/templates/seminar/zadani/base.html @@ -1,5 +1,7 @@ {% extends "base.html" %} +{% block menu_zadani %}selected{% endblock %} + {% block submenu %} {% include 'seminar/zadani/submenu.html' %} {% endblock submenu %} diff --git a/seminar/templates/seminar/zadani/submenu.html b/seminar/templates/seminar/zadani/submenu.html index 92c10be5..1ff532ab 100644 --- a/seminar/templates/seminar/zadani/submenu.html +++ b/seminar/templates/seminar/zadani/submenu.html @@ -1,11 +1,11 @@ {% with "/zadani" as cesta %} {% endwith %} diff --git a/seminar/urls.py b/seminar/urls.py index cfb8a658..476cf3f1 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -13,7 +13,7 @@ urlpatterns = patterns('', url(r'^cislo/(?P\d+)\.(?P[0-9-]+)/$', views.CisloView.as_view(), name='seminar_cislo'), url(r'^problem/(?P\d+)/$', views.ProblemView.as_view(), name='seminar_problem'), - url(r'^soustredeni/$', views.SoustredeniListView.as_view(), + url(r'^soustredeni/probehlo/$', views.SoustredeniListView.as_view(), name = 'seminar_seznam_soustredeni'), url(r'^soustredeni/(?P\d+)/$', views.SoustredeniView.as_view(), name='seminar_soustredeni'),