From 451cafc4a1d89f9d47d71f19a54c720b0fc1ab61 Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 20:14:01 +0200 Subject: [PATCH 1/6] Dalsi pokus o tag --- 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 216157b9..2c1b4ea1 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 4c39b69e2974f020b4d1cc7b59db86781e2971a0 Mon Sep 17 00:00:00 2001 From: Matej Lieskovsky Date: Sun, 13 Sep 2015 20:37:36 +0200 Subject: [PATCH 2/6] Kotvy na zamereni --- seminar/templates/seminar/zadani/AktualniZadani.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 2c1b4ea1..d6c9b02f 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -30,8 +30,8 @@ {% if not sada %}-->{% endif %} {# publikace jednotlivych zadani #} {% for problem in sada %} - {% for tag in problem.zamereni %} - + {% for tag in problem.zamereni.names %} + {% 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 3fe137619baed83fb1fa943d5968c6fb93c2b4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Sun, 13 Sep 2015 20:43:40 +0200 Subject: [PATCH 3/6] =?UTF-8?q?Op=C4=9Btovn=C3=A9=20skryt=C3=AD=20odkaz?= =?UTF-8?q?=C5=AF=20na=20=C5=99e=C5=A1.=20a=20org.=20=C4=8Dl=C3=A1nky?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/clanky/submenu.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seminar/templates/seminar/clanky/submenu.html b/seminar/templates/seminar/clanky/submenu.html index 5f0d78a2..b544520b 100644 --- a/seminar/templates/seminar/clanky/submenu.html +++ b/seminar/templates/seminar/clanky/submenu.html @@ -3,8 +3,8 @@ From 2b1564c4352341b8d850cdcd4fc70f673596f749 Mon Sep 17 00:00:00 2001 From: Jethro Date: Sun, 13 Sep 2015 20:54:43 +0200 Subject: [PATCH 4/6] Galerie jeste nejsou, sk->cz --- seminar/templates/seminar/archiv/cisla.html | 2 +- seminar/templates/seminar/soustredeni/seznam_soustredeni.html | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html index bacb5e67..c5449467 100644 --- a/seminar/templates/seminar/archiv/cisla.html +++ b/seminar/templates/seminar/archiv/cisla.html @@ -12,7 +12,7 @@ {% for r in object_list %}
  • Ročník {{ r }} {% empty %} - Niesú žiadne ročníky + Nejsou žádné ročníky {% endfor %} diff --git a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html index a6672c95..b434ad24 100644 --- a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html +++ b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html @@ -14,6 +14,9 @@ {% endblock %}{% endblock %} {% block content %} + + Na galeriích ze soustředění a dalších informacích ještě pracujeme. + {#% if user.is_authenticated %#}{# PRACUJE SE STRANKA #} From 2c50f676e34d33aad4fb1389f1283730dec4799f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Sun, 13 Sep 2015 21:04:56 +0200 Subject: [PATCH 5/6] =?UTF-8?q?Skryt=20odkaz=20na=20archiv=20v=C3=BDsledko?= =?UTF-8?q?v=C3=BDch=20listin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/archiv/submenu.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/templates/seminar/archiv/submenu.html b/seminar/templates/seminar/archiv/submenu.html index c4951f50..f9c1d450 100644 --- a/seminar/templates/seminar/archiv/submenu.html +++ b/seminar/templates/seminar/archiv/submenu.html @@ -5,7 +5,7 @@
  • Čísla {# TODO zprovoznit až budou témata v db
  • Témata #} {# TODO zprovoznit až budou úlohy v db
  • Úlohy #} -
  • Výsledkové listiny + {#
  • Výsledkové listiny #} From de63f78c1c005a7a2b29bb6727185d8bed106032 Mon Sep 17 00:00:00 2001 From: Jethro Date: Sun, 13 Sep 2015 21:09:20 +0200 Subject: [PATCH 6/6] Graf an titulce. --- seminar/templates/seminar/titulnistrana.html | 31 +++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html index 1e72ae00..a8d76481 100644 --- a/seminar/templates/seminar/titulnistrana.html +++ b/seminar/templates/seminar/titulnistrana.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% load humanize %} +{% load staticfile %} {% block content %} @@ -32,10 +33,38 @@ {% endif %} {% endif %} --> - + {% endif %} +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    Co je na nás skvělé?

    Zjistit víc!