diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css
index 72c372fc..6e5b9488 100644
--- a/mamweb/static/css/mamweb.css
+++ b/mamweb/static/css/mamweb.css
@@ -698,12 +698,3 @@ div.nahledy_cisel {
div.nahledy_cisel div, div.nahledy_cisel img {
position: absolute;
}
-
-div.nahledy_cisel_radek img {
- margin: 3px 3px 6px 0px;
-}
-
-div.caption {
- clear: both;
- margin: 15px 0px 25px 0px;
-}
diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html
index 4d13b558..07833aa4 100644
--- a/seminar/templates/seminar/archiv/cisla.html
+++ b/seminar/templates/seminar/archiv/cisla.html
@@ -20,25 +20,6 @@
{% endfor %}
-
-
- {% for c in cisla %}
- {% ifchanged c.rocnik %}
- {% if not forloop.first %}
-
- {% endif %}
- Ročník {{ c.rocnik }}
-
- {% endifchanged %}
-
- {% empty %}
- Nejsou žádné ročníky
- {% endfor %}
-
-
-
{% endblock content %}
diff --git a/seminar/views.py b/seminar/views.py
index ebf232c8..b7cc136b 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -178,13 +178,10 @@ class ArchivView(generic.ListView):
vyska = 297 # px
sirka = 210 # px
- sirka_paddingu = 3 # px
cisla = Cislo.objects.filter(verejne_db=True)[:10]
png_dir = op.join(settings.MEDIA_ROOT, "cislo", "png")
- if not op.isdir(png_dir):
- os.makedirs(png_dir)
# seznam [(url obrázku, číslo)]
urls = []
@@ -195,29 +192,22 @@ class ArchivView(generic.ListView):
filename = os.path.split(c.pdf.file.name)[1].split(".")[0]
png_filename = "{}-{}px.png".format(filename, vyska)
- def vytvor_obrazek_titulky(strana, pdf_path, png_path, rotace=0):
+ # Pokud obrázek neexistuje nebo není aktuální, vytvoř jej
+ png_path = op.join(png_dir, png_filename)
+ if not op.exists(png_path) or \
+ op.getmtime(png_path) < op.getmtime(c.pdf.path):
+
subprocess.call([
"convert",
"-density", "180x180",
- "-geometry", "{}x{}".format(strana, strana),
+ "-geometry", "{}x{}".format(vyska, vyska),
"-background", "white",
"-flatten",
- "-rotate", str(rotace),
- "{}[0]".format(pdf_path), # titulní strana
+ "-rotate", str(90 * i),
+ "{}[0]".format(c.pdf.path), # titulní strana
png_path
])
- # Pokud obrázek neexistuje nebo není aktuální, vytvoř jej
- png_path = op.join(png_dir, png_filename)
- if not op.exists(png_path) or \
- op.getmtime(png_path) < op.getmtime(c.pdf.path):
- vytvor_obrazek_titulky(
- vyska - sirka_paddingu,
- c.pdf.path,
- png_path,
- rotace=i * 90
- )
-
urls.append(
(op.join(settings.MEDIA_URL, "cislo", "png", png_filename), c)
)
@@ -244,11 +234,9 @@ class ArchivView(generic.ListView):
cislo.verejne_url(), cislo.kod()
))
tags.append(
- ""
+ ""
.format(
img_url,
- sirka_paddingu,
50 if idx % 4 == 3 else 0,
50 if idx % 4 == 2 else 0,
50 if idx % 2 == 0 else 100,
@@ -260,28 +248,7 @@ class ArchivView(generic.ListView):
tags.append("")
spirala(urls, tags, 0)
- # náhledy v řádcích
-
- cisla = Cislo.objects.all().select_related("rocnik__rocnik")\
- .order_by("-rocnik__rocnik", "cislo")
- for c in cisla:
- if not c.pdf:
- continue
- png_filename_radek = "{}-{}.png".format(c.rocnik.rocnik, c.cislo)
-
- www_png_dir = op.join(settings.MEDIA_URL, "cislo", "png")
- png_path_radek = op.join(png_dir, png_filename_radek)
- if not op.exists(png_path_radek) or \
- op.getmtime(png_path_radek) < op.getmtime(c.pdf.path):
- vytvor_obrazek_titulky(
- 297 // 4,
- c.pdf.path,
- png_path_radek
- )
-
context["nahledy"] = "\n".join(tags)
- context["cisla"] = cisla
- context["www_png_dir"] = www_png_dir
return context