From fc2b6128fec4e909de532c10a019b83d4a497387 Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Thu, 19 Jan 2017 11:19:00 +0200 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B1=D0=B8=D0=BB=D0=B5=D1=82=D1=8B=20=D1=83=20=D0=BF?= =?UTF-8?q?=D0=BB=D0=B0=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=81=D0=BE=D0=B1?= =?UTF-8?q?=D1=8B=D1=82=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/exposition/exposition_detail.html | 2 +- .../client/includes/exposition/expo_paid.html | 166 +++++++++--------- .../client/includes/exposition/services.html | 8 +- 3 files changed, 88 insertions(+), 88 deletions(-) diff --git a/templates/client/exposition/exposition_detail.html b/templates/client/exposition/exposition_detail.html index 3362fa18..97075ac4 100644 --- a/templates/client/exposition/exposition_detail.html +++ b/templates/client/exposition/exposition_detail.html @@ -24,7 +24,7 @@ {% endblock %} {% block content_list %} - {% if object.paid_new_id and object.paid_new.public %} + {% if object.paid_new_id and object.paid_new.public %} {% include 'client/includes/exposition/expo_paid.html' with exposition=object %} {% else %} {% include 'client/includes/exposition/exposition_object.html' with exposition=object %} diff --git a/templates/client/includes/exposition/expo_paid.html b/templates/client/includes/exposition/expo_paid.html index aa5c1ab1..b3635de1 100644 --- a/templates/client/includes/exposition/expo_paid.html +++ b/templates/client/includes/exposition/expo_paid.html @@ -7,28 +7,28 @@
{% endif %} - +
-
-

- {% if exposition.main_title %} +
+

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

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

+
-
- {% with obj=exposition %} - {% include 'client/includes/show_date_block.html' %} - {% endwith %} +
+ {% with obj=exposition %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} {% include "client/includes/sharing_block.html" %} -
+
- {% if exposition.place %} + {% if exposition.place %}
@@ -73,57 +73,57 @@
- {% endif %} + {% endif %}
 {% trans 'Подписаться на новости' %}
-
-
-
- {% 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 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 %} {% if exposition.photogallery_id %} {% trans 'фото' %} {% endif %} -
-
{% trans 'Найти отель' %}
-
-
-
-
- -
-
- {% with tags=exposition.tag.all %} - {% for tag in tags %} - {{ tag.name }}{% if forloop.counter != tags|length %},{% endif %} - {% endfor %} - {% endwith %} -
-
-
+
+
{% trans 'Найти отель' %}
+
+
+
+
+ +
+
+ {% with tags=exposition.tag.all %} + {% for tag in tags %} + {{ tag.name }}{% if forloop.counter != tags|length %},{% endif %} + {% endfor %} + {% endwith %} +
+
+

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

@@ -332,7 +332,7 @@ {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %} -
+
{% if exposition.get_nearest_events %}
@@ -411,7 +411,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' %} {% include 'client/popups/event_news_subscribe.html' %} {% endblock %} diff --git a/templates/client/includes/exposition/services.html b/templates/client/includes/exposition/services.html index 8d3f7776..d230b5cb 100644 --- a/templates/client/includes/exposition/services.html +++ b/templates/client/includes/exposition/services.html @@ -4,10 +4,10 @@ {% trans 'услуги' %}