From 2bf80570e893ca75a0201bb3ab2cc1f5af42e969 Mon Sep 17 00:00:00 2001 From: pavel Date: Tue, 9 Jun 2015 07:28:30 +0000 Subject: [PATCH 1/3] expo-186 ready --- static/seminar_lending/js/main.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/static/seminar_lending/js/main.js b/static/seminar_lending/js/main.js index 4439500a..f321fa88 100644 --- a/static/seminar_lending/js/main.js +++ b/static/seminar_lending/js/main.js @@ -16,16 +16,26 @@ $(document).ready(function () { }) $("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 = $("

"), + $button = $this.closest(".modal-dialog").find(".btn"); $.post( url, form, function(data){ console.log(data); + + if(data.message.length){ + $this.fadeOut("fast",function(){ + $button.fadeOut(); + $message.text(data.message).appendTo($modalBody); + }); + } } ); - console.log("!!!submit"); }) }); From e7d5ae991e2d3884814007a9e8bd3453f47c7704 Mon Sep 17 00:00:00 2001 From: pavel Date: Tue, 9 Jun 2015 07:37:04 +0000 Subject: [PATCH 2/3] expo-186 ready loader added --- static/seminar_lending/js/main.js | 5 ++++- templates/client/simple_pages/expo_seminar.html | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/static/seminar_lending/js/main.js b/static/seminar_lending/js/main.js index f321fa88..6e8ab3bf 100644 --- a/static/seminar_lending/js/main.js +++ b/static/seminar_lending/js/main.js @@ -21,7 +21,9 @@ $(document).ready(function () { form = $this.serialize(), $modalBody = $this.parent(), $message = $("

"), - $button = $this.closest(".modal-dialog").find(".btn"); + $button = $this.closest(".modal-dialog").find(".btn"), + $loader = $(".loader",$modalBody); + $loader.show(); $.post( url, form, @@ -30,6 +32,7 @@ $(document).ready(function () { if(data.message.length){ $this.fadeOut("fast",function(){ + $loader.hide(); $button.fadeOut(); $message.text(data.message).appendTo($modalBody); }); diff --git a/templates/client/simple_pages/expo_seminar.html b/templates/client/simple_pages/expo_seminar.html index 916c26e2..5580676f 100644 --- a/templates/client/simple_pages/expo_seminar.html +++ b/templates/client/simple_pages/expo_seminar.html @@ -201,6 +201,9 @@