From 7acb757832e58c4a5a58319c8c6f2fc984caab88 Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Fri, 11 Sep 2015 16:21:28 +0200 Subject: [PATCH 1/8] Nepotrebny znovuprepis submenu Submenu se nahravu uz v archiv/base.html --- seminar/templates/seminar/archiv/cisla.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html index f16580c6..d6cdf441 100644 --- a/seminar/templates/seminar/archiv/cisla.html +++ b/seminar/templates/seminar/archiv/cisla.html @@ -1,9 +1,5 @@ {% extends "seminar/archiv/base.html" %} -{% block submenu %} - {% include "seminar/archiv/submenu.html" %} -{% endblock %} - {% block content %}

From fd98e13d41b53371df6fbfcac6f9246b2b6b08c5 Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Fri, 11 Sep 2015 16:41:22 +0200 Subject: [PATCH 2/8] Priprava na podbarvovani menu Menu nemuze byt includovane, jinak to nefunguje. --- mamweb/templates/base.html | 11 ++++++++++- mamweb/templates/menu.html | 17 ----------------- 2 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 mamweb/templates/menu.html diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index 43618f06..c7c6dd1a 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -57,7 +57,16 @@
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 %} - - - - From 92fad5e1f05fc874ec513c8e25718f0a5cf9aa55 Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Fri, 11 Sep 2015 16:41:54 +0200 Subject: [PATCH 3/8] Podbarvovani menu ve flatpages --- mamweb/templates/flatpages/default.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index 47060987..d7c9aab9 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -14,6 +14,7 @@

{% endblock content %} +{# nahraj spravne submenu #} {% block submenu %} {% if "/co-je-MaM/" in flatpage.url %} {% include "seminar/cojemam/submenu.html" %} @@ -32,3 +33,11 @@ {% 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 #} From 0f4044d7c04b71da3192a8ca08f71cabe86c9cc5 Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Fri, 11 Sep 2015 17:40:37 +0200 Subject: [PATCH 4/8] Podbarveni submenu uvod --- mamweb/templates/base.html | 12 ++++++------ mamweb/templates/flatpages/default.html | 16 +++++++++++++++- .../templates/seminar/cojemam/organizatori.html | 7 +++++++ seminar/templates/seminar/cojemam/submenu.html | 8 ++++---- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index c7c6dd1a..e930820c 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -59,12 +59,12 @@ diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index d7c9aab9..05ca082d 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -17,7 +17,21 @@ {# nahraj spravne submenu #} {% block submenu %} {% 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 %} {% if "/soustredeni/" in flatpage.url %} {% include "seminar/soustredeni/submenu.html" %} 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 %} From ccd63ae756351f99370f58354d25cdb2b9b4c6be Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Fri, 11 Sep 2015 17:58:16 +0200 Subject: [PATCH 5/8] 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'), From 8fa661a8acc4442ed0219f7cfad8a473c8883614 Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Fri, 11 Sep 2015 18:13:35 +0200 Subject: [PATCH 6/8] Podbarveni menu zadani --- mamweb/templates/flatpages/default.html | 21 ++++++++++++++++++- .../seminar/zadani/AktualniZadani.html | 6 ++++++ seminar/templates/seminar/zadani/Temata.html | 7 +++++++ seminar/templates/seminar/zadani/base.html | 2 ++ seminar/templates/seminar/zadani/submenu.html | 10 ++++----- 5 files changed, 40 insertions(+), 6 deletions(-) diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index 9b25c2dd..aa651a59 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -16,6 +16,7 @@ {# nahraj spravne submenu #} {% block submenu %} + {# co-je-MaM #} {% if "/co-je-MaM/" in flatpage.url %} {% if "/uvod/" in flatpage.url %} {% with "uvod" as selected %} @@ -33,6 +34,7 @@ {% include "seminar/cojemam/submenu.html" %} {% endif %} {% endif %} + {# soustredeni #} {% if "/soustredeni/" in flatpage.url %} {% if "/pripravujeme/" in flatpage.url %} {% with "pripravujeme" as selected %} @@ -44,12 +46,29 @@ {% 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" %} {% endif %} + {# archiv #} {% if "/archiv/" in flatpage.url %} {% include "seminar/archiv/submenu.html" %} {% endif %} 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 %} From a5f816240cc91946a53753f406b73ca843513907 Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Fri, 11 Sep 2015 18:24:41 +0200 Subject: [PATCH 7/8] Podbarveni menu clanky --- mamweb/templates/flatpages/default.html | 20 ++++++++++++++++--- seminar/templates/seminar/clanky/base.html | 2 ++ seminar/templates/seminar/clanky/submenu.html | 6 +++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index aa651a59..742626fe 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -52,11 +52,11 @@ {% with "ulohy" as selected %} {% include "seminar/zadani/submenu.html" %} {% endwith %} - {% elif "aktualni-cislo" in flatpage.url %} + {% elif "/aktualni-cislo/" in flatpage.url %} {% with "aktualni-cislo" as selected %} {% include "seminar/zadani/submenu.html" %} {% endwith %} - {% elif "vysledkove-listiny" in flatpage.url %} + {% elif "/vysledkove-listiny/" in flatpage.url %} {% with "vysledkove-listiny" as selected %} {% include "seminar/zadani/submenu.html" %} {% endwith %} @@ -66,7 +66,21 @@ {% 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 %} 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 %} From 85ca7d602b5abacfa04e4f0177071b35c689b074 Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Fri, 11 Sep 2015 18:36:16 +0200 Subject: [PATCH 8/8] Podbarveni submenu archiv --- mamweb/templates/flatpages/default.html | 8 +++++++- seminar/templates/seminar/archiv/base.html | 4 +--- seminar/templates/seminar/archiv/base_cisla.html | 8 ++++++++ seminar/templates/seminar/archiv/base_temata.html | 8 ++++++++ seminar/templates/seminar/archiv/base_ulohy.html | 10 ++++++++++ seminar/templates/seminar/archiv/cisla.html | 2 +- seminar/templates/seminar/archiv/cislo.html | 2 +- seminar/templates/seminar/archiv/problem.html | 2 +- seminar/templates/seminar/archiv/rocnik.html | 2 +- seminar/templates/seminar/archiv/submenu.html | 6 +++--- seminar/templates/seminar/archiv/temata.html | 2 +- 11 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 seminar/templates/seminar/archiv/base_cisla.html create mode 100644 seminar/templates/seminar/archiv/base_temata.html create mode 100644 seminar/templates/seminar/archiv/base_ulohy.html diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index 742626fe..d90bab4b 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -84,7 +84,13 @@ {% 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 %} 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 d6cdf441..bacb5e67 100644 --- a/seminar/templates/seminar/archiv/cisla.html +++ b/seminar/templates/seminar/archiv/cisla.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/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 %}