From 39a39928889bf98bb10cd9d64ac00e35131dc3c7 Mon Sep 17 00:00:00 2001 From: pavel Date: Thu, 29 Jan 2015 19:27:22 +0000 Subject: [PATCH] after register with bugs --- templates/client/blank.html | 2 ++ .../static_client/js/_modules/block.common.js | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/templates/client/blank.html b/templates/client/blank.html index 8951c52c..a24b3636 100644 --- a/templates/client/blank.html +++ b/templates/client/blank.html @@ -42,6 +42,8 @@ This template include basic anf main styles and js files, addCalendarText:"{% trans 'добавить в календарь' %}", removeCalendarText:"{% trans 'Убрать из календаря' %}", loginModalId:'pw-login', + registerFormId:'reg_form', + successRegisterId:'pw-reg-complete', resendLetterClass:'resend-letter', resendLetterUrl:'/registration/reply/', staticValidation:{ diff --git a/templates/client/static_client/js/_modules/block.common.js b/templates/client/static_client/js/_modules/block.common.js index 363e116f..767b619a 100644 --- a/templates/client/static_client/js/_modules/block.common.js +++ b/templates/client/static_client/js/_modules/block.common.js @@ -78,13 +78,23 @@ if (EXPO.common){ DOMerrBox = self.DOM.querySelector('.'+errBoxClass), errBoxText = DOMerrBox.innerHTML, handler = function (data){ + var $succesRegisterModal, + mailVal; responseData = data; self.unHighlightFields(); if(responseData.success){ if(DOMerrBox){ EXPO.common.removeClass(DOMerrBox, 'active'); } - window.location.reload(); + if($(self.DOM).attr('id') == EXPO.common.opt.registerFormId){ + $succesRegisterModal = $('#'+EXPO.common.opt.successRegisterId); + mailVal = $('#id_email',self.DOM); + $('.'+EXPO.common.opt.resendLetterClass,$succesRegisterModal).attr('data-email',mailVal); + $succesRegisterModal.fancybox(); + }else{ + + window.location.reload(); + } }else{ EXPO.common.removeClass(DOMerrBox, 'active'); inputObj ={}; @@ -200,8 +210,8 @@ if (EXPO.common){ $("input[type='checkbox'], input[type='radio']").customRadioCheck(); // add to calendar button click event functional + $.fancybox('#pw-reg-complete'); - $.fancybox($('#pw-reg-complete')); }); @@ -320,9 +330,6 @@ if (EXPO.common){ url = self.opt.resendLetterUrl; $waiter.show(); EXPO.common.getRequest({'email':email},url, function (data) { - - console.log('resent letter exeuted:'); - console.log(data); $waiter.hide(); }); return false;