Merge remote branch 'klitynski/master'

[wolnelektury.git] / apps / sponsors / models.py

diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py
index 7b52b76..3c2ca02 100644 (file)
--- a/apps/sponsors/models.py
+++ b/apps/sponsors/models.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.template.loader import render_to_string
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.template.loader import render_to_string


@@ -11,14 +15,14 @@ class Sponsor(models.Model):
     _description = models.CharField(_('description'), blank=True, max_length=255)
     logo = ImageWithThumbnailsField(
         _('logo'),
     _description = models.CharField(_('description'), blank=True, max_length=255)
     logo = ImageWithThumbnailsField(
         _('logo'),

-        upload_to='sponsors/sponsor/logo',
+        upload_to='sponsorzy/sponsor/logo',

         thumbnail={
         thumbnail={

-            'size': (150, 75),
+            'size': (120, 60),

             'extension': 'png',
             'extension': 'png',

-            'options': ['upscale', 'pad', 'detail'],
+            'options': ['pad', 'detail'],

         })
     url = models.URLField(_('url'), blank=True, verify_exists=False)
         })
     url = models.URLField(_('url'), blank=True, verify_exists=False)

-    
+

     def __unicode__(self):
         return self.name
 
     def __unicode__(self):
         return self.name
 


@@ -31,10 +35,9 @@ class Sponsor(models.Model):
 
 class SponsorPage(models.Model):
     name = models.CharField(_('name'), max_length=120)
 
 class SponsorPage(models.Model):
     name = models.CharField(_('name'), max_length=120)

-    column_width = models.PositiveIntegerField(_('column width'), default=200)

     sponsors = JSONField(_('sponsors'), default={})
     _html = models.TextField(blank=True, editable=False)
     sponsors = JSONField(_('sponsors'), default={})
     _html = models.TextField(blank=True, editable=False)

-    
+

     def populated_sponsors(self):
         result = []
         for column in self.get_sponsors_value():
     def populated_sponsors(self):
         result = []
         for column in self.get_sponsors_value():


@@ -47,18 +50,17 @@ class SponsorPage(models.Model):
                     pass
             result.append(result_group)
         return result
                     pass
             result.append(result_group)
         return result

-    
+

     def html(self):
         return self._html
     html = property(fget=html)
 
     def save(self, *args, **kwargs):
         self._html = render_to_string('sponsors/page.html', {
     def html(self):
         return self._html
     html = property(fget=html)
 
     def save(self, *args, **kwargs):
         self._html = render_to_string('sponsors/page.html', {

-            'column_width': self.column_width,

             'sponsors': self.populated_sponsors(),
         })
         return super(SponsorPage, self).save(*args, **kwargs)
             'sponsors': self.populated_sponsors(),
         })
         return super(SponsorPage, self).save(*args, **kwargs)

-    
+

     def __unicode__(self):
         return self.name
 
     def __unicode__(self):
         return self.name