diff --git a/templates/client/includes/exposition/price.html b/templates/client/includes/exposition/price.html index 5ece2a54..b7006c6a 100644 --- a/templates/client/includes/exposition/price.html +++ b/templates/client/includes/exposition/price.html @@ -152,7 +152,10 @@
{% if not exposition.paid %} - {% trans 'Заказать билет' %} + {% if exposition.country_id in sng_countries %} + {% else %} + {% trans 'Заказать билет' %} + {% endif %} {% else %} {% trans 'Заказать билет' %} {% endif %} diff --git a/templates/client/includes/place/place_object.html b/templates/client/includes/place/place_object.html index 258fef83..a6036a85 100644 --- a/templates/client/includes/place/place_object.html +++ b/templates/client/includes/place/place_object.html @@ -135,7 +135,7 @@ @@ -144,75 +144,77 @@
-
- {% if place.total_year_action %} -
-
- {% trans 'Ежегодно проводится' %} -
-
- {% if place.total_year_action.isdigit %} - {% ifequal LANGUAGE_CODE 'ru' %} - {% load pymorphy_tags %} - {{ place.total_year_action }} - {{ "событие"|plural:place.total_year_action }} - {% else %} - {{ place.total_year_action }} - {% trans 'событий' %} - {% endifequal %} +
+
+ {% if place.total_year_action %} +
+
+ {% trans 'Ежегодно проводится' %} +
+
+ {% if place.total_year_action.isdigit %} + {% ifequal LANGUAGE_CODE 'ru' %} + {% load pymorphy_tags %} + {{ place.total_year_action }} + {{ "событие"|plural:place.total_year_action }} + {% else %} + {{ place.total_year_action }} + {% trans 'событий' %} + {% endifequal %} + + {% else %} + {{ place.total_year_action }} + {% endif %} +
+
+ {% endif %} + {% if place.foundation_year %} +
+
{% trans 'Основано в' %} {{ place.foundation_year }} {% trans 'году' %}
+
+ {% endif %} + + {% if place.get_scheme %} +
+
+
{% trans 'Схема павильонов' %}
+ {% for scheme in place.get_scheme %} + {% ifequal scheme.file_path.url|slice:"-3:" 'pdf' %} + {% trans 'Схема в pdf' %} + {% else %} +
+ {% endifequal %} +
+ {% endfor %} +
+ {% endif %} +
+
{% trans 'Контактная информация' %}
+
+
+
{{ place.adress }}
+ +
+
+
    + {% if place.phone %} +
  • {{ place.phone|phone }} ({% trans 'телефон' %})
  • + {% endif %} + {% if place.fax %} +
  • {{ place.fax|phone }} ({% trans 'факс' %})
  • + {% endif %} +
+
+
+
- {% else %} - {{ place.total_year_action }} - {% endif %} - - - {% endif %} - {% if place.foundation_year %} -
-
{% trans 'Основано в' %} {{ place.foundation_year }} {% trans 'году' %}
-
- {% endif %} - - {% if place.get_scheme %} -
-
-
{% trans 'Схема павильонов' %}
- {% for scheme in place.get_scheme %} - {% ifequal scheme.file_path.url|slice:"-3:" 'pdf' %} - {% trans 'Схема в pdf' %} - {% else %} -
- {% endifequal %} -
- {% endfor %} -
- {% endif %} -
-
{% trans 'Контактная информация' %}
-
-
-
{{ place.adress }}
- -
-
    - {% if place.phone %} -
  • {{ place.phone|phone }} ({% trans 'телефон' %})
  • - {% endif %} - {% if place.fax %} -
  • {{ place.fax|phone }} ({% trans 'факс' %})
  • - {% endif %} -
-
-
-
-
{% if place.events %}
{% trans 'Список событий' %}
@@ -274,9 +276,8 @@ {% if event.members %}{{ event.members }}{% endif %}
- {% with obj=event %} - {% include 'client/includes/show_tags.html' %} - {% endwith %} + {% include 'client/includes/exposition/tags.html' with obj=event %} +
{% endfor %} @@ -326,6 +327,7 @@ {% endif %} {% endblock %} + {% block scripts %} {% if request.GET.debug == '1' %} diff --git a/templates/client/main_page.html b/templates/client/main_page.html new file mode 100644 index 00000000..52d1ed1b --- /dev/null +++ b/templates/client/main_page.html @@ -0,0 +1,263 @@ +{% extends "blank.html" %} +{% load static %} +{% load i18n %} +{% load thumbnail %} + +{% block body_class %} class="main-page" {% endblock %} + +{% block top %} + +
+
+ + + + + +
+
+{% endblock %} + +{% block search %} + {% include 'includes/catalog_search_main.html' with search_form=search_form %} +{% endblock %} + +{% block catalog %} +
+
+ + + +
+
+ +
+
{% trans 'Выставки' %}
+ + +
+ +
+
{% trans 'конференции' %}
+ + +
+ {% comment %} + +
+
{% trans 'семинары' %}
+ + +
+ {% endcomment %} + +
+ +
+ {% block menu_banner %} + + + + {% endblock %} +
+
+ +
+
+{% endblock %} + +{% block announces %} +
+
+ + +
+ +
+ +
+
+{% endblock %} + +{% block partners %} +
+
+
{% trans 'Наши партнеры:' %}
+ +
+
+{% endblock %} + +{% block services %} +
+
+ + + +
+
+ + +
+
+
+
+
+ +
+
+{% endblock %} diff --git a/templates/client/service/translator.html b/templates/client/service/translator.html index e1914410..a2e0208d 100644 --- a/templates/client/service/translator.html +++ b/templates/client/service/translator.html @@ -63,13 +63,12 @@
{{ form.languages }} -
{{ form.themes }} - +
diff --git a/templates/client/static_client/img/pic1.jpg b/templates/client/static_client/img/pic1.jpg new file mode 100644 index 00000000..c016064d Binary files /dev/null and b/templates/client/static_client/img/pic1.jpg differ diff --git a/templates/client/static_client/img/pic2.jpg b/templates/client/static_client/img/pic2.jpg new file mode 100644 index 00000000..0012dcc5 Binary files /dev/null and b/templates/client/static_client/img/pic2.jpg differ diff --git a/templates/client/static_client/img/pic3.jpg b/templates/client/static_client/img/pic3.jpg new file mode 100644 index 00000000..6963b2fa Binary files /dev/null and b/templates/client/static_client/img/pic3.jpg differ diff --git a/templates/client/static_client/img/pic4.jpg b/templates/client/static_client/img/pic4.jpg new file mode 100644 index 00000000..c9870741 Binary files /dev/null and b/templates/client/static_client/img/pic4.jpg differ diff --git a/templates/client/static_client/img/pic5.jpg b/templates/client/static_client/img/pic5.jpg new file mode 100644 index 00000000..8fafa1a0 Binary files /dev/null and b/templates/client/static_client/img/pic5.jpg differ diff --git a/templates/client/static_client/img/pic6.jpg b/templates/client/static_client/img/pic6.jpg new file mode 100644 index 00000000..3259b33b Binary files /dev/null and b/templates/client/static_client/img/pic6.jpg differ