diff --git a/expobanner/models.py b/expobanner/models.py index b49c914f..12e1d066 100644 --- a/expobanner/models.py +++ b/expobanner/models.py @@ -95,8 +95,10 @@ class Banner(models.Model, StatMixin): html = models.BooleanField(verbose_name=_('HTML?'), default=False) flash = models.BooleanField(verbose_name=_('Flash?'), default=False) - js = models.BooleanField(verbose_name=_('Javascript?'), default=False) + popup = models.BooleanField(verbose_name=_('Popup?'), default=False) paid = models.BooleanField(verbose_name=_('Is Paid event link?'), default=False) + # for detecting popups + cookie = models.CharField(max_length=30, blank=True, null=True, default=settings.DEFAULT_POPUP_COOKIE) public = models.BooleanField(verbose_name=u'Активный', default=True) created_at = models.DateTimeField(verbose_name=_('Created At'), auto_now_add=True) diff --git a/expobanner/views.py b/expobanner/views.py index 96540cdc..99135b27 100644 --- a/expobanner/views.py +++ b/expobanner/views.py @@ -46,7 +46,7 @@ def get_banners(request): for group, banners in group_banners.iteritems(): banner = get_banner_by_params(banners, good_urls, params) if banner: - if banner.js or banner.html: + if banner.html: text = banner.text img = '' alt = '' @@ -61,7 +61,7 @@ def get_banners(request): 'is_html': banner.html, 'is_flash': banner.flash, 'is_img': is_img, - 'is_js': banner.js, + 'is_popup': banner.popup, 'img': img, 'alt': alt, 'text': text diff --git a/proj/settings.py b/proj/settings.py index c2828869..14caba29 100644 --- a/proj/settings.py +++ b/proj/settings.py @@ -449,6 +449,8 @@ CLIENT_DATE_FORMAT = ["%d.%m.%Y"] # cache pages in random seconds. random in this range CACHE_RANGE = [60, 120] +DEFAULT_POPUP_COOKIE = 'expo_b_default_popup' + try: from local import * except ImportError, e: diff --git a/templates/client/includes/banners/popup.html b/templates/client/includes/banners/popup.html new file mode 100644 index 00000000..51d5d4ad --- /dev/null +++ b/templates/client/includes/banners/popup.html @@ -0,0 +1,2 @@ + \ No newline at end of file