diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index 11494a63..c61ff124 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -2,7 +2,7 @@ - {% block title %}Seminář M&M{% endblock title %} + {% block title %}{% block nadpis1a %}{% endblock %} – Korespondenční seminář M&M{% endblock title %} {% render_block "css" %} diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index 92227356..989c5b9d 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% block title %}{{ flatpage.title }}{% endblock title %} - {% block nadpis1a %}{% block nadpis1b%} {{ flatpage.title }} {% endblock %}{% endblock %} @@ -29,6 +27,7 @@ {% with "FAQ" as selected %} {% include "seminar/cojemam/submenu.html" %} {% endwith %} + {% elif "kontakt" in flatpage.url %} {% else %} {% include "seminar/cojemam/submenu.html" %} {% endif %} @@ -73,6 +72,10 @@ {% 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 %} @@ -94,12 +97,12 @@ {% endblock %} {# zvirazneni menu #} -{% block menu_uvod %}{% if "/co-je-MaM/" in flatpage.url %}selected{% endif %}{% endblock %} +{% 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 "/odevzdat-reseni/" 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 %} diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html index 87dd9bce..32f68911 100644 --- a/seminar/templates/seminar/archiv/problem.html +++ b/seminar/templates/seminar/archiv/problem.html @@ -22,11 +22,13 @@

Zadání

{{ problem.text_zadani |safe }} + {% if problem.text_reseni %} +

Řešení

+ {{ problem.text_reseni |safe }} + {% endif %} -

Řešení

- {{ problem.text_reseni |safe }} - - {% if True %} + {# TODO Kontrola, zda je uzivatel org #} + {% if user.is_authenticated %}

Text - org

diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index 2d4d209c..e6d5e001 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -20,7 +20,8 @@ {% block content %}
{% if not aktivni %} - Aktivní organizátoři + Aktivní organizátoři
+
{% endif %} {% for org in object_list %}

@@ -58,7 +59,7 @@ {% for znak in org.user.email %}{% if znak == '@' %} <zavináč> {% elif znak == '.' %} <tečka> {% else %}{{znak}}{% endif %}{% endfor %} {% endif %} - {{org.strucny_popis_organizatora}} + {# {{org.strucny_popis_organizatora}} #} diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 13811acc..1398db59 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -22,7 +22,7 @@ {% endif %} {#TODO a co speciální deadline pro účast na soustředění? #} -

Celé aktuální číslo naleznete zde.

+

Celé aktuální číslo v PDF

{% for sada in jednorazove_problemy %} {# podnadpisy, kdyz neni zakomentuje se nadpis #} {% if not sada %}