diff --git a/exposition/views.py b/exposition/views.py index 22ab24bd..0f50018c 100644 --- a/exposition/views.py +++ b/exposition/views.py @@ -526,5 +526,5 @@ def send_to_organiser(request, slug): msg.send() redirect_to = '%sservice/thanks/'%exposition.get_permanent_url() - return HttpResponseRedirect(json.dumps({'success':True, 'redirect_to': redirect_to}), content_type='application/json') + return HttpResponse(json.dumps({'success':True, 'redirect_to': redirect_to}), content_type='application/json') diff --git a/templates/client/exposition/catalog.html b/templates/client/exposition/catalog.html index e7b03d05..de61d7eb 100644 --- a/templates/client/exposition/catalog.html +++ b/templates/client/exposition/catalog.html @@ -34,7 +34,7 @@ {% block content_list %} {% if paid %} - {% include 'includes/exposition/exposition_list.html' with object_list=paid %} + {% include 'includes/exposition/expo_list_paid.html' with object_list=paid %} {% endif %} {% include 'includes/exposition/exposition_list.html' with object_list=object_list %} {% endblock %} diff --git a/templates/client/exposition/exposition_list.html b/templates/client/exposition/exposition_list.html index e0ed9b03..8fc3bfd1 100644 --- a/templates/client/exposition/exposition_list.html +++ b/templates/client/exposition/exposition_list.html @@ -24,8 +24,6 @@ {% block page_title %}

{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Выставки' %}{% endif %}

- {% with a=[111,2] %} - {% endwith %}
{% include 'includes/exposition/catalog_filter_period.html' %} diff --git a/templates/client/includes/banners/expo_detail.html b/templates/client/includes/banners/expo_detail.html index cf20ae7b..cb8b7c24 100644 --- a/templates/client/includes/banners/expo_detail.html +++ b/templates/client/includes/banners/expo_detail.html @@ -5,7 +5,7 @@ {% with themes=object.theme.all %} {% for theme in themes %} {% if theme.id in banner_themes %} - + {% endif %} {% endfor %} diff --git a/templates/client/includes/banners/expo_list_baner.html b/templates/client/includes/banners/expo_list_baner.html index 4044fc53..792fa3b3 100644 --- a/templates/client/includes/banners/expo_list_baner.html +++ b/templates/client/includes/banners/expo_list_baner.html @@ -1,6 +1,6 @@ {% load static %}
{% if theme_for_filter.id in banner_themes or tag_for_filter.id in banner_tags %} - + {% endif %}
\ No newline at end of file diff --git a/templates/client/includes/exposition/expo_list_paid.html b/templates/client/includes/exposition/expo_list_paid.html new file mode 100644 index 00000000..1b5fdd3e --- /dev/null +++ b/templates/client/includes/exposition/expo_list_paid.html @@ -0,0 +1,154 @@ +{% load static %} +{% load i18n %} +{% load template_filters %} +{% with objects=object_list %} + {% if objects %} + + {% else %} +

+ + {% trans "Выставки по указанным параметрам не найдены. Попробуйте задать менее точный запрос по теме или расширить период времени" %} + +

+ {% endif %} + +{% endwith %} + + + +{% block scripts %} +{% if request.GET.debug == '1' %} + +{% else %} + +{% endif %} +{% endblock %} \ No newline at end of file diff --git a/templates/client/includes/exposition/exposition_list.html b/templates/client/includes/exposition/exposition_list.html index 6db0694b..61082756 100644 --- a/templates/client/includes/exposition/exposition_list.html +++ b/templates/client/includes/exposition/exposition_list.html @@ -92,9 +92,10 @@ - {% if forloop.counter == 5 or objects|length < 5 %} - {% include 'client/includes/banners/expo_list_baner.html' %} - {% endif %} + + {% if forloop.counter == 5 or objects|length < 5 %} + {% include 'client/includes/banners/expo_list_baner.html' %} + {% endif %} {% if forloop.counter == 8 %} diff --git a/templates/client/static_client/img/partners/unnamed_2.gif b/templates/client/static_client/img/partners/unnamed_2.gif new file mode 100644 index 00000000..b6d64b40 Binary files /dev/null and b/templates/client/static_client/img/partners/unnamed_2.gif differ