From d0f5c49628ad7ea2e427610ddfa8d33a178bb2d6 Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 10:55:24 +0200 Subject: [PATCH 01/12] =?UTF-8?q?Byval=C3=AD=20organiz=C3=A1to=C5=99i=20-?= =?UTF-8?q?=20p=C5=99id=C3=A1na=20mezera=20za=20odkaz=20na=20aktivn=C3=AD,?= =?UTF-8?q?=20odstran=C4=9Bn=20popis=20org=C5=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/cojemam/organizatori.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index 2d4d209c..6723418d 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -21,6 +21,7 @@
{% if not aktivni %} 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}} #} From 45bb3d5a3a4655c9d3cf9649725a181cd7866b4e Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 10:59:03 +0200 Subject: [PATCH 02/12] =?UTF-8?q?P=C5=99id=C3=A1no=20je=C5=A1t=C4=9B=20jed?= =?UTF-8?q?no=20od=C5=99=C3=A1dkov=C3=A1n=C3=AD=20pod=20odkaz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/cojemam/organizatori.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index 6723418d..e6d5e001 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -20,8 +20,8 @@ {% block content %}
{% if not aktivni %} - Aktivní organizátoři - + Aktivní organizátoři
+
{% endif %} {% for org in object_list %}

From b4405d031e82f0e139f01e52b7017e6343beb96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Sun, 13 Sep 2015 11:13:36 +0200 Subject: [PATCH 03/12] Nadpis do title --- mamweb/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" %} From 326d50a42fc03bf8c2dcfd2e71a3f2b387843494 Mon Sep 17 00:00:00 2001 From: Jethro Date: Sun, 13 Sep 2015 11:15:46 +0200 Subject: [PATCH 04/12] Nezobrazovat reseni kdyz neni a orgotext. --- seminar/templates/seminar/archiv/problem.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html index 87dd9bce..5bc11a40 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 %} + + {% if user.is_authenticated %}

Text - org

From 10a8471a6ce1d14852a8e94ca8a8d8fb961b8c4b Mon Sep 17 00:00:00 2001 From: Jethro Date: Sun, 13 Sep 2015 11:18:27 +0200 Subject: [PATCH 05/12] Pridano todo na autentikaci. --- seminar/templates/seminar/archiv/problem.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html index 5bc11a40..32f68911 100644 --- a/seminar/templates/seminar/archiv/problem.html +++ b/seminar/templates/seminar/archiv/problem.html @@ -27,7 +27,7 @@ {{ problem.text_reseni |safe }} {% endif %} - + {# TODO Kontrola, zda je uzivatel org #} {% if user.is_authenticated %}
From 681456f53fdd9856a4b40b0430530b1738b62d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Sun, 13 Sep 2015 11:23:40 +0200 Subject: [PATCH 06/12] Upraven title i pro flatpages --- mamweb/templates/flatpages/default.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index 92227356..419d5e3e 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 %} From 37a03cf1e2304ed340833d0381a31fee982f8391 Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 11:26:32 +0200 Subject: [PATCH 07/12] =?UTF-8?q?Zvyraz=C5=88ov=C3=A1n=C3=AD=20kontaktu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/templates/flatpages/default.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index 92227356..d46840f3 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -29,6 +29,7 @@ {% with "FAQ" as selected %} {% include "seminar/cojemam/submenu.html" %} {% endwith %} + {% elif "kontakt" in flatpage.url %} {% else %} {% include "seminar/cojemam/submenu.html" %} {% endif %} @@ -94,12 +95,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 %} From d3edba5c1509913f3bd6feab5f51862224b90719 Mon Sep 17 00:00:00 2001 From: Jethro Date: Sun, 13 Sep 2015 11:46:39 +0200 Subject: [PATCH 08/12] Odstraneno aktualni cislo. --- seminar/templates/seminar/zadani/AktualniZadani.html | 2 +- seminar/templates/seminar/zadani/submenu.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 13811acc..f8bfca78 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.

+

Aktuální číslo (PDF)

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