Layout fixes

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

diff --git a/src/annoy/models.py b/src/annoy/models.py
index 488fa87..c8fdf2d 100644 (file)
--- a/src/annoy/models.py
+++ b/src/annoy/models.py
@@ -2,13 +2,21 @@ from django.apps import apps
 from django.conf import settings
 from django.db import models
 from django.template import Context, Template
 from django.conf import settings
 from django.db import models
 from django.template import Context, Template

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.utils.timezone import now
 from django.utils.timezone import now

-from .places import PLACES, PLACE_CHOICES
+from .places import PLACES, PLACE_CHOICES, STYLES

 
 
 class Banner(models.Model):
     place = models.SlugField(_('place'), choices=PLACE_CHOICES)
 
 
 class Banner(models.Model):
     place = models.SlugField(_('place'), choices=PLACE_CHOICES)

+    style = models.CharField(
+        _('style'), max_length=255, blank=True,
+        choices=STYLES,
+        help_text=_('Affects blackout.')
+    )
+    smallfont = models.BooleanField(_('small font'), default=False)
+    text_color = models.CharField(max_length=10, blank=True)
+    background_color = models.CharField(max_length=10, blank=True)

     action_label = models.CharField(
         _('action label'),
         max_length=255, blank=True,
     action_label = models.CharField(
         _('action label'),
         max_length=255, blank=True,


@@ -26,6 +34,7 @@ class Banner(models.Model):
     until = models.DateTimeField(_('until'), null=True, blank=True)
     show_members = models.BooleanField(_('show members'), default=False)
     staff_preview = models.BooleanField(_('staff preview'), default=False)
     until = models.DateTimeField(_('until'), null=True, blank=True)
     show_members = models.BooleanField(_('show members'), default=False)
     staff_preview = models.BooleanField(_('staff preview'), default=False)

+    only_authenticated = models.BooleanField(_('only for authenticated users'), default=False)

 
     class Meta:
         verbose_name = _('banner')
 
     class Meta:
         verbose_name = _('banner')


@@ -57,12 +66,15 @@ class Banner(models.Model):
             until__lt=n
         ).order_by('-priority', '?')
 
             until__lt=n
         ).order_by('-priority', '?')
 

+        if not request.user.is_authenticated:
+            banners = banners.filter(only_authenticated=False)
+

         if not request.user.is_staff:
             banners = banners.filter(staff_preview=False)
 
         if not request.user.is_staff:
             banners = banners.filter(staff_preview=False)
 

-        if request:
-            if Membership.is_active_for(request.user):
-                banners = banners.filter(show_members=True)
+        if Membership.is_active_for(request.user):
+            banners = banners.filter(show_members=True)
+

         return banners
 
 
         return banners