diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index bfdb87b0..1daecacc 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -437,7 +437,7 @@ div.zadani_azad_termin { float: none; width: 70%; margin-left: auto; - margin-right: auto + margin-right: auto; } } @@ -649,3 +649,11 @@ div.zadani_azad_termin { float: right; max-width: 42%; } + +.novinka_obrazek img { + margin-bottom: 15px; +} + +div.novinka_obrazek { + width: 100%; +} diff --git a/seminar/models.py b/seminar/models.py index 47f71e5f..c33488f1 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -757,6 +757,12 @@ class Novinky(models.Model): text = models.TextField('Text novinky', blank=True, null=True) obrazek = models.ImageField('Obrázek', upload_to='image_novinky/%Y/%m/%d/', null=True, blank=True) + obrazek_maly = ImageSpecField(source='obrazek', + processors=[ + ResizeToFit(350, 200, upscale=False) + ], + options={'quality': 95}) + autor = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name='Autor novinky') zverejneno = models.BooleanField('Zveřejněno', default="False") diff --git a/seminar/templates/seminar/novinky.html b/seminar/templates/seminar/novinky.html index c13407f5..66876fbd 100644 --- a/seminar/templates/seminar/novinky.html +++ b/seminar/templates/seminar/novinky.html @@ -7,15 +7,14 @@ {{ novinka.text | safe }} {# obrazek #} {% if novinka.obrazek %} -
- + {% if novinka.obrazek.height > novinka.obrazek_maly.height %} + + + {% else %} - {{novinka.obrazek.height}} + {% endif%} - '>
{% endif %} {# autor #}