From cac7e2515e782f2a617fb609931424a606854998 Mon Sep 17 00:00:00 2001
From: Aneta
Date: Sun, 13 Sep 2015 18:01:12 +0200
Subject: [PATCH 1/3] =?UTF-8?q?=C3=9Aprava=20titulky,=20smaz=C3=A1n=C3=AD?=
=?UTF-8?q?=20MKS,=20zm=C4=9Bna=20tituln=C3=ADho=20nadpisu.=20A.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
seminar/templates/seminar/titulnistrana.html | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html
index 18c6184b..a432b175 100644
--- a/seminar/templates/seminar/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana.html
@@ -6,12 +6,12 @@
{# Uvitaci text #}
{% block nadpis1a %}{% block nadpis1b %}
- Tož vitajte!
+ Vítej!
{% endblock %}{% endblock %}
- Do konce odeslání řešení zbývá:
+ Do termínu odeslání řešení zbývá:
{# TODO humanize #}
{{cas_do_konce_dni}} dní
{% if cas_do_konce_dni < 5 %}
@@ -25,12 +25,6 @@
{% endif %}
-
- My jsme M&M, mezioborový korespondenční seminář.
- Mezioborový: matematika, fyzika, informatika.
- Korespondeční: vydáváme časopis M&M.
- Seminář: organizujeme odborná soustředění.
-
From 2427bb7a09c7c98b05ec760b97cb4afead872a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?=
Date: Sun, 13 Sep 2015 20:19:42 +0200
Subject: [PATCH 2/3] =?UTF-8?q?Nezobrazuj=20tagy=20a=20odkaz=20na=20pdf,?=
=?UTF-8?q?=20pokud=20nen=C3=AD=20nahran=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
padalo to
---
seminar/templates/seminar/zadani/AktualniZadani.html | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html
index 216157b9..1263cf4c 100644
--- a/seminar/templates/seminar/zadani/AktualniZadani.html
+++ b/seminar/templates/seminar/zadani/AktualniZadani.html
@@ -22,7 +22,9 @@
{% endif %}
{#TODO a co speciální deadline pro účast na soustředění? #}
- Celé aktuální číslo v PDF
+ {% if ac.pdf %}
+ Aktuální číslo v PDF
+ {% endif %}
{% for sada in jednorazove_problemy %}
{# podnadpisy, kdyz neni zakomentuje se nadpis #}
{% if not sada %}{% endif %}
{# publikace jednotlivych zadani #}
{% for problem in sada %}
- {% for tag in problem.zamereni %}
-
- {% endfor %}
{# TODO použít {{problem.kod_v_rocniku}} ? vrací 4.u1 místo 4.1 #}
{{problem.cislo_zadani.cislo}}.{{problem.kod}} {{problem.nazev}} {{ problem.body_v_zavorce }}
{% autoescape off %}{{problem.text_zadani}}{% endautoescape %}
From f1c686774ca4484b3e9bb9badba562be7be80610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?=
Date: Sun, 13 Sep 2015 20:28:38 +0200
Subject: [PATCH 3/3] =?UTF-8?q?Fix:=20zobraz=20t=C3=A9mata=20v=20ro=C4=8Dn?=
=?UTF-8?q?=C3=ADku,=20i=20kdy=C5=BE=20nem=C3=A1=20v=C3=BDsledky?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
seminar/views.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/seminar/views.py b/seminar/views.py
index 8762861b..955668e4 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -166,10 +166,12 @@ class RocnikView(generic.DetailView):
vysledkovka.append(v)
- temata_v_rocniku = Problem.objects.filter(typ=Problem.TYP_TEMA, cislo_zadani__rocnik=context['rocnik']).order_by('kod')
context['vysledkovka'] = vysledkovka
- context['temata_v_rocniku'] = temata_v_rocniku
+
+ temata_v_rocniku = Problem.objects.filter(typ=Problem.TYP_TEMA, cislo_zadani__rocnik=context['rocnik']).order_by('kod')
+ context['temata_v_rocniku'] = temata_v_rocniku
+
return context