From 8a5226279e5e055e13a5811248409a99dfe98a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20=22St=C3=ADnovlas=22=20Mus=C3=ADlek?= Date: Sun, 13 Sep 2015 18:43:02 +0200 Subject: [PATCH 01/10] =?UTF-8?q?Mobiln=C3=AD=20pati=C4=8Dka.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/static/css/mamweb.css | 49 ++++++++++++++++++++++++++++++------ mamweb/templates/base.html | 2 +- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index a075228e..4e886425 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -220,8 +220,10 @@ div.zadani_azad_termin { #footer p.organize { text-align: center; - margin-top: 60px; - margin-left: 90px; + margin-top: 50px; + margin-left: 30px; + display: inline-block; + max-width: 350px; } #footer img.logo-left { @@ -265,19 +267,20 @@ div.zadani_azad_termin { } #footer p.organize { - text-align: center; - margin-top: 170px; + margin-top: 50px; margin-left: 0px; + max-width: 80%; + min-height: 70px; } #footer img.logo-left { - padding: 50px 20px 0px 0px; - float: right; + padding: 50px 20px 0px 13px; + float: left; } #footer img.logo-right { - padding: 40px 0px 0px 20px; - float: left; + padding: 20px 0px 20px 0px; + float: none; } } @@ -357,4 +360,34 @@ div.zadani_azad_termin { div.menu.desktop { display: none; } + + #footer { + padding: 20px 40px 0px 40px; + min-height: 270px; + } + #footer-extra { + position: relative; + top: -10px; + height: 39px; + } + + #footer p.license { + font-size: 80%; + } + #footer p.organize { + margin: 20px 0px 0px 0px; + min-height: 70px; + width: 300px; + font-size: 90%; + } + + #footer img.logo-left { + padding: 20px 20px 0px 18px; + float: left; + } + + #footer img.logo-right { + padding: 30px 0px 20px 0px; + float: none; + } } diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index eaa5a2b2..582e31c4 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -104,8 +104,8 @@ From 6200f574acc74c4dfbef29821752197b91a5dc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20=22St=C3=ADnovlas=22=20Mus=C3=ADlek?= Date: Sun, 13 Sep 2015 18:45:10 +0200 Subject: [PATCH 02/10] =?UTF-8?q?Oprava=20p=C5=99eteku=20mobiln=C3=AD=20pa?= =?UTF-8?q?ti=C4=8Dky.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/static/css/mamweb.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 4e886425..06a814ad 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -375,14 +375,14 @@ div.zadani_azad_termin { font-size: 80%; } #footer p.organize { - margin: 20px 0px 0px 0px; - min-height: 70px; + margin: 30px 0px 0px 0px; + min-height: 80px; width: 300px; font-size: 90%; } #footer img.logo-left { - padding: 20px 20px 0px 18px; + padding: 30px 20px 0px 18px; float: left; } From 41bad3b09de07253452fba5a10acbc61e495ea35 Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 19:43:45 +0200 Subject: [PATCH 03/10] kotvy na ulohu dle oboru --- seminar/templates/seminar/zadani/AktualniZadani.html | 1 + 1 file changed, 1 insertion(+) diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 1398db59..e31a3d37 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -30,6 +30,7 @@ {% if not sada %}-->{% endif %} {# publikace jednotlivych zadani #} {% for problem in sada %} + {# 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 bd8c671b002b3db26dee4e84e3e6cd2b32a86fbe Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 19:48:59 +0200 Subject: [PATCH 04/10] Fix --- seminar/templates/seminar/zadani/AktualniZadani.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index e31a3d37..0a995bb8 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -30,7 +30,7 @@ {% if not sada %}-->{% endif %} {# publikace jednotlivych zadani #} {% for problem in sada %} - + {# 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 35ccc75f46c93574799e2f5971d70731fdb26ab7 Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Sun, 13 Sep 2015 19:48:53 +0200 Subject: [PATCH 05/10] Normalni pismo --- mamweb/static/css/mamweb.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 06a814ad..81078459 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -2,7 +2,7 @@ body { font-family: 'Open Sans', sans-serif; - font-weight: 300; + font-weight: 400; } .org-logged-in .mam-text-plugin { From 762329b79d56e3575aa3e4441d15d9e20d87c66c Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 19:56:45 +0200 Subject: [PATCH 06/10] =?UTF-8?q?P=C5=99id=C3=A1n=20forcyklus=20iteruj?= =?UTF-8?q?=C3=ADc=C3=AD=20p=C5=99es=20tagy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/zadani/AktualniZadani.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 0a995bb8..b8f8bea5 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -30,7 +30,9 @@ {% if not sada %}-->{% endif %} {# publikace jednotlivych zadani #} {% for problem in sada %} - + {% for tag in proble.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 880516a42f148fc5ec5c177e972909b45d1216ef Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 20:01:18 +0200 Subject: [PATCH 07/10] typo --- seminar/templates/seminar/zadani/AktualniZadani.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index b8f8bea5..2a9f10ef 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -30,7 +30,7 @@ {% if not sada %}-->{% endif %} {# publikace jednotlivych zadani #} {% for problem in sada %} - {% for tag in proble.zamereni %} + {% for tag in problem.zamereni %} {% endfor %} {# TODO použít {{problem.kod_v_rocniku}} ? vrací 4.u1 místo 4.1 #} From c10340726617b32289e9aaa100ff5b68b612e9c3 Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 20:04:46 +0200 Subject: [PATCH 08/10] Typo --- seminar/templates/seminar/zadani/AktualniZadani.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 2a9f10ef..216157b9 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -31,7 +31,7 @@ {# 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 }}

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 09/10] =?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 10/10] =?UTF-8?q?Fix:=20zobraz=20t=C3=A9mata=20v=20ro?= =?UTF-8?q?=C4=8Dn=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