diff --git a/seminar/templates/seminar/archiv/base_cisla.html b/seminar/templates/seminar/archiv/base_cisla.html deleted file mode 100644 index deb371eb..00000000 --- a/seminar/templates/seminar/archiv/base_cisla.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "seminar/archiv/base.html" %} - -{% block submenu %} - {% with "cisla" as selected %} - {% include "seminar/archiv/submenu.html" %} - {% endwith %} -{% endblock %} - diff --git a/seminar/templates/seminar/archiv/base_temata.html b/seminar/templates/seminar/archiv/base_temata.html deleted file mode 100644 index 47089bbf..00000000 --- a/seminar/templates/seminar/archiv/base_temata.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "seminar/archiv/base.html" %} - -{% block submenu %} - {% with "temata" as selected %} - {% include "seminar/archiv/submenu.html" %} - {% endwith %} -{% endblock %} - diff --git a/seminar/templates/seminar/archiv/base_ulohy.html b/seminar/templates/seminar/archiv/base_ulohy.html deleted file mode 100644 index 0dcd546a..00000000 --- a/seminar/templates/seminar/archiv/base_ulohy.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "seminar/archiv/base.html" %} - -{% block menu_archiv %}selected{% endblock %} - -{% block submenu %} - {% with "ulohy" as selected %} - {% include "seminar/archiv/submenu.html" %} - {% endwith %} -{% endblock %} - diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html index 07833aa4..fbb19263 100644 --- a/seminar/templates/seminar/archiv/cisla.html +++ b/seminar/templates/seminar/archiv/cisla.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base_cisla.html" %} +{% extends "seminar/archiv/base.html" %} {% block content %}
diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html index d3cc50bb..955988f1 100644 --- a/seminar/templates/seminar/archiv/cislo.html +++ b/seminar/templates/seminar/archiv/cislo.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base_cisla.html" %} +{% extends "seminar/archiv/base.html" %} {% block content %}
diff --git a/seminar/templates/seminar/archiv/prispevek.html b/seminar/templates/seminar/archiv/prispevek.html index fdf2b3f2..998eb4e3 100644 --- a/seminar/templates/seminar/archiv/prispevek.html +++ b/seminar/templates/seminar/archiv/prispevek.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base_temata.html" %} +{% extends "seminar/archiv/base.html" %} {% block title %} {{prispevek.nazev}} diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html index bc921203..91c67c77 100644 --- a/seminar/templates/seminar/archiv/problem.html +++ b/seminar/templates/seminar/archiv/problem.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base_ulohy.html" %} +{% extends "seminar/archiv/base.html" %} {% load comments %} diff --git a/seminar/templates/seminar/archiv/rocnik.html b/seminar/templates/seminar/archiv/rocnik.html index e5289277..64c4029d 100644 --- a/seminar/templates/seminar/archiv/rocnik.html +++ b/seminar/templates/seminar/archiv/rocnik.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base_cisla.html" %} +{% extends "seminar/archiv/base.html" %} {% block content %}
diff --git a/seminar/templates/seminar/archiv/temata.html b/seminar/templates/seminar/archiv/temata.html index 21aebb22..ba2a6206 100644 --- a/seminar/templates/seminar/archiv/temata.html +++ b/seminar/templates/seminar/archiv/temata.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base_temata.html" %} +{% extends "seminar/archiv/base.html" %} {% block content %}

diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 97747523..e3ce5152 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -300,8 +300,11 @@ class ArchivView(generic.ListView): vyska = 297 # px sirka = 210 # px - cisla = Cislo.objects.filter(verejne_db=True)[:10] + # nejnovějších 10 zveřejněných čísel + # cisla = Cislo.objects.filter(verejne_db=True)[:10] + cisla = Cislo.objects.filter(poradi=1)[:10] + # op == os.path, udělá z argumentů cestu png_dir = op.join(settings.MEDIA_ROOT, "cislo", "png") # seznam [(url obrázku, číslo)] @@ -320,8 +323,8 @@ class ArchivView(generic.ListView): subprocess.call([ "convert", - "-density", "180x180", - "-geometry", "{}x{}".format(vyska, vyska), + "-density", "300x300", + "-geometry", "{}x{}".format(vyska, sirka), "-background", "white", "-flatten", "-rotate", str(90 * i),