From 07be97d05a212f3f8e544eba615745706afda4d5 Mon Sep 17 00:00:00 2001 From: Kotiuk Nazarii Date: Mon, 27 Jul 2015 13:03:59 +0300 Subject: [PATCH] Modal banners. Object detail --- exposition/models.py | 3 + templates/client/blank.html | 20 +---- .../client/exposition/exposition_detail.html | 81 ++++++++++++++++++- 3 files changed, 85 insertions(+), 19 deletions(-) diff --git a/exposition/models.py b/exposition/models.py index 77fb9c4d..286c4481 100644 --- a/exposition/models.py +++ b/exposition/models.py @@ -299,6 +299,9 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): return code return cur + def theme_ids(self): + return [item['id'] for item in self.theme.all().values('id')] + class Statistic(TranslatableModel): exposition = models.ForeignKey(Exposition, related_name='statistic') diff --git a/templates/client/blank.html b/templates/client/blank.html index 0fbead5d..794477b5 100644 --- a/templates/client/blank.html +++ b/templates/client/blank.html @@ -158,7 +158,7 @@ This template include basic anf main styles and js files, {% endif %} {% include 'client/popups/callback.html' %} - + {% block popup_banner %} {% if not request.COOKIES.popover_test1 %} {% if theme_for_filter %} @@ -231,27 +231,11 @@ This template include basic anf main styles and js files, } }); - /* - $(function() { - var theme_id = "{{ theme_for_filter.id }}"; - var data = {'theme_id': theme_id}; - console.log('--------------------------------') - console.log(data); - console.log('--------------------------------') - $.get('/ajax/get_popover/', data, function(data) { - console.log(data); - $('#main-popup-wrap').append(data['html']); - $.fancybox.open([{'href': 'expo-ad-popup'}]) - }); - - }); - */ - - {% endif %} {% endif %} + {% endblock %} {# if user doesnt have url- show form #} {% if not request.user.is_anonymous %} diff --git a/templates/client/exposition/exposition_detail.html b/templates/client/exposition/exposition_detail.html index aa55fdaf..45bcafea 100644 --- a/templates/client/exposition/exposition_detail.html +++ b/templates/client/exposition/exposition_detail.html @@ -1,5 +1,6 @@ {% extends 'base_catalog.html' %} {% load i18n %} +{% load template_filters %} {% block bread_scrumbs %}