From 8745cea92fcbd30615627c21c404a7d457ff6e40 Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Thu, 19 Jan 2017 11:45:07 +0200 Subject: [PATCH] =?UTF-8?q?=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=92=D1=8B=D1=81=D1=82=D0=B0=D0=B2=D0=BE=D1=87=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=A6=D0=B5=D0=BD=D1=82=D1=80=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=20=D0=B2=D1=8B=D1=81=D1=82=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- place_exposition/models.py | 2 +- .../client/exposition/exposition_detail.html | 4 +- .../client/includes/exposition/expo_paid.html | 7 +- .../exposition/exposition_object.html | 263 +++++++++--------- 4 files changed, 143 insertions(+), 133 deletions(-) diff --git a/place_exposition/models.py b/place_exposition/models.py index af15a110..472c8d48 100644 --- a/place_exposition/models.py +++ b/place_exposition/models.py @@ -52,7 +52,7 @@ class PlaceExposition(TranslatableModel, ExpoMixin): #type uses EnumField for creating Enum type field in Mysql database type = EnumField(values = [item1 for item1, item2 in EXPOSITION_TYPE]) #information - address = LocationField(verbose_name=_(u'Адресс')) + address = LocationField(verbose_name=_(u'Адрес')) phone = models.BigIntegerField(blank=True, null=True) fax = models.BigIntegerField(blank=True, null=True) web_page = models.URLField(blank=True) diff --git a/templates/client/exposition/exposition_detail.html b/templates/client/exposition/exposition_detail.html index 97075ac4..cd37b6e0 100644 --- a/templates/client/exposition/exposition_detail.html +++ b/templates/client/exposition/exposition_detail.html @@ -1,6 +1,7 @@ {% extends 'client/base_catalog.html' %} {% load i18n %} -{% load template_filters thumbnail %} +{% load thumbnail %} +{% load template_filters %} {% block og %} @@ -19,7 +20,6 @@ {% endblock %} - {% block page_title %} {% endblock %} diff --git a/templates/client/includes/exposition/expo_paid.html b/templates/client/includes/exposition/expo_paid.html index b3635de1..16b0507d 100644 --- a/templates/client/includes/exposition/expo_paid.html +++ b/templates/client/includes/exposition/expo_paid.html @@ -62,7 +62,12 @@
- {{ exposition.place.adress }} + {% if exposition.place.web_page %} + {{ exposition.place.name }} + {% else %} + {{ exposition.place.name }} + {% endif %} + {{ exposition.place.address.address }}
{% trans 'Раскрыть карту' %}
diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html index b6f89c13..7956a45b 100644 --- a/templates/client/includes/exposition/exposition_object.html +++ b/templates/client/includes/exposition/exposition_object.html @@ -1,67 +1,72 @@ -{% load static %} -{% load i18n %} +{% load static i18n %} {% load thumbnail %} {% load template_filters %} + {% block page_body %} -
-
- + +
+
+

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

+
+ +
+ {% with obj=exposition %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} + + {% include "client/includes/sharing_block.html" %} +
+ + {% if exposition.place %}
- {{ exposition.place.adress }} + {% if exposition.place.web_page %} + {{ exposition.place.name }} + {% else %} + {{ exposition.place.name }} + {% endif %} + {{ exposition.place.address.address }}
{% trans 'Раскрыть карту' %}
@@ -82,65 +87,65 @@
- {% endif %} + {% endif %}
 {% trans 'Подписаться на новости' %}
-
+
-
-
- {% 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=object %}
- {% with note=object|note_by_user:request.user %} - {% trans 'заметка' %} -
-
- -
-
- {% endwith %} -
- {% if request.user.is_admin %} - {% trans 'изменить' %} - {% endif %} + {% with note=object|note_by_user:request.user %} + {% trans 'заметка' %} +
+
+ +
+
+ {% endwith %} +
+ {% if request.user.is_admin %} + {% trans 'изменить' %} + {% endif %} {% if exposition.photogallery_id %} {% trans 'фото' %} {% endif %} -
-
{% trans 'Найти отель' %}
-
+
+
{% trans 'Найти отель' %}
+
-
+
-
-
-
    +
    +
    + -
    -
    - {% with tags=exposition.tags %} - {% for tag in tags %} - {{ tag.name }}{% if forloop.counter != tags|length %},{% endif %} - {% endfor %} - {% endwith %} -
    -
    -
-
+ +
+
+ {% with tags=exposition.tags %} + {% for tag in tags %} + {{ tag.name }}{% if forloop.counter != tags|length %},{% endif %} + {% endfor %} + {% endwith %} +
+
+ + {% include 'client/includes/exposition/exposition_services.html' with object=exposition %} @@ -181,7 +186,7 @@ {% endif %} -
+
{% include 'client/includes/banners/expo_detail.html' %} @@ -254,8 +259,8 @@ {% include 'client/includes/banners/detail_inner.html' %} - {% include "client/includes/article/articles_in_event.html" with event=exposition news_list=news %} -
+ {% include "client/includes/article/articles_in_event.html" with event=exposition news_list=news %} +
@@ -323,7 +328,7 @@
-
+
{% if exposition.area %} {% else %} {% if exposition.members or exposition.visitors or exposition.foundation_year %} @@ -356,13 +361,13 @@ {% endif %} - + - {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %} + {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %}
- {% if exposition.get_nearest_events %} + {% if exposition.get_nearest_events %}
{% trans 'Другие выставки, которые могут быть вам интересны' %}
{% include 'client/includes/banners/detail_inner_3.html' %} - {% endif %} - -
-
{% 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 %} -
+ {% endif %} + +
+
{% 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 %} +
{% endblock %} {% block content_text %} {% 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/event_news_subscribe.html' %} {% endblock %} {% block scripts %} - {% if request.GET.debug == '1' %} - - {% else %} - - {% endif %} - + {% else %} + + {% endif %} + + addCalendarText:"{% trans 'В расписание' %}", + removeCalendarText:"{% trans 'Из расписания' %}" + }); + {% endblock %}