Merge branch 'stage8' of gitlab.com:OldminTeam/expomap into stage8

static/client/css/main.css

@@ -5630,7 +5630,7 @@ dl.add-info dd ul li {
     width: 11px;
     height: 13px;
     background: url(../img/sprites.png) -211px 0 no-repeat;
-    margin: -1px 5px 0 0
+    margin: -1px 10px 0 0;
 }
 .i-event-additional .e-docs a.translator:before {
     width: 15px;
@@ -14788,3 +14788,64 @@ h1 .preview_toggle:hover{
     font-weight: 500;
     color: #333;
 }
+
+.cli-m-buttons .new_subribe_btn {
+    float: none;
+}
+
+.exposition_booking_block .h-booking ul li:last-child {
+    margin-right: 0;
+}
+
+.exposition_booking_block .h-booking .sect-title a {
+    color: #40bbea;
+}
+
+.exposition_booking_block .h-booking .sect-title a:hover {
+    color: #1d447d;
+}
+
+.exposition_additional {
+    padding-left: 30px;
+}
+
+.exposition_additional:after {
+    content: '';
+    display: block;
+    clear: both;
+}
+
+.exposition_additional .sect-title {
+    font-size: 22px;
+    color: #333333;
+    font-weight: 600;
+}
+
+.exposition_additional .add-info {
+    font-size: 14px;
+    color: #808080;
+    line-height: 22px;
+}
+
+.exposition_additional .add-info a {
+    color: #808080;
+    text-decoration: underline;
+}
+
+.exposition_additional dl.add-info dd,
+.exposition_additional dl.add-info dt {
+    margin-bottom: 20px;
+}
+
+.exposition_additional .e-docs {
+    padding-top: 22px;
+}
+
+.exposition_additional .e-docs li{
+    margin-bottom: 13px;
+}
+
+.exposition_nearest .sect-title {
+    font-size: 23px;
+    font-weight: 500;
+}

static/client/js/_modules/block.exposition.list.js

@@ -6,13 +6,15 @@ if (EXPO.exposition.list){
 
     EXPO.exposition.list = (function () {
 // dependencies
-        var com = EXPO.common;
+        var com = EXPO.common,
+            $waiter;
 
 // variables
         var that = {};
         that.opt = {}; //свойства по умолчанию
 //private
         $(function () {
+            $waiter = $('#wait-ajax:not(.absolute)').css({'z-index': '8031'});
         });
 
 // methods
@@ -21,6 +23,56 @@ if (EXPO.exposition.list){
             $.extend(this.opt, options);
             com.opt.addCalendarText = this.opt.addCalendarText;
             com.opt.removeCalendarText = this.opt.removeCalendarText;
+
+            $('#'+this.opt.event_news_subscribe.id).on("submit", function () {
+                 var formData = $(this).serialize(),
+                    formUrl = $(this).attr("action"),
+                    $form = $(this),
+                    /**
+                     * executes after AJAX get request is complete
+                     * @param data - data recieved from server ex
+                     */
+                    handler = function (data) {
+                        var clearValue = function () {
+                            $('.err',$form).removeClass("err");
+                            $('.pwf-msg',$form).text('');
+                        };
+                        if (data.success != true){
+                            clearValue();
+                            for (var k in data.errors){
+                                if (data.errors.hasOwnProperty(k)) {
+                                    $('input[name="'+k+'"]',$form)
+                                        .closest(".required").addClass("err")
+                                        .siblings(".pwf-msg").text(data.errors[k]);
+                                }
+                            }
+
+                        } else {
+                            clearValue();
+                            dataLayer.push({'event': 'event-news-subscribe-form'});
+                            $('input:text',$form).val('');
+                            $('p#success').show();
+                            if (data.sent == true) {
+                                window.location = data.redirect_url;
+                            } else {
+                                window.setTimeout(function () {
+                                    $.fancybox.close();
+
+                                    $form
+                                        .parents('.pw-body')
+                                        .find('#success')
+                                        .hide();
+                                }, 1000);
+                            }
+
+
+                        }
+                        $waiter.hide();
+                    };
+                $waiter.show();
+                com.postRequest(formData,formUrl,handler);
+                return false;
+            });
         };
         return that;
     }());

static/client/js/_modules/page.exposition.object.js

@@ -105,7 +105,8 @@ if (EXPO.exposition.object){
             /**
              * event news subscribe form validation
              */
-            $('#'+this.opt.event_news_subscribe.id).on("submit", function () {
+            $(function () {
+                $('#'+self.opt.event_news_subscribe.id).on("submit", function () {
                     var formData = $(this).serialize(),
                         formUrl = $(this).attr("action"),
                         $form = $(this),
@@ -121,8 +122,6 @@ if (EXPO.exposition.object){
                             if (data.success != true){
                                 clearValue();
                                 for (var k in data.errors){
-                                console.log(data.errors.hasOwnProperty(k));
-                                console.log(k);
                                     if (data.errors.hasOwnProperty(k)) {
                                         $('input[name="'+k+'"]',$form)
                                             .closest(".required").addClass("err")
@@ -151,7 +150,7 @@ if (EXPO.exposition.object){
                     com.postRequest(formData,formUrl,handler);
                     return false;
                 });
-
+            });
         };
         return that;
     }());

static/client/js/main.js

@@ -81,6 +81,20 @@ function placeInput(width){
     var $body = $('body');
     var $doc = $(document);
 
+    var $event_news_subscribe_form = $('#event-news-subscribe-form'),
+        $modal_title = $('#pw-event-news-subscribe').find('.pw-title');
+
+    $('.new_subribe_btn').on('click', function () {
+        var $this = $(this),
+            // Null will be on detail page
+            name = $this.parents('.cl-item').find('.cli-title a').text() || null;
+
+        if (name) {
+            $modal_title.text($modal_title.text() + ' ' + name);
+        }
+        $event_news_subscribe_form.attr('action', $(this).data('url'));
+    });
+
 
     $.widget( "custom.catcomplete", $.ui.autocomplete, {
         _renderMenu: function( ul, items ) {

static/client/js/vendor.js

@@ -3760,6 +3760,20 @@ function placeInput(width){
     var $body = $('body');
     var $doc = $(document);
 
+    var $event_news_subscribe_form = $('#event-news-subscribe-form'),
+        $modal_title = $('#pw-event-news-subscribe').find('.pw-title');
+
+    $('.new_subribe_btn').on('click', function () {
+        var $this = $(this),
+            // Null will be on detail page
+            name = $this.parents('.cl-item').find('.cli-title a').text() || null;
+
+        if (name) {
+            $modal_title.text($modal_title.text() + ' ' + name);
+        }
+        $event_news_subscribe_form.attr('action', $(this).data('url'));
+    });
+
 
     $.widget( "custom.catcomplete", $.ui.autocomplete, {
         _renderMenu: function( ul, items ) {

static/client/js_min/_modules/block.exposition.list.min.js

@@ -1 +1 @@
-var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.list?console.warn("WARNING: EXPO.place.object is already defined!"):EXPO.exposition.list=function(){var t=EXPO.common,e={};return e.opt={},$(function(){}),e.init=function(e){$.extend(this.opt,e),t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText},e}();
+var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.list?console.warn("WARNING: EXPO.place.object is already defined!"):EXPO.exposition.list=function(){var e,t=EXPO.common,s={};return s.opt={},$(function(){e=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),s.init=function(s){$.extend(this.opt,s),t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText,$("#"+this.opt.event_news_subscribe.id).on("submit",function(){var s=$(this).serialize(),i=$(this).attr("action"),n=$(this),o=function(t){var s=function(){$(".err",n).removeClass("err"),$(".pwf-msg",n).text("")};if(1!=t.success){s();for(var i in t.errors)t.errors.hasOwnProperty(i)&&$('input[name="'+i+'"]',n).closest(".required").addClass("err").siblings(".pwf-msg").text(t.errors[i])}else s(),dataLayer.push({event:"event-news-subscribe-form"}),$("input:text",n).val(""),$("p#success").show(),1==t.sent?window.location=t.redirect_url:window.setTimeout(function(){$.fancybox.close(),n.parents(".pw-body").find("#success").hide()},1e3);e.hide()};return e.show(),t.postRequest(s,i,o),!1})},s}();

static/client/js_min/_modules/page.exposition.object.min.js

@@ -1 +1 @@
-var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var s,t=EXPO.common,e={};return e.opt={},$(function(){s=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),e.init=function(e){$.extend(this.opt,e);var i=this,o=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText,o.off("click"),o.on("click",function(){return $(this).hasClass("no_auth")||($(this).hasClass(i.opt.visit.activeClass)?($("."+i.opt.visit.activeClass).hide().siblings("."+i.opt.visit.passiveClass).show(),$("#"+i.opt.visit.visitorsListId).append(i.opt.visit.currentHtml),$("#"+i.opt.visit.somebodyId).removeClass("hidden"),$("#"+i.opt.visit.nobodyId).addClass("hidden")):($("."+i.opt.visit.passiveClass).hide().siblings("."+i.opt.visit.activeClass).show(),$("#"+i.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+i.opt.visit.visitorsListId).children().length&&($("#"+i.opt.visit.somebodyId).addClass("hidden"),$("#"+i.opt.visit.nobodyId).removeClass("hidden")))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var e=$(this).serialize(),i=$(this).attr("action"),o=$(this),r=function(t){var e=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(t.success!==!0){e();for(var i in t.errors)t.errors.hasOwnProperty(i)&&$('input[name="'+i+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(t.errors[i])}else e(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();s.hide()};return s.show(),t.postRequest(e,i,r),!1}),$("#"+this.opt.event_news_subscribe.id).on("submit",function(){var e=$(this).serialize(),i=$(this).attr("action"),o=$(this),r=function(t){var e=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=t.success){e();for(var i in t.errors)console.log(t.errors.hasOwnProperty(i)),console.log(i),t.errors.hasOwnProperty(i)&&$('input[name="'+i+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(t.errors[i])}else e(),dataLayer.push({event:"event-news-subscribe-form"}),$("input:text",o).val(""),$("p#success").show(),1==t.sent?window.location=t.redirect_url:window.setTimeout(function(){$.fancybox.close()},1e3);s.hide()};return s.show(),t.postRequest(e,i,r),!1})},e}();
+var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var s,t=EXPO.common,i={};return i.opt={},$(function(){s=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),i.init=function(i){$.extend(this.opt,i);var e=this,o=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText,o.off("click"),o.on("click",function(){return $(this).hasClass("no_auth")||($(this).hasClass(e.opt.visit.activeClass)?($("."+e.opt.visit.activeClass).hide().siblings("."+e.opt.visit.passiveClass).show(),$("#"+e.opt.visit.visitorsListId).append(e.opt.visit.currentHtml),$("#"+e.opt.visit.somebodyId).removeClass("hidden"),$("#"+e.opt.visit.nobodyId).addClass("hidden")):($("."+e.opt.visit.passiveClass).hide().siblings("."+e.opt.visit.activeClass).show(),$("#"+e.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+e.opt.visit.visitorsListId).children().length&&($("#"+e.opt.visit.somebodyId).addClass("hidden"),$("#"+e.opt.visit.nobodyId).removeClass("hidden")))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),r=function(t){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(t.success!==!0){i();for(var e in t.errors)t.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(t.errors[e])}else i(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();s.hide()};return s.show(),t.postRequest(i,e,r),!1}),$(function(){$("#"+e.opt.event_news_subscribe.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),r=function(t){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=t.success){i();for(var e in t.errors)t.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(t.errors[e])}else i(),dataLayer.push({event:"event-news-subscribe-form"}),$("input:text",o).val(""),$("p#success").show(),1==t.sent?window.location=t.redirect_url:window.setTimeout(function(){$.fancybox.close()},1e3);s.hide()};return s.show(),t.postRequest(i,e,r),!1})})},i}();

templates/client/blank.html

@@ -169,7 +169,7 @@ This template include basic anf main styles and js files,
 
             {% block main_part %}{% endblock %}
 
-{#            {% block top %}{% endblock %}#}
+            {% block top %}{% endblock %}
 
             {% block search %}{% endblock %}
 

templates/client/exposition/exposition_detail.html

@@ -126,7 +126,9 @@
             </div>
 
             <div class="event_org">
-                <a href="#pw-event-news-subscribe" class="button pw-open new_subribe_btn green"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>
+                <a href="#pw-event-news-subscribe" class="button pw-open new_subribe_btn green" data-url="{% url 'events:subscribe' object.event_type object.url %}">
+                    <i class="fa fa-at"></i>&nbsp;{% trans 'Напомнить о событии' %}
+                </a>
             </div>
         </div>
 
@@ -229,11 +231,11 @@
         <hr>
 
         {# Дополнительная информация #}
-        <div id="additional" class="i-event-additional clearfix">
+        <div id="additional" class="i-event-additional exposition_additional">
-            <div class="sect-title">{% trans 'Дополнительная информация' %}</div>
+            <div class="sect-title">{% trans 'Дополнительная информация и сервисы:' %}</div>
 
             <ul class="e-docs">
-                {% if exposition.business_program.exists %}
+                {% comment %}{% if exposition.business_program.exists %}
                     <li><a href="{{ exposition.get_permanent_url }}program/">{% trans 'Деловая программа' %}</a></li>
                 {% endif %}
 
@@ -241,19 +243,29 @@
 
                 {% if exposition.statistic_exists %}
                     <li><a href="{{ exposition.get_permanent_url }}statistic/">{% trans 'Статистика' %}</a></li>
-                {% endif %}
+                {% endif %}{% endcomment %}
                 <li><a href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ exposition.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ exposition.data_begin|date:'j' }}&checkin_year_month={{ exposition.data_begin|date:'Y' }}-{{ exposition.data_begin|date:'n' }}&checkout_monthday={{ exposition.data_end|date:'j' }}&checkout_year_month={{ exposition.data_end|date:'Y' }}-{{ exposition.data_end|date:'n' }}" class="find_hotel" target="_blank">{% trans 'Найти отель' %}</a></li>
                 <li><a href="http://www.rentalcars.com/SearchResults.do?enabler=&country={{ exposition.country }}&doYear={{ exposition.data_begin|date:'Y' }}&city={{ exposition.city }}&driverage=on&doFiltering=true&dropCity={{ exposition.city }}&driversAge=30&filterTo=49&fromLocChoose=true&dropLocationName={{ exposition.city }}+(Все+места)+&dropCountryCode=&doMinute=0&countryCode=&puYear={{ exposition.data_end|date:'Y' }}&locationName={{ exposition.city }}+(Все+места)+&puMinute=0&doDay={{ exposition.data_begin|date:'d' }}&searchType=allareasgeosearch&filterFrom=0&puMonth={{ exposition.data_end|date:'m' }}&dropLocation=-1&doHour=10&dropCountry={{ exposition.country }}&puDay={{ exposition.data_end|date:'d' }}&puHour=10&location=-1&doMonth={{ exposition.data_begin|date:'m' }}&filterName=CarCategorisationSupplierFilter&affiliateCode=expomap790&preflang=ru" class="car_rent" target="_blank">{% trans 'Арендовать авто' %}</a></li>
                 <li><a href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ exposition.city.name }}" class="translator" target="_blank">{% trans 'Услуги переводчика' %}</a></li>
             </ul>
 
             <dl class="add-info">
+                {% if exposition.products %}
+                    <dt>{% trans 'Экспонируемые продукты' %}:</dt>
+                    <dd>{{ exposition.products|safe }}</dd>
+                {% endif %}
+
+                {% if exposition.time %}
+                    <dt>{% trans 'Время работы' %}:</dt>
+                    <dd>{{ exposition.time|safe }}</dd>
+                {% endif %}
+
                 {% if exposition.organiser.all.exists %}
                     <dt>{% trans 'Организатор' %}:</dt>
                     <dd>
                         {% with organisers=exposition.organiser.all %}
                             {% for organiser in organisers %}
-                                {{ organiser.name }}<br />
+                                {{ organiser.name|safe }}<br />
                             {% endfor %}
                         {% endwith %}
                     </dd>
@@ -262,22 +274,19 @@
                         {% for item in exposition.org_split %}
                             <dt>{% if forloop.counter == 1 %}{% trans 'Организатор' %}:{% endif  %}</dt>
 
-                            <dd>
+                            <dd>{{ item|safe }}</dd>
-                            {{ item }}
-                            </dd>
                         {% endfor %}
-
                     {% endif %}
                 {% endif %}
 
                 {% if exposition.web_page %}
                     <dt>{% trans 'Веб-сайт' %}:</dt>
                     <dd>
-                        <a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ exposition.web_page|base64_encode }}" class="link-encode">{{ exposition.web_page }}</a>
+                        <a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ exposition.web_page|base64_encode }}" class="link-encode">{% trans 'перейти на сайт выставки' %}</a>
                     </dd>
                 {% endif %}
 
-                {% if exposition.get_audience %}
+                {% comment %}{% if exposition.get_audience %}
                     <dt>{% trans 'Аудитория' %}:</dt>
                     <dd>{{ exposition.get_audience }}</dd>
                 {% endif %}
@@ -285,29 +294,20 @@
                 {% if exposition.get_periodic %}
                     <dt>{% trans 'Периодичность' %}:</dt>
                     <dd>{{ exposition.get_periodic }}</dd>
-                {% endif %}
+                {% endif %}{% endcomment %}
-
-                {% if exposition.products %}
-                    <dt>{% trans 'Экспонируемые продукты' %}:</dt>
-                    <dd>{{ exposition.products|safe }}</dd>
-                {% endif %}
-
-                {% if exposition.time %}
-                    <dt>{% trans 'Время работы' %}:</dt>
-                    <dd>{{ exposition.time|safe }}</dd>
-                {% endif %}
             </dl>
         </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 %}
                     {# есть посетители #}
@@ -335,7 +335,7 @@
         {% if exposition.get_photos %}
             {% with photos=exposition.get_photos %}
                 <div class="conference_slider">
-                    <h2><a href="{{ exposition.get_permanent_url }}photo/">{% trans 'Фотографии с прошлой конференции' %}</a></h2>
+                    <h2><a href="{{ exposition.get_permanent_url }}photo/">{% trans 'Фотографии с прошлой выставки' %}</a></h2>
                     <div class="last_photos_slider">
                         {% for photo in photos %}
                             {% thumbnail photo.image '936x468' crop="center" as im %}
@@ -359,34 +359,8 @@
             {% include "client/includes/article/articles_in_event.html" with event=exposition news_list=news %}
         </div>
 
-        {% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %}
-            <div class="e-num-info">
-                {% if exposition.area %}
-                    <div class="eni-area-wrap">
-                        <div class="eni-title">{% trans 'Общая выставочная площадь' %}</div>
-                        <div class="eni-area">
-                            {{ exposition.area }} {% trans 'м²' %}
-                        </div>
-                    </div>
-                {% endif %}
-                <div class="eni-stats">
-                    {% if exposition.members %}
-                        <div class="enis-item"><b>{{ exposition.members }}</b> {% trans 'участников' %}</div>
-                    {% endif %}
-
-                    {% if exposition.visitors %}
-                        <div class="enis-item"><b>{{ exposition.visitors }}</b> {% trans 'посетителей' %}</div>
-                    {% endif %}
-
-                    {% if exposition.foundation_year %}
-                        <div class="eni-founded">{% trans 'Основано в' %} <b>{{ exposition.foundation_year }}</b> {% trans 'году' %}</div>
-                    {% endif %}
-                </div>
-            </div>
-        {% endif %}
-
         <div class="conf_comments">
-            <h2>{% trans 'Комментарии' %}</h2>
+            <h2>{% trans 'Что вы думаете о выставке?' %}</h2>
             {% include 'client/includes/comments.html' %}
         </div>
     </div>
@@ -397,18 +371,10 @@
 
     {% include 'client/includes/banners/catalog_inner_2.html' %}
 
-    {% with themes=exposition.themes %}
-        {% for theme in themes %}
-            <li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.expositions_number }})</a></li>
-        {% endfor %}
-    {% endwith %}
-
     {% if exposition.get_nearest_events %}
-        <div class="e-cat">
+        <div class="e-cat exposition_nearest">
             <div class="sect-title">
-                {% with themes=exposition.themes %}
+                {% trans 'Другие выставки, которые могут быть вам интересны:' %}
-                    {% trans 'Ближайшие выставки по тематике' %} «{% for theme in themes %}{{ theme.name }}{% if not forloop.last %}, {% endif %}{% endfor %}»
-                {% endwith %}
             </div>
             <ul class="cat-list cl-exhibitions">
                 {% for exp in exposition.get_nearest_events %}
@@ -482,10 +448,8 @@
             <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>
 
-    {% include 'client/popups/advertise_member.html' with form=advertising_form %}
+    </div>
-    {% include 'client/popups/event_news_subscribe.html' %}
 
     {% if request.GET.debug == '1' %}
         <script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>
@@ -515,6 +479,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({
@@ -524,16 +489,6 @@
                 asNavFor: '.last_photos_thumbs'
             });
 
-            $('.last_photos_thumbs').slick({
-                slidesToShow: 5,
-                slidesToScroll: 1,
-                asNavFor: '.last_photos_slider',
-                dots: false,
-                variableWidth: true,
-                focusOnSelect: true
-            });
-        });
-
             $(function () {
                 var $recommended = $('#recommended_expositions'),
                     $statistics = $('#expo_statistics'),
@@ -552,5 +507,13 @@
                     $statistics.show();
                 }
             })
+        })
     </script>
+
+    {% block content_text %}{% endblock %}
+
+    {% block popup %}
+        {% include 'client/popups/advertise_member.html' with form=advertising_form %}
+        {% include 'client/popups/event_news_subscribe.html' %}
+    {% endblock %}
 {% endblock %}

templates/client/includes/exposition/exposition_list.html

@@ -79,6 +79,11 @@
                             <div class="cli-m-buttons">
                                 {% include 'client/includes/exposition/services.html' with obj=obj %}
                                 {% include 'client/includes/calendar_button.html'  with obj=obj%}
+
+                                <a href="#pw-event-news-subscribe" class="button pw-open new_subribe_btn green" data-url="{% url 'events:subscribe' obj.event_type obj.url %}">
+                                    <i class="fa fa-at"></i>&nbsp;{% trans 'Напомнить о событии' %}
+                                </a>
+
                                 {% if request.user.is_admin %}
                                     <div class="note-wrap">
                                         <a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a>
@@ -130,6 +135,10 @@
     {% endif %}
 {% endwith %}
 
+{% block popup %}
+    {% include 'client/popups/event_news_subscribe.html' %}
+{% endblock %}
+
 {% block scripts %}
     {% if request.GET.debug == '1' %}
         <script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script>
@@ -140,7 +149,10 @@
     <script>
         EXPO.exposition.list.init({
             addCalendarText:"{% trans 'В расписание' %}",
-            removeCalendarText:"{% trans 'Из расписания' %}"
+            removeCalendarText:"{% trans 'Из расписания' %}",
+            event_news_subscribe: {
+                id: 'event-news-subscribe-form'
+            }
         });
     </script>
 {% endblock %}

templates/client/popups/event_news_subscribe.html

@@ -3,7 +3,6 @@
 
 <div id="pw-event-news-subscribe" class="popup-window event-news-subscribe-modal" style="display: none;">
     <section>
-
         <header class="clearfix">
             <div class="pw-title">{% trans 'Подписка на новости' %} {{ object.name }}</div>
         </header>
@@ -11,7 +10,7 @@
             <p id="success" style="display: none;">
                 {% trans 'Вы были успешно подписаны!' %}
             </p>
-			<form id="event-news-subscribe-form" method="post" class="pw-form"  action="{% url 'events:subscribe' object.event_type object.url %}">
+            <form id="event-news-subscribe-form" method="post" class="pw-form"  action=".{# url 'events:subscribe' object.event_type object.url #}">
                 {% csrf_token %}
                 {% if not user.is_authenticated or not user.contact_set.exists %}
                     <div class="pwf-line">