From ccd63ae756351f99370f58354d25cdb2b9b4c6be Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Fri, 11 Sep 2015 17:58:16 +0200 Subject: [PATCH] Podbarveni submenu soustredeni --- mamweb/templates/flatpages/default.html | 10 +++++++++- .../seminar/soustredeni/seznam_soustredeni.html | 7 +++++++ seminar/templates/seminar/soustredeni/submenu.html | 6 +++--- seminar/urls.py | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index 05ca082d..9b25c2dd 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -34,7 +34,15 @@ {% endif %} {% endif %} {% 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 %} {% if "/zadani/" in flatpage.url %} {% include "seminar/zadani/submenu.html" %} 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/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'),