From 671c29c88f012fc7f9834ed8cff0b6506541d8dc Mon Sep 17 00:00:00 2001 From: Jonas Havelka Date: Sun, 20 Sep 2020 12:41:56 +0200 Subject: [PATCH] =?UTF-8?q?Vy=C4=8Di=C5=A1t=C4=9Bn=C3=AD=20submenu,=20head?= =?UTF-8?q?er=C5=AF=20a=20base=20v=20templatech?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- galerie/templates/galerie/Base.html | 6 - galerie/templates/galerie/Galerie.html | 2 +- galerie/templates/galerie/GalerieNahled.html | 2 +- galerie/templates/galerie/GalerieNew.html | 2 +- korektury/templates/korektury/base.html | 13 --- korektury/templates/korektury/help.html | 8 +- korektury/templates/korektury/seznam.html | 6 +- korektury/templates/korektury/submenu.html | 13 --- mamweb/templates/flatpages/default.html | 104 +----------------- .../prednasky/metaseznam_prednasek.html | 4 - .../templates/prednasky/seznam_prednasek.html | 4 - seminar/templates/seminar/archiv/base.html | 6 - seminar/templates/seminar/archiv/cisla.html | 2 +- seminar/templates/seminar/archiv/cislo.html | 2 +- .../seminar/archiv/cislo_obalkovani.html | 2 +- .../templates/seminar/archiv/prispevek.html | 2 +- seminar/templates/seminar/archiv/problem.html | 2 +- seminar/templates/seminar/archiv/rocnik.html | 2 +- seminar/templates/seminar/archiv/temata.html | 2 +- seminar/templates/seminar/clanky/base.html | 10 -- .../seminar/clanky/organizatorske_clanky.html | 6 - .../seminar/clanky/resitelske_clanky.html | 8 -- seminar/templates/seminar/cojemam/base.html | 6 - .../seminar/cojemam/organizatori.html | 11 +- seminar/templates/seminar/profil/edit.html | 2 +- seminar/templates/seminar/profil/login.html | 2 +- seminar/templates/seminar/profil/logout.html | 2 +- .../seminar/profil/nahraj_reseni.html | 2 +- .../templates/seminar/profil/prihlaska.html | 2 +- seminar/templates/seminar/profil/resitel.html | 2 +- .../templates/seminar/soustredeni/base.html | 6 - .../soustredeni/seznam_soustredeni.html | 9 +- seminar/templates/seminar/treenode.html | 2 +- .../seminar/zadani/AktualniVysledkovka.html | 9 +- .../seminar/zadani/AktualniZadani.html | 8 +- seminar/templates/seminar/zadani/Temata.html | 9 +- seminar/templates/seminar/zadani/base.html | 10 -- 37 files changed, 25 insertions(+), 265 deletions(-) delete mode 100644 galerie/templates/galerie/Base.html delete mode 100644 korektury/templates/korektury/base.html delete mode 100644 korektury/templates/korektury/submenu.html delete mode 100644 seminar/templates/seminar/archiv/base.html delete mode 100644 seminar/templates/seminar/clanky/base.html delete mode 100644 seminar/templates/seminar/cojemam/base.html delete mode 100644 seminar/templates/seminar/soustredeni/base.html delete mode 100644 seminar/templates/seminar/zadani/base.html diff --git a/galerie/templates/galerie/Base.html b/galerie/templates/galerie/Base.html deleted file mode 100644 index 61f96eb4..00000000 --- a/galerie/templates/galerie/Base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} - -{# TODO predelat pres context processor #} -{% block header %}soustredeni{% endblock %} -{% block menu_soustredeni %}selected{% endblock %} -{% block submenu %}{% include 'seminar/soustredeni/submenu.html' %}{% endblock %} diff --git a/galerie/templates/galerie/Galerie.html b/galerie/templates/galerie/Galerie.html index c23c6c42..b2dfe994 100644 --- a/galerie/templates/galerie/Galerie.html +++ b/galerie/templates/galerie/Galerie.html @@ -1,4 +1,4 @@ -{% extends "galerie/Base.html" %} +{% extends "base.html" %} {% block nadpis1a %} diff --git a/galerie/templates/galerie/GalerieNahled.html b/galerie/templates/galerie/GalerieNahled.html index d1c6873e..ec0d5f67 100644 --- a/galerie/templates/galerie/GalerieNahled.html +++ b/galerie/templates/galerie/GalerieNahled.html @@ -1,4 +1,4 @@ -{% extends "galerie/Base.html" %} +{% extends "base.html" %} {% block nadpis1a %} Galerie {{galerie.nazev}} diff --git a/galerie/templates/galerie/GalerieNew.html b/galerie/templates/galerie/GalerieNew.html index 38237d86..2da23ece 100644 --- a/galerie/templates/galerie/GalerieNew.html +++ b/galerie/templates/galerie/GalerieNew.html @@ -1,4 +1,4 @@ -{% extends "galerie/Base.html" %} +{% extends "base.html" %} {% block title %}{% block nadpis1a %} Vytvářím novou galerii diff --git a/korektury/templates/korektury/base.html b/korektury/templates/korektury/base.html deleted file mode 100644 index 886a15e1..00000000 --- a/korektury/templates/korektury/base.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "base.html" %} - -{% block submenu %} - {% include "korektury/submenu.html" %} -{% endblock %} - -{% block content %} -{# blok do kterého se nacita text, v pripade jinyhc templatu obalit vlastnim blokem #} -{% endblock %} - -{% block title %} -{# blok pro titulek stranky #} -{% endblock %} diff --git a/korektury/templates/korektury/help.html b/korektury/templates/korektury/help.html index f2ddafb9..3cce7a4f 100644 --- a/korektury/templates/korektury/help.html +++ b/korektury/templates/korektury/help.html @@ -1,10 +1,4 @@ -{% extends "korektury/base.html" %} - -{% block submenu %} - {% with "help" as selected %} - {% include "korektury/submenu.html" %} - {% endwith %} -{% endblock %} +{% extends "base.html" %} {% load staticfiles %} diff --git a/korektury/templates/korektury/seznam.html b/korektury/templates/korektury/seznam.html index 61f6fff7..57823f6e 100644 --- a/korektury/templates/korektury/seznam.html +++ b/korektury/templates/korektury/seznam.html @@ -1,10 +1,6 @@ -{% extends "korektury/base.html" %} +{% extends "base.html" %} {% load staticfiles %} -{% block submenu %} - {% include "korektury/submenu.html" %} -{% endblock %} - {% block script%} {% endblock %} diff --git a/korektury/templates/korektury/submenu.html b/korektury/templates/korektury/submenu.html deleted file mode 100644 index 0a5ed988..00000000 --- a/korektury/templates/korektury/submenu.html +++ /dev/null @@ -1,13 +0,0 @@ -{% with "/korektury" as cesta %} - - - -{% endwith %} - - diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index b5d2d24d..0a26ca27 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -8,106 +8,4 @@
{{ flatpage.content }}
-{% endblock content %} - -{# nahraj spravne submenu #} -{% block submenu %} - {# co-je-MaM #} - {% if "/co-je-MaM/" in flatpage.url %} - {% 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 "odmeny" in flatpage.url %} - {% with "odmeny" as selected %} - {% include "seminar/cojemam/submenu.html" %} - {% endwith %} - {% elif "FAQ" in flatpage.url %} - {% with "FAQ" as selected %} - {% include "seminar/cojemam/submenu.html" %} - {% endwith %} - {% elif "kontakt" in flatpage.url %} - {% else %} - {% include "seminar/cojemam/submenu.html" %} - {% endif %} - {% endif %} - {# soustredeni #} - {% if "/soustredeni/" in flatpage.url %} - {% 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 %} - {% if "/aktualni-cislo/" in flatpage.url %} - {% with "aktualni-cislo" as selected %} - {% include "seminar/zadani/submenu.html" %} - {% endwith %} - {% elif "/vysledkova-listina/" in flatpage.url %} - {% with "vysledkova-listina" as selected %} - {% include "seminar/zadani/submenu.html" %} - {% endwith %} - {% else %} - {% include "seminar/zadani/submenu.html" %} - {% endif %} - {% endif %} - {# clanky #} - {% if "/clanky/" in flatpage.url %} - {% 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 %} - {% elif "/jak-psat-vedecky-clanek/" in flatpage.url %} - {% with "jak-psat-vedecky-clanek" as selected %} - {% include "seminar/clanky/submenu.html" %} - {% endwith %} - {% else %} - {% include "seminar/clanky/submenu.html" %} - {% endif %} - {% endif %} - {# archiv #} - {% if "/archiv/" in flatpage.url %} - {% if "/ulohy/" in flatpage.url %} - {% with "ulohy" as selected %} - {% include "seminar/archiv/submenu.html" %} - {% endwith %} - {% elif "/vysledky/" in flatpage.url %} - {% with "vysledky" as selected %} - {% include "seminar/archiv/submenu.html" %} - {% endwith %} - {% else %} - {% include "seminar/archiv/submenu.html" %} - {% endif %} - {% endif %} -{% endblock %} - -{# zvirazneni menu #} -{% block menu_uvod %}{% if not "/kontakt/" in flatpage.url %}{% if "/co-je-MaM/" in flatpage.url %}selected{% endif %}{% 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 %} -{% block menu_odevzdat %}{% if "/kontakt/" in flatpage.url %}selected{% endif %}{% endblock %} - -{# zmena titulniho obrazku #} -{% block header %}{% if "/co-je-MaM/" in flatpage.url %}cojemam{% elif "/soustredeni/" in flatpage.url %}soustredeni{% elif "/zadani/" in flatpage.url %}zadani{% elif "/clanky/" in flatpage.url %}clanky{% elif "/archiv/" in flatpage.url %}archiv{% else %}odeslat{% endif %}{% endblock header %} - -{# TODO zvirazneni submenu #} +{% endblock content %} \ No newline at end of file diff --git a/prednasky/templates/prednasky/metaseznam_prednasek.html b/prednasky/templates/prednasky/metaseznam_prednasek.html index d3202f9d..ed25abe2 100644 --- a/prednasky/templates/prednasky/metaseznam_prednasek.html +++ b/prednasky/templates/prednasky/metaseznam_prednasek.html @@ -1,9 +1,5 @@ {% extends "prednasky/base.html" %} - -{% block header %}hlasovani{% endblock %} - - {% block content %}

{% block nadpis1a %}{% block nadpis1b %}Hlasování o přednáškách{% endblock %}{% endblock %}

{# Projdi vsechny seznamy #} diff --git a/prednasky/templates/prednasky/seznam_prednasek.html b/prednasky/templates/prednasky/seznam_prednasek.html index 91261242..9a78c0b6 100644 --- a/prednasky/templates/prednasky/seznam_prednasek.html +++ b/prednasky/templates/prednasky/seznam_prednasek.html @@ -1,9 +1,5 @@ {% extends "prednasky/base.html" %} - -{% block header %}seznam_prednasek{% endblock %} - - {% block content %}

{% block nadpis1a %}Průběžné výsledky hlasování{% endblock %}

diff --git a/seminar/templates/seminar/archiv/base.html b/seminar/templates/seminar/archiv/base.html deleted file mode 100644 index d1401d28..00000000 --- a/seminar/templates/seminar/archiv/base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} - -{% block menu_archiv %}selected{% endblock %} - -{# zmena fotky #}{% block header %}archiv{% endblock %} - diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html index f931ee49..62442376 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 "base.html" %} {% block content %}
diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html index 46c62094..0818b7d0 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 "base.html" %} {% block content %}
diff --git a/seminar/templates/seminar/archiv/cislo_obalkovani.html b/seminar/templates/seminar/archiv/cislo_obalkovani.html index dd0b0796..e830a23e 100644 --- a/seminar/templates/seminar/archiv/cislo_obalkovani.html +++ b/seminar/templates/seminar/archiv/cislo_obalkovani.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% block content %}

diff --git a/seminar/templates/seminar/archiv/prispevek.html b/seminar/templates/seminar/archiv/prispevek.html index 998eb4e3..141ae709 100644 --- a/seminar/templates/seminar/archiv/prispevek.html +++ b/seminar/templates/seminar/archiv/prispevek.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% block title %} {{prispevek.nazev}} diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html index ac17353a..1aa94219 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 "base.html" %} {% load comments %} diff --git a/seminar/templates/seminar/archiv/rocnik.html b/seminar/templates/seminar/archiv/rocnik.html index da4789e2..1c039063 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 "base.html" %} {% block content %}
diff --git a/seminar/templates/seminar/archiv/temata.html b/seminar/templates/seminar/archiv/temata.html index 53e8699c..4c25d78b 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 "base.html" %} {% block content %}

diff --git a/seminar/templates/seminar/clanky/base.html b/seminar/templates/seminar/clanky/base.html deleted file mode 100644 index 844a99d5..00000000 --- a/seminar/templates/seminar/clanky/base.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "base.html" %} - -{% block menu_clanky %}selected{% endblock %} - -{# zmena fotky #}{% block header %}clanky{% endblock %} - -{% block submenu %} - {% include "seminar/clanky/submenu.html" %} -{% endblock %} - diff --git a/seminar/templates/seminar/clanky/organizatorske_clanky.html b/seminar/templates/seminar/clanky/organizatorske_clanky.html index 53f74009..f2e00104 100644 --- a/seminar/templates/seminar/clanky/organizatorske_clanky.html +++ b/seminar/templates/seminar/clanky/organizatorske_clanky.html @@ -1,11 +1,5 @@ {% extends 'seminar/clanky/resitelske_clanky.html' %} -{% block submenu %} - {% with "org" as selected %} - {% include "seminar/clanky/submenu.html" %} - {% endwith %} -{% endblock submenu %} - {% block nadpis1a %}{% block nadpis1b %} Organizátorské články {% endblock %}{% endblock %} diff --git a/seminar/templates/seminar/clanky/resitelske_clanky.html b/seminar/templates/seminar/clanky/resitelske_clanky.html index 84089753..94fb27cc 100644 --- a/seminar/templates/seminar/clanky/resitelske_clanky.html +++ b/seminar/templates/seminar/clanky/resitelske_clanky.html @@ -1,13 +1,5 @@ {% extends 'base.html' %} -{% block menu_clanky %}selected{% endblock %} - -{% block submenu %} - {% with "resitel" as selected %} - {% include "seminar/clanky/submenu.html" %} - {% endwith %} -{% endblock submenu %} - {% block content %}

diff --git a/seminar/templates/seminar/cojemam/base.html b/seminar/templates/seminar/cojemam/base.html deleted file mode 100644 index 9a9c01c0..00000000 --- a/seminar/templates/seminar/cojemam/base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} - -{% block submenu %} - {% include "seminar/cojemam/submenu.html" %} -{% endblock %} - diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index 5b147aa5..8f6ffc66 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -1,4 +1,4 @@ -{% extends "seminar/cojemam/base.html" %} +{% extends "base.html" %} {% block nadpis1a %}{% block nadpis1b %} {% if aktivni %} Organizátoři @@ -7,15 +7,6 @@ {% endif %} {% endblock%}{% endblock%} -{# podbarveni menu a submenu #} -{% block menu_uvod %}selected{% endblock %} -{% block submenu %} - {% with "org" as selected %} - {% include "seminar/cojemam/submenu.html" %} - {% endwith %} -{% endblock %} - -{# zmena fotky #}{% block header %}cojemam{% endblock %} {% block content %} diff --git a/seminar/templates/seminar/profil/edit.html b/seminar/templates/seminar/profil/edit.html index 175f3859..827e26f1 100644 --- a/seminar/templates/seminar/profil/edit.html +++ b/seminar/templates/seminar/profil/edit.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} {% block script %} diff --git a/seminar/templates/seminar/profil/login.html b/seminar/templates/seminar/profil/login.html index 0263b9a6..63d16eed 100644 --- a/seminar/templates/seminar/profil/login.html +++ b/seminar/templates/seminar/profil/login.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} diff --git a/seminar/templates/seminar/profil/logout.html b/seminar/templates/seminar/profil/logout.html index ab41a8c8..d845dc3a 100644 --- a/seminar/templates/seminar/profil/logout.html +++ b/seminar/templates/seminar/profil/logout.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} diff --git a/seminar/templates/seminar/profil/nahraj_reseni.html b/seminar/templates/seminar/profil/nahraj_reseni.html index dddc5e19..9dfda710 100644 --- a/seminar/templates/seminar/profil/nahraj_reseni.html +++ b/seminar/templates/seminar/profil/nahraj_reseni.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} {% block script %} diff --git a/seminar/templates/seminar/profil/prihlaska.html b/seminar/templates/seminar/profil/prihlaska.html index d2f23016..125a5ffb 100644 --- a/seminar/templates/seminar/profil/prihlaska.html +++ b/seminar/templates/seminar/profil/prihlaska.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} {% block script %} diff --git a/seminar/templates/seminar/profil/resitel.html b/seminar/templates/seminar/profil/resitel.html index 3a38a085..8f29d246 100644 --- a/seminar/templates/seminar/profil/resitel.html +++ b/seminar/templates/seminar/profil/resitel.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} diff --git a/seminar/templates/seminar/soustredeni/base.html b/seminar/templates/seminar/soustredeni/base.html deleted file mode 100644 index 4fb36650..00000000 --- a/seminar/templates/seminar/soustredeni/base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} - -{% block submenu %} - {% include "seminar/soustredeni/submenu.html" %} -{% endblock %} - diff --git a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html index 2f2a98ca..9ddbcca9 100644 --- a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html +++ b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html @@ -1,11 +1,4 @@ -{% extends "seminar/soustredeni/base.html" %} - -{% block menu_soustredeni %}selected{% endblock %} -{% block submenu %} - {% with "probehlo" as selected %} - {% include "seminar/soustredeni/submenu.html" %} - {% endwith %} -{% endblock submenu %} +{% extends "base.html" %} {# zmena fotky #}{% block header %}soustredeni{% endblock %} diff --git a/seminar/templates/seminar/treenode.html b/seminar/templates/seminar/treenode.html index ca4df002..9da13c17 100644 --- a/seminar/templates/seminar/treenode.html +++ b/seminar/templates/seminar/treenode.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% load comments %} diff --git a/seminar/templates/seminar/zadani/AktualniVysledkovka.html b/seminar/templates/seminar/zadani/AktualniVysledkovka.html index 0f2ad4f4..387ad949 100644 --- a/seminar/templates/seminar/zadani/AktualniVysledkovka.html +++ b/seminar/templates/seminar/zadani/AktualniVysledkovka.html @@ -1,11 +1,4 @@ -{% extends "seminar/zadani/base.html" %} - -{% block submenu %} - {% with "vysledkova-listina" as selected %} - {% include 'seminar/zadani/submenu.html' %} - {% endwith %} -{% endblock submenu %} - +{% extends "base.html" %} {% block content %} {% with nastaveni.aktualni_rocnik as rocnik %} diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 31e2ca89..770ac603 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -1,10 +1,4 @@ -{% extends "seminar/zadani/base.html" %} - -{% block submenu %} - {% with "aktualni" as selected %} - {% include 'seminar/zadani/submenu.html' %} - {% endwith %} -{% endblock submenu %} +{% extends "base.html" %} {% block nadpis1a %}{% block nadpis1b %} Aktuální zadání diff --git a/seminar/templates/seminar/zadani/Temata.html b/seminar/templates/seminar/zadani/Temata.html index 9b4e0156..0fcd3350 100644 --- a/seminar/templates/seminar/zadani/Temata.html +++ b/seminar/templates/seminar/zadani/Temata.html @@ -1,11 +1,4 @@ -{% extends "seminar/zadani/base.html" %} - -{% block submenu %} - {% with "temata" as selected %} - {% include 'seminar/zadani/submenu.html' %} - {% endwith %} -{% endblock submenu %} - +{% extends "base.html" %} {% block content %} {% with nastaveni.aktualni_rocnik as ar %} diff --git a/seminar/templates/seminar/zadani/base.html b/seminar/templates/seminar/zadani/base.html deleted file mode 100644 index a1f223cd..00000000 --- a/seminar/templates/seminar/zadani/base.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "base.html" %} - -{% block menu_zadani %}selected{% endblock %} - -{# zmena fotky #}{% block header %}zadani{% endblock %} - -{% block submenu %} - {% include 'seminar/zadani/submenu.html' %} -{% endblock submenu %} -