diff --git a/templates/client/conference/conference_detail.html b/templates/client/conference/conference_detail.html index f71c5da5..ed21fff5 100644 --- a/templates/client/conference/conference_detail.html +++ b/templates/client/conference/conference_detail.html @@ -23,12 +23,15 @@ {% endblock %} {% block content_list %} -{# {% include 'client/includes/conference/conference_partner.html' with event=object %}#} + {% include 'client/includes/conference/conference_partner.html' with event=object %} + + {% comment %}









{% if object.paid_new_id and object.paid_new.public %} {% include 'client/includes/conference/conference_paid.html' with event=object %} {% else %} {% include 'client/includes/conference/conference_object.html' with event=object %} - {% endif %} + {% endif %}{% endcomment %} + {% endblock %} {% block paginator %} diff --git a/templates/client/includes/conference/conference_paid.html b/templates/client/includes/conference/conference_paid.html index c7894387..6ddc64da 100644 --- a/templates/client/includes/conference/conference_paid.html +++ b/templates/client/includes/conference/conference_paid.html @@ -3,74 +3,74 @@ {% load thumbnail %} {% load template_filters %} {% block page_body %} -
-
- +
+
+

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

+
+
+ {% with obj=event %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} - {% include "client/includes/sharing_block.html" %} -
- {% if event.place %} -
-
-
- {{ event.place.adress }} -
-
{% trans 'Раскрыть карту' %}
-
-
-
{% trans 'Скрыть карту' %} -
-
-
-
+ {% include "client/includes/sharing_block.html" %} +
+ {% if event.place %} +
+
+
+ {{ event.place.adress }} +
+
{% trans 'Раскрыть карту' %}
+
+
+
{% trans 'Скрыть карту' %} +
+
+
+
{% else %}
@@ -79,60 +79,60 @@
- {% endif %} -
-
-
- {% with event=event user=user %} - {% include 'client/includes/visit_button.html' %} - {% endwith %} - {% include 'client/includes/calendar_button.html' with obj=object %} -
- {% with note=object|note_by_user:request.user %} - {% trans 'заметка' %} -
-
- -
-
- {% endwith %} -
- {% if request.user.is_admin %} - {% trans 'изменить' %} - {% endif %} + {% endif %} +
+
+
+ {% with event=event user=user %} + {% include 'client/includes/visit_button.html' %} + {% endwith %} + {% include 'client/includes/calendar_button.html' with obj=object %} +
+ {% with note=object|note_by_user:request.user %} + {% trans 'заметка' %} +
+
+ +
+
+ {% endwith %} +
+ {% if request.user.is_admin %} + {% trans 'изменить' %} + {% endif %} {% if event.photogallery %} {% trans 'фото' %} {% endif %} -
-
{% trans 'Найти отель' %}
-
-
-
-
- -
-
- {% with tags=event.tag.all %} - {% for tag in tags %} - {{ tag.name }}{% if forloop.counter != tags|length %},{% endif %} - {% endfor %} - {% endwith %} -
-
-
-
+
+
{% trans 'Найти отель' %}
+ +
+
+
+ +
+
+ {% with tags=event.tag.all %} + {% for tag in tags %} + {{ tag.name }}{% if forloop.counter != tags|length %},{% endif %} + {% endfor %} + {% endwith %} +
+
+ + +
+ +
+`
{% trans 'Посетить/участвовать в конференции' %}
- {% if event.get_photos %} - {% with photos=event.get_photos|slice:"5" %} -
-
-
{% trans 'Фотографии с прошлой конференции' %}
- -
- {% endwith %} - {% endif %} + {% if event.get_photos %} + {% with photos=event.get_photos|slice:"5" %} +
+
+
{% trans 'Фотографии с прошлой конференции' %}
+ +
+ {% endwith %} + {% endif %} -
-

{% if event.event_type == 'expo' %}{% trans 'О выставке' %}{% else %}{% trans 'О конференции' %}{% endif %} {{ event.name|safe }}

+
+

{% if event.event_type == 'expo' %}{% trans 'О выставке' %}{% else %}{% trans 'О конференции' %}{% endif %} {{ event.name|safe }}

{% if event.description %}
{{ event.description|safe }}
{% elif default_description %}
- {{ default_description|safe }} + {{ default_description|safe }}
{% else %} {% include "client/includes/conference/default_description.html" with conf=event %} - {% endif %} -
-
+ {% endif %} +
+
-
-
{% trans 'Дополнительная информация' %}
- +
+ {% if event.organiser.all|length > 0 %} +
{% trans 'Организатор' %}:
+
+ {% with organisers=event.organiser.all %} + {% for organiser in organisers %} + {{ organiser.name }}
+ {% endfor %} + {% endwith %} +
{% elif event.org %} {% for item in event.org_split %}
{% if forloop.counter == 1 %}{% trans 'Организатор' %}:{% endif %}
@@ -224,132 +224,132 @@ {{ item }} {% endfor %} - {% endif %} + {% endif %} - {% if event.web_page %} -
{% trans 'Веб-сайт' %}:
-
- {{ event.web_page }} -
- {% endif %} - {% if event.get_audience %} -
{% trans 'Аудитория' %}:
-
- {{ event.get_audience }} -
- {% endif %} - {% if event.get_periodic %} -
{% trans 'Периодичность' %}:
-
{{ event.get_periodic }}
- {% endif %} - {% if event.time %} -
{% trans 'Время работы' %}:
-
{{ event.time|safe }}
- {% endif %} -
-
+ {% if event.web_page %} +
{% trans 'Веб-сайт' %}:
+
+ {{ event.web_page }} +
+ {% endif %} + {% if event.get_audience %} +
{% trans 'Аудитория' %}:
+
+ {{ event.get_audience }} +
+ {% endif %} + {% if event.get_periodic %} +
{% trans 'Периодичность' %}:
+
{{ event.get_periodic }}
+ {% endif %} + {% if event.time %} +
{% trans 'Время работы' %}:
+
{{ event.time|safe }}
+ {% endif %} + + - {% include "client/includes/article/articles_in_event.html" with event=event news_list=news %} -
+ {% include "client/includes/article/articles_in_event.html" with event=event news_list=news %} +
-
-
- {% with companies=event.company.all|slice:":6" %} - {% if companies %} - {# есть участники #} -
-
{% trans 'Спикеры' %}
- {% trans 'Все спикеры' %} -
- + {% else %} + {# нет участников #} +
+
{% trans 'Спикеры' %}
+

{% trans 'Разместите информацию о ключевых спикерах' %}

+

{% trans 'Рекламировать спикера' %}

+
+ {% endif %} + {% endwith %} +
-
- {% with visitors=event.users.all|slice:":17" %} -
-
{% trans 'Посетители' %}
-
- - {% trans 'Все посетители' %} - {% endwith %} -

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

- {% with event=event user=user %} - {% include 'client/includes/visit_button.html' %} - {% endwith %} -
-
-
- {% if event.members or event.visitors or event.foundation_year %} -
-
- {% if event.members %} -
{{ event.members }} {% trans 'участников' %}
- {% endif %} - {% if event.visitors %} -
{{ event.visitors }} {% trans 'посетителей' %}
- {% endif %} - {% if event.foundation_year %} -
{% trans 'Основано в' %} {{ event.foundation_year }} {% trans 'году' %}
- {% endif %} -
-
- {% endif %} - +
+ {% with visitors=event.users.all|slice:":17" %} +
+
{% trans 'Посетители' %}
+
+ + {% trans 'Все посетители' %} + {% endwith %} +

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

+ {% with event=event user=user %} + {% include 'client/includes/visit_button.html' %} + {% endwith %} +
+ +
+ {% if event.members or event.visitors or event.foundation_year %} +
+
+ {% if event.members %} +
{{ event.members }} {% trans 'участников' %}
+ {% endif %} + {% if event.visitors %} +
{{ event.visitors }} {% trans 'посетителей' %}
+ {% endif %} + {% if event.foundation_year %} +
{% trans 'Основано в' %} {{ event.foundation_year }} {% trans 'году' %}
+ {% endif %} +
+
+ {% endif %} + - {% include 'client/includes/booking_block.html' with city=event.city place=event.place event=event %} -
+ {% include 'client/includes/booking_block.html' with city=event.city place=event.place event=event %} +
- {% if event.get_nearest_events %} -
-
{% trans 'Другие конференции, которые могут быть вам интересны' %}
- -
- {% endif %} +
+
+ {% with obj=exp %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} +
+
+ {{ exp.country }}, {{ exp.city }} + {% if exp.place %} + , {{ exp.place }} + {% endif %} +
+
+ + + + + {% endfor %} +
  • {% trans 'Смотреть все' %}
    • + + + {% endif %} {% include 'client/includes/banners/detail_inner_3.html' %} -
    -
    {% trans 'Смотрите также:' %}
    - {% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} - {% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} - {% if event.theme.all %} - {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} - {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} - {% endif %} -
    +
    +
    {% trans 'Смотрите также:' %}
    + {% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} + {% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} + {% if event.theme.all %} + {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} + {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} + {% endif %} +
    {% endblock %} @@ -412,7 +412,7 @@ {% endblock %} {% block popup %} - {% include 'client/popups/advertise_member.html' with form=advertising_form %} + {% include 'client/popups/advertise_member.html' with form=advertising_form %} {% include 'client/popups/issue_organizer.html' %} {% endblock %} @@ -423,26 +423,26 @@ {% endif %} {% endblock %} diff --git a/templates/client/includes/conference/conference_partner.html b/templates/client/includes/conference/conference_partner.html index 72f1e8ba..bf713b0e 100644 --- a/templates/client/includes/conference/conference_partner.html +++ b/templates/client/includes/conference/conference_partner.html @@ -16,13 +16,14 @@
    {% endif %} {% if event.canceled %} -
    +
    {% endif %}
    - {% with obj=event %} - {% include 'client/includes/show_logo.html' %} - {% endwith %} + {% with obj=event %} + {% include 'client/includes/show_logo.html' %} + {% endwith %}
    +
    {% if event.visitors %} {{ event.visitors }} @@ -31,6 +32,7 @@ {{ event.members }} {% endif %}
    +
    {% if event.discount %} {% trans 'Скидка' %} -{{ event.discount }}% @@ -38,6 +40,7 @@ {% endif %}
    +

    @@ -144,6 +147,12 @@

    + {% if object.paid_new_id and object.paid_new.public %} +
    + +
    + {% endif %} + {% with object.audience.all as audiences %} {% if audiences or object.min_price and object.max_price %}
    @@ -164,12 +173,13 @@ {% endif %}
    + +
    {% endif %} {% endwith %} {#

     {% trans 'Подписаться на новости' %}   {% blocktrans with name=event.name|safe %}Получайте актуальную информацию о концеренции {{ name }} на свой email{% endblocktrans %}

    #} -
    {# {% include 'client/includes/conference/conference_services.html' with event=event %}#} {% include 'client/includes/event_steps.html' with event=event %} @@ -177,7 +187,15 @@
    -

    {% if event.event_type == 'expo' %}{% trans 'О выставке' %}{% else %}{% trans 'О конференции' %}{% endif %} {{ event.name|safe }}

    +

    + {% if event.event_type == 'expo' %} + {% trans 'О выставке' %} + {% else %} + {% trans 'О конференции' %} + {% endif %} + {{ event.name|safe }} +

    + {% if event.description %}
    {{ event.description|safe }}
    {% elif default_description %} @@ -601,7 +619,7 @@ $(window).load(function(){ $('.speakers_slider').slick({ slidesToShow: 4, - slidesToScroll: 1, + slidesToScroll: 1 }); diff --git a/templates/client/includes/event_steps.html b/templates/client/includes/event_steps.html index 73228f40..fe6f0a80 100644 --- a/templates/client/includes/event_steps.html +++ b/templates/client/includes/event_steps.html @@ -1,37 +1,71 @@ {% load i18n %} -
    -
    {% if event.catalog == '/expo/' %}{% trans 'Участвовать в выставке' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}
    +{% if object.paid_new_id and object.paid_new.public %} + {# Проплаченая конференция #} +
    +
    {% trans 'Посетить/участвовать в конференции' %}
    + - {% if event.catalog == '/expo/' %}{% trans 'Заявка на участие' %}{% else %}{% trans 'Регистрация' %}{% endif %} + {% trans 'УЧАСТВОВАТЬ' %} - {% endif %} - +{% comment %} +
  • +
    {% trans 'Забронируйте площадь по лучшей цене' %}
    + {% trans "Заявка на участие" %} +
    • +{% endcomment %}
  • {% trans 'Забронируйте отель по лучшей цене' %}
    booking.com
    • -
  • -
    {% trans 'Устраните языковые барьеры' %}
    - {% trans "ПЕРЕВОДЧИК" %} -
    • - {% comment %} -
  • -
    {% trans 'Купите авиабилеты по лучшему тарифу' %}
    - aviasales.ru -
    • - {% endcomment %} - -
    + +
  • +
    {% trans 'Задайте свой вопрос напрямую организатору' %}
    + {% trans 'Запрос организатору' %} +
    • + +
    +{% else %} + {# Непроплаченая конференция #} +
    +
    {% if event.catalog == '/expo/' %}{% trans 'Участвовать в выставке' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}
    + +
    +{% endif %}