Merge branch 'develop' of http://git.general-servers.com/expomap/expomap

static/seminar_lending/js/main.js

@@ -1,31 +1,45 @@
 $(document).ready(function () {
-	var controller = $.superscrollorama({
-		triggerAtCenter: true,
-		//playoutAnimations: true,
-		reverse:false
-	});
-	controller.addTween('#quote-strip',
-		TweenMax.from($('#quote-strip'), .3, {css:{opacity:0}}));
-	controller.addTween('#event-program-strip',
-		TweenMax.from($('#event-program-strip'), .5, {css:{opacity:0}}));
-	controller.addTween('#footer',
-		TweenMax.from($('#footer'), .5, {css:{opacity:0}}));
+	// var controller = $.superscrollorama({
+	// 	triggerAtCenter: true,
+	// 	//playoutAnimations: true,
+	// 	reverse:false
+	// });
+	// controller.addTween('#quote-strip',
+	// 	TweenMax.from($('#quote-strip'), .3, {css:{opacity:0}}));
+	// controller.addTween('#event-program-strip',
+	// 	TweenMax.from($('#event-program-strip'), .5, {css:{opacity:0}}));
+	// controller.addTween('#footer',
+	// 	TweenMax.from($('#footer'), .5, {css:{opacity:0}}));
 	$(".modal-dialog .btn").on("click", function(){
 		$(this).closest(".modal-content").find("form").submit();
 		return false;
 	})
 	$("form").on("submit", function(e){
 		e.preventDefault();
-		var url = $(this).attr("action"),
-			form = $(this).serialize();
+		var $this = $(this),
+			url = $this.attr("action"),
+			form = $this.serialize(),
+			$modalBody = $this.parent(),
+			$message = $("<p class='success-message'></p>"),
+			$button = $this.closest(".modal-dialog").find(".btn"),
+			$loader = $(".loader",$modalBody);
+			$loader.show();
 		$.post(
 		  url,
 		  form,
 		  function(data){
 		  	console.log(data);
+
+		  	if(data.message.length){
+				$this.fadeOut("fast",function(){
+					$loader.hide();
+					
+					$message.text(data.message).appendTo($modalBody);
+				});
+				$button.fadeOut();
+		  	}
 		  }
 		);
 
-		console.log("!!!submit");
 	})
 });

templates/client/simple_pages/expo_seminar.html

@@ -201,6 +201,9 @@
 				<h4 class="modal-title" id="myModalLabel">Запрос на приглашение на семинар</h4>
 			</div>
 			<div class="modal-body">
+				<div class="loader" style=" background: rgba(255,255,255,.5);position: absolute; top: 0;left: 0;width: 100%;height: 100%; z-index: 3; display: none;">
+					<img src="/static/img/ajax-loader.gif" alt="" style="position: absolute;top: 50%;left: 50%;margin-top: -27px;margin-left: -27px;"/>
+				</div>
 				<form id="register-form" method="post" action="/page/seminar-prodvizhenie/handle/">{% csrf_token %}
                     <input id="id_type" name="type" type="hidden" value="Запрос на приглашение на семинар">
 					<div class="form-group">
@@ -235,6 +238,9 @@
 				<h4 class="modal-title" id="myModalLabel">Запрос на онлайн-трансляцию</h4>
 			</div>
 			<div class="modal-body">
+				<div class="loader" style=" background: rgba(255,255,255,.5);position: absolute; top: 0;left: 0;width: 100%;height: 100%; z-index: 3; display: none;">
+					<img src="/static/img/ajax-loader.gif" alt="" style="position: absolute;top: 50%;left: 50%;margin-top: -27px;margin-left: -27px;"/>
+				</div>
 				<form id="register-form" method="post" action="/page/seminar-prodvizhenie/handle/">{% csrf_token %}
                     <input id="id_type" name="type" type="hidden" value="Запрос на онлайн-трансляцию">
 					<div class="form-group">