From 8a8b6defa927bdffe0d67ff00b848595fa37498e Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Fri, 30 Jun 2017 14:51:03 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BA=D0=BE=D0=B2=20=D0=B2=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/exposition/exposition_detail.html | 902 +++++++++--------- 1 file changed, 447 insertions(+), 455 deletions(-) diff --git a/templates/client/exposition/exposition_detail.html b/templates/client/exposition/exposition_detail.html index a4a8669f..5132c3b1 100644 --- a/templates/client/exposition/exposition_detail.html +++ b/templates/client/exposition/exposition_detail.html @@ -30,535 +30,527 @@ {% block paginator %}{% endblock %} {% block content_list %} - {% block page_body %} -
-
- + +
+
+

+ {% if exposition.main_title %} + {{ exposition.name|safe }} - {{ exposition.main_title|lowfirst|safe }} + {% else %} + {{ exposition.name|safe }} + {% endif %} +

+
- {% if not request.GET.debug == '1' %} - {% include "client/includes/sharing_block.html" %} - {% endif %} -
+
+ {% with obj=exposition %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} - {% if exposition.place %} -
-
-
- {{ exposition.place.country }}, {{ exposition.place.city }}, - {% if exposition.place.web_page %} - {{ exposition.place.name }} - {% else %} - {{ exposition.place.name }} - {% endif %} -
- {#
{% trans 'Раскрыть карту' %}
#} -
+ {% if not request.GET.debug == '1' %} + {% include "client/includes/sharing_block.html" %} + {% endif %} +
-
{% trans 'Раскрыть карту' %}
+ {% if exposition.place %} +
+
+
+ {{ exposition.place.country }}, {{ exposition.place.city }}, + {% if exposition.place.web_page %} + {{ exposition.place.name }} + {% else %} + {{ exposition.place.name }} + {% endif %} +
+{#
{% trans 'Раскрыть карту' %}
#} +
-
-
- {% trans 'Скрыть карту' %} -
+
{% trans 'Раскрыть карту' %}
-
+
+
+ {% trans 'Скрыть карту' %}
+ +
- {% else %} -
-
-
- {{ exposition.country.name }}, {{ exposition.city.name }}{% if exposition.place_alt %} , {{ exposition.place_alt }}{% endif %} -
-
-
- {% endif %} -
+
+ {% else %} +
+
+
+ {{ exposition.country.name }}, {{ exposition.city.name }}{% if exposition.place_alt %} , {{ exposition.place_alt }}{% endif %} +
+
+
+ {% endif %}
+
-
-
-
- {% with event=exposition user=user %} - {% include 'client/includes/visit_button.html' %} - {% endwith %} +
+
+
+ {% with event=exposition user=user %} + {% include 'client/includes/visit_button.html' %} + {% endwith %} - {% include 'client/includes/calendar_button.html' with obj=exposition %} - {% if request.user.is_admin %} - {% trans 'изменить' %} - {% endif %} -
+ {% include 'client/includes/calendar_button.html' with obj=exposition %} + {% if request.user.is_admin %} + {% trans 'изменить' %} + {% endif %} +
-
-  {% trans 'Подписаться на новости' %} -
+
+  {% trans 'Подписаться на новости' %}
+
-
-
-
- -
-
- {% with tags=exposition.tags %} - {% for tag in tags %} - {{ tag.name }}{% if forloop.counter != tags|length %},{% endif %} +
+
+
+
+ +
+
+ {% with tags=exposition.tags %} + {% for tag in tags %} + {{ tag.name }}{% if forloop.counter != tags|length %},{% endif %} + {% endfor %} + {% endwith %}
+
-
-
- {% trans 'Посетителю' %} - {% trans 'Экспоненту' %} - {% if object.paid_new_id and object.paid_new.public %} - {% trans 'Официальный сайт' %} - {% endif %} -
+
+
+ {% trans 'Посетителю' %} + {% trans 'Экспоненту' %} + {% if object.paid_new_id and object.paid_new.public %} + {% trans 'Официальный сайт' %} + {% endif %}
+
- {# Описание выставки #} -
-

{% trans 'О выставке' %} {{ exposition.name|safe }}

- - - + {% if exposition.description %} +
+ {{ exposition.description|safe }} +
+ {% elif default_description %} +
+ {{ default_description|safe }} +
+ {% else %} + {% include "client/includes/exposition/default_description.html" with expo=exposition className="expo_description_detail" %} + {% endif %} +
- {% if exposition.description %} -
- {{ exposition.description|safe }} -
- {% elif default_description %} -
- {{ default_description|safe }} -
- {% else %} - {% include "client/includes/exposition/default_description.html" with expo=exposition className="expo_description_detail" %} - {% endif %} -
+ {% include 'client/includes/banners/expo_detail.html' %} - {% include 'client/includes/banners/expo_detail.html' %} +
-
+ {# Дополнительная информация #} +
+
{% trans 'Дополнительная информация' %}
- {# Дополнительная информация #} -
-
{% trans 'Дополнительная информация' %}
+ +
+ {{ item }} +
+ {% endfor %} -
- {% if exposition.organiser.all.exists %} -
{% trans 'Организатор' %}:
-
- {% with organisers=exposition.organiser.all %} - {% for organiser in organisers %} - {{ organiser.name }}
- {% endfor %} - {% endwith %} -
- {% else %} - {% if exposition.org %} - {% for item in exposition.org_split %} -
{% if forloop.counter == 1 %}{% trans 'Организатор' %}:{% endif %}
+ {% endif %} + {% endif %} -
- {{ item }} -
- {% endfor %} + {% if exposition.web_page %} +
{% trans 'Веб-сайт' %}:
+
+ {{ exposition.web_page }} +
+ {% endif %} - {% endif %} - {% endif %} + {% if exposition.get_audience %} +
{% trans 'Аудитория' %}:
+
{{ exposition.get_audience }}
+ {% endif %} - {% if exposition.web_page %} -
{% trans 'Веб-сайт' %}:
-
- {{ exposition.web_page }} -
- {% endif %} + {% if exposition.get_periodic %} +
{% trans 'Периодичность' %}:
+
{{ exposition.get_periodic }}
+ {% endif %} - {% if exposition.get_audience %} -
{% trans 'Аудитория' %}:
-
{{ exposition.get_audience }}
- {% endif %} + {% if exposition.products %} +
{% trans 'Экспонируемые продукты' %}:
+
{{ exposition.products|safe }}
+ {% endif %} - {% if exposition.get_periodic %} -
{% trans 'Периодичность' %}:
-
{{ exposition.get_periodic }}
- {% endif %} + {% if exposition.time %} +
{% trans 'Время работы' %}:
+
{{ exposition.time|safe }}
+ {% endif %} +
+
- {% if exposition.products %} -
{% trans 'Экспонируемые продукты' %}:
-
{{ exposition.products|safe }}
- {% endif %} +
+ {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %} - {% if exposition.time %} -
{% trans 'Время работы' %}:
-
{{ exposition.time|safe }}
- {% endif %} - -
+ {# Планируют быть #} +
+ {% with visitors=exposition.users.all|slice:":17" %} +

{% trans 'Планируют быть на' %} {{ exposition.name }}

-
- {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %} - {# Планируют быть #} -
- {% with visitors=exposition.users.all|slice:":17" %} -

{% trans 'Планируют быть на' %} {{ exposition.name }}

+ +

{% trans 'Пока никто не отметился на событии.' %}

- +

{% trans 'Все посетители' %}

+ {% endwith %} -

{% trans 'Пока никто не отметился на событии.' %}

+ {% with event=exposition user=user %} + {% include 'client/includes/visit_button.html' %} + {% endwith %} +
-

{% trans 'Все посетители' %}

- {% endwith %} + {# Слайдер фото с прошлой выставки #} + {% if exposition.get_photos %} + {% with photos=exposition.get_photos %} +
+

{% trans 'Фотографии с прошлой конференции' %}

+
+ {% for photo in photos %} + {% thumbnail photo.image '936x468' crop="center" as im %} + + {% endthumbnail %} + {% endfor %} +
- {% with event=exposition user=user %} - {% include 'client/includes/visit_button.html' %} - {% endwith %} -
+
+ {% for photo in photos %} + {% thumbnail photo.image '137x95' crop="center" as im %} + + {% endthumbnail %} + {% endfor %} +
+
+ {% endwith %} + {% endif %} - {# Слайдер фото с прошлой выставки #} - {% if exposition.get_photos %} - {% with photos=exposition.get_photos %} -
-

{% trans 'Фотографии с прошлой конференции' %}

-
- {% for photo in photos %} - {% thumbnail photo.image '936x468' crop="center" as im %} - - {% endthumbnail %} - {% endfor %} -
+
+ {% include "client/includes/article/articles_in_event.html" with event=exposition news_list=news %} +
-
- {% for photo in photos %} - {% thumbnail photo.image '137x95' crop="center" as im %} - - {% endthumbnail %} - {% endfor %} + {% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %} +
+ {% if exposition.area %} +
+
{% trans 'Общая выставочная площадь' %}
+
+ {{ exposition.area }} {% trans 'м²' %}
- {% endwith %} - {% endif %} + {% endif %} +
+ {% if exposition.members %} +
{{ exposition.members }} {% trans 'участников' %}
+ {% endif %} -
- {% include "client/includes/article/articles_in_event.html" with event=exposition news_list=news %} -
+ {% if exposition.visitors %} +
{{ exposition.visitors }} {% trans 'посетителей' %}
+ {% endif %} - {% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %} -
- {% if exposition.area %} -
-
{% trans 'Общая выставочная площадь' %}
-
- {{ exposition.area }} {% trans 'м²' %} -
-
+ {% if exposition.foundation_year %} +
{% trans 'Основано в' %} {{ exposition.foundation_year }} {% trans 'году' %}
{% endif %} -
- {% if exposition.members %} -
{{ exposition.members }} {% trans 'участников' %}
- {% endif %} - - {% if exposition.visitors %} -
{{ exposition.visitors }} {% trans 'посетителей' %}
- {% endif %} - - {% if exposition.foundation_year %} -
{% trans 'Основано в' %} {{ exposition.foundation_year }} {% trans 'году' %}
- {% endif %} -
- {% endif %} - -
-

{% trans 'Комментарии' %}

- {% include 'client/includes/comments.html' %}
-
+ {% endif %} -
- {% include 'client/includes/sharing_block_full.html' %} +
+

{% trans 'Комментарии' %}

+ {% include 'client/includes/comments.html' %}
+
- {% include 'client/includes/banners/catalog_inner_2.html' %} +
+ {% include 'client/includes/sharing_block_full.html' %} +
- {% with themes=exposition.themes %} - {% for theme in themes %} -
  • {{ theme.name }} ({{ theme.expositions_number }})
    • - {% endfor %} - {% endwith %} + {% include 'client/includes/banners/catalog_inner_2.html' %} - {% if exposition.get_nearest_events %} -
    -
    - {% with themes=exposition.themes %} - {% trans 'Ближайшие выставки по тематике' %} «{% for theme in themes %}{{ theme.name }}{% if not forloop.last %}, {% endif %}{% endfor %}» - {% endwith %} -
    -
    - {% endblock %} - - {% block content_text %}{% endblock %} + {% endif %} - {% block popup %} - {% include 'client/popups/advertise_member.html' with form=advertising_form %} - {% include 'client/popups/event_news_subscribe.html' %} - {% endblock %} + {% include 'client/includes/banners/detail_inner_3.html' %} - {% block scripts %} - {% if request.GET.debug == '1' %} - - {% else %} - +
    +
    {% trans 'Смотрите также:' %}
    + {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} + {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + {% if exposition.theme.all %} + {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} {% endif %} +
    - - - - + {% else %} + + {% endif %} + + + + + - {% endblock %} + $('.last_photos_thumbs').slick({ + slidesToShow: 5, + slidesToScroll: 1, + asNavFor: '.last_photos_slider', + dots: false, + variableWidth: true, + focusOnSelect: true + }); + }); + + $(function() { + var $recommended = $('#recommended_expositions'), + $statistics = $('#expo_statistics'), + $text = $('.expo_description_detail'), + $main_image = $('.exposition_main_image'); + + $recommended + .insertBefore($text.find('>*').eq(-2)) + .show(); + + if ($main_image.data('background')) { + $main_image.css('background', 'url(' + $main_image.data('background') + ')'); + } + + if ($statistics.children().length > 1) { + $statistics.show(); + } + }) + {% endblock %}