diff --git a/static/client/js/_modules/block.exposition.list.js b/static/client/js/_modules/block.exposition.list.js index c39d8c61..27b14172 100644 --- a/static/client/js/_modules/block.exposition.list.js +++ b/static/client/js/_modules/block.exposition.list.js @@ -6,15 +6,13 @@ if (EXPO.exposition.list){ EXPO.exposition.list = (function () { // dependencies - var com = EXPO.common, - $waiter; + var com = EXPO.common; // variables var that = {}; that.opt = {}; //свойства по умолчанию //private $(function () { - $waiter = $('#wait-ajax:not(.absolute)').css({'z-index': '8031'}); }); // methods @@ -23,56 +21,6 @@ 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; }()); diff --git a/static/client/js_min/_modules/block.exposition.list.min.js b/static/client/js_min/_modules/block.exposition.list.min.js index a80d8210..cf8d4314 100644 --- a/static/client/js_min/_modules/block.exposition.list.min.js +++ b/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 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}(); \ No newline at end of file +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}(); \ No newline at end of file diff --git a/templates/client/includes/exposition/exposition_list.html b/templates/client/includes/exposition/exposition_list.html index 9f9b3515..dda8780a 100644 --- a/templates/client/includes/exposition/exposition_list.html +++ b/templates/client/includes/exposition/exposition_list.html @@ -80,10 +80,6 @@ {% include 'client/includes/exposition/services.html' with obj=obj %} {% include 'client/includes/calendar_button.html' with obj=obj%} - -  {% trans 'Напомнить о событии' %} - - {% if request.user.is_admin %}
{% trans 'изменить' %} @@ -149,10 +145,7 @@ {% endblock %}