More Py3 compatibility fixes.

[wolnelektury.git] / src / social / models.py

diff --git a/src/social/models.py b/src/social/models.py
index 8902807..b9417ba 100644 (file)
--- a/src/social/models.py
+++ b/src/social/models.py
@@ -12,26 +12,24 @@ from catalogue.models import Book
 
 class Cite(models.Model):
     book = models.ForeignKey(Book, verbose_name=_('book'), null=True, blank=True)
-    text = models.TextField(_('text'))
-    small = models.BooleanField(_('small'), default=False,
-        help_text=_('Make this cite display smaller.'))
+    text = models.TextField(_('text'), blank=True)
+    small = models.BooleanField(_('small'), default=False, help_text=_('Make this cite display smaller.'))
     vip = models.CharField(_('VIP'), max_length=128, null=True, blank=True)
     link = models.URLField(_('link'))
     sticky = models.BooleanField(_('sticky'), default=False, db_index=True,
-        help_text=_('Sticky cites will take precedense.'))
+                                 help_text=_('Sticky cites will take precedense.'))
+    banner = models.BooleanField(_('banner'), default=False, help_text=_('Adjust size to image, ignore the text'))
 
-    image = models.ImageField(_('image'), upload_to='social/cite',
-                null=True, blank=True,
+    image = models.ImageField(
+        _('image'), upload_to='social/cite', null=True, blank=True,
         help_text=_('Best image is exactly 975px wide and weights under 100kB.'))
-    image_shift = models.IntegerField(_('shift'), null=True, blank=True,
-                help_text=_(u'Vertical shift, in percents. 0 means top, 100 is bottom. Default is 50%.'))
-    image_title = models.CharField(_('title'), max_length=255,
-                null=True, blank=True)
-    image_author = models.CharField(_('author'),
-                max_length=255, blank=True, null=True)
+    image_shift = models.IntegerField(
+        _('shift'), null=True, blank=True,
+        help_text=_(u'Vertical shift, in percents. 0 means top, 100 is bottom. Default is 50%.'))
+    image_title = models.CharField(_('title'), max_length=255, null=True, blank=True)
+    image_author = models.CharField(_('author'), max_length=255, blank=True, null=True)
     image_link = models.URLField(_('link'), blank=True, null=True)
-    image_license = models.CharField(_('license name'),
-                max_length=255, blank=True, null=True)
+    image_license = models.CharField(_('license name'), max_length=255, blank=True, null=True)
     image_license_link = models.URLField(_('license link'), blank=True, null=True)
 
     class Meta:
@@ -39,7 +37,7 @@ class Cite(models.Model):
         verbose_name = _('cite')
         verbose_name_plural = _('cites')
 
-    def __unicode__(self):
+    def __str__(self):
         return u"%s: %s…" % (self.vip, self.text[:60])
 
     def get_absolute_url(self):