after register with bugs

remotes/origin/1203
pavel 11 years ago
parent 1ca2c27c8b
commit 39a3992888
  1. 2
      templates/client/blank.html
  2. 17
      templates/client/static_client/js/_modules/block.common.js

@ -42,6 +42,8 @@ This template include basic anf main styles and js files,
addCalendarText:"{% trans 'добавить в календарь' %}", addCalendarText:"{% trans 'добавить в календарь' %}",
removeCalendarText:"{% trans 'Убрать из календаря' %}", removeCalendarText:"{% trans 'Убрать из календаря' %}",
loginModalId:'pw-login', loginModalId:'pw-login',
registerFormId:'reg_form',
successRegisterId:'pw-reg-complete',
resendLetterClass:'resend-letter', resendLetterClass:'resend-letter',
resendLetterUrl:'/registration/reply/', resendLetterUrl:'/registration/reply/',
staticValidation:{ staticValidation:{

@ -78,13 +78,23 @@ if (EXPO.common){
DOMerrBox = self.DOM.querySelector('.'+errBoxClass), DOMerrBox = self.DOM.querySelector('.'+errBoxClass),
errBoxText = DOMerrBox.innerHTML, errBoxText = DOMerrBox.innerHTML,
handler = function (data){ handler = function (data){
var $succesRegisterModal,
mailVal;
responseData = data; responseData = data;
self.unHighlightFields(); self.unHighlightFields();
if(responseData.success){ if(responseData.success){
if(DOMerrBox){ if(DOMerrBox){
EXPO.common.removeClass(DOMerrBox, 'active'); 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{ }else{
EXPO.common.removeClass(DOMerrBox, 'active'); EXPO.common.removeClass(DOMerrBox, 'active');
inputObj ={}; inputObj ={};
@ -200,8 +210,8 @@ if (EXPO.common){
$("input[type='checkbox'], input[type='radio']").customRadioCheck(); $("input[type='checkbox'], input[type='radio']").customRadioCheck();
// add to calendar button click event functional // 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; url = self.opt.resendLetterUrl;
$waiter.show(); $waiter.show();
EXPO.common.getRequest({'email':email},url, function (data) { EXPO.common.getRequest({'email':email},url, function (data) {
console.log('resent letter exeuted:');
console.log(data);
$waiter.hide(); $waiter.hide();
}); });
return false; return false;

Loading…
Cancel
Save