merge conflict

templates/client/exposition/exposition_detail.html

@@ -30,7 +30,6 @@
 {% block paginator %}{% endblock %}
 
 {% block content_list %}
-    {% block page_body %}
     <div class="m-article event-page">
         <div class="item-wrap event clearfix">
             <aside>
@@ -88,7 +87,7 @@
                                     {{ exposition.place.name }}
                                 {% endif %}
                             </div>
-    {#                            <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>#}
+{#                            <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>#}
                         </header>
 
                         <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>
@@ -303,15 +302,13 @@
         </div>
 
         <hr>
-            <div class="exposition_booking_block">
         {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %}
-            </div>
+
         {# Планируют быть #}
         <div class="conf_visitors">
             {% with visitors=exposition.users.all|slice:":17" %}
                 <h3>{% trans 'Планируют быть на' %} {{ exposition.name }}</h3>
 
-
                 <ul class="visitors-list" id="visitors-list">
                     {% if visitors %}
                     {# есть посетители #}
@@ -401,12 +398,16 @@
 
     {% include 'client/includes/banners/catalog_inner_2.html' %}
 
+    <div class="e-cat look-also">
+        <div class="sect-title">{% trans 'Смотрите также:' %}</div>
         {% with themes=exposition.themes %}
             {% for theme in themes %}
-                <li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.expositions_number }})</a></li>
+                <a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.expositions_number }})</a>
             {% endfor %}
         {% endwith %}
 
+    </div>
+
     {% if exposition.get_nearest_events %}
         <div class="e-cat">
             <div class="sect-title">
@@ -476,17 +477,6 @@
         </div>
     {% endif %}
 
-        {% include 'client/includes/banners/detail_inner_3.html' %}
-
-        <div class="e-cat look-also">
-            <div class="sect-title">{% trans 'Смотрите также:' %}</div>
-            <a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
-            <a href="{{ exposition.catalog }}country/{{ exposition.country.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
-            {% if exposition.theme.all %}
-                <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
-                <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
-            {% endif %}
-        </div>
 
     {% if request.GET.debug == '1' %}
         <script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>
@@ -516,6 +506,7 @@
     </script>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.js"></script>
+
     <script>
         $(window).load(function () {
             $('.last_photos_slider').slick({
@@ -525,17 +516,7 @@
                 asNavFor: '.last_photos_thumbs'
             });
 
-                $('.last_photos_thumbs').slick({
+            $(function () {
-                    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'),
@@ -553,8 +534,8 @@
                     $statistics.show();
                 }
             })
+        })
     </script>
-    {% endblock %}
 
     {% block content_text %}{% endblock %}