diff --git a/static/css/styles.css b/static/css/styles.css index 10017d3..218d88a 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -276,7 +276,7 @@ section.register>h1 { } .footer_input_wrap { display: flex; - color: #fff; + color: #FF613A; } diff --git a/static/js/authorization.js b/static/js/authorization.js index 13de9b5..0bd42ed 100644 --- a/static/js/authorization.js +++ b/static/js/authorization.js @@ -3,6 +3,8 @@ function SendLoginForm(el){ event.preventDefault() let form = el.form; let formData = new FormData(form); + let msr = sessionStorage.getItem('mailingSubscribeRequired') + formData.set('mailingSubscribeRequired',msr) diff --git a/static/js/global_js.js b/static/js/global_js.js index 4dd3124..8c5e703 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -158,6 +158,17 @@ document.addEventListener('DOMContentLoaded', function() { img.style.backgroundPosition = "center" // img.style.backgroundSize = '50%' } + + + let login_email = document.getElementById('login_email_input') + let registration_email = document.getElementById('registration_email_input') + if(login_email){ + login_email.value = sessionStorage.getItem('email') + }else if(registration_email){ + registration_email.value = sessionStorage.getItem('email') + } + + }); // window.addEventListener('scroll', () => { diff --git a/static/js/registration.js b/static/js/registration.js index 7defc91..5296041 100644 --- a/static/js/registration.js +++ b/static/js/registration.js @@ -2,6 +2,8 @@ function SendRegistrationForm(el){ event.preventDefault() let form = el.form; let formData = new FormData(form); + let msr = sessionStorage.getItem('mailingSubscribeRequired') + formData.set('mailingSubscribeRequired',msr) $.ajax({ headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 4ec9cbd..30232d4 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -1002,9 +1002,6 @@ function subscribeNewsletter (el){ disable_btn_f.setAttribute('disabled', true); - - - let form = el.form; let formData = new FormData(form); let form_name = form.dataset['name'] @@ -1026,6 +1023,18 @@ function subscribeNewsletter (el){ // el.style.background = '#FF613A'; el.removeAttribute('style') + if(data.status === 'sended' && data.del_form === true){ + + document.querySelector('.footer_input_wrap').innerHTML = data.html; + + } else if(data.redirect_url){ + window.sessionStorage.setItem('email', data.email) + window.sessionStorage.setItem('mailingSubscribeRequired','true') + window.location.replace(data.redirect_url) + + + + } if(el.id !== 'footer_input_button'){ @@ -1036,12 +1045,14 @@ function subscribeNewsletter (el){ let insert_text_2 = document.querySelector(".commercial_offer") if(insert_text_2){ - $(data.html).insertBefore(insert_text_2) } } else { let disable_btn_f = document.getElementById('footer_input_button'); - disable_btn_f.removeAttribute('disabled'); + if(disable_btn_f){ + disable_btn_f.removeAttribute('disabled'); + } + let clear_footer_form = document.getElementById('clear_input'); clear_footer_form.reset(); @@ -1071,14 +1082,7 @@ function subscribeNewsletter (el){ // $(data.responseJSON.html).insertBefore(footer_form) } - - - - - // document.querySelector(".info_profile").innerHTML = data.html; - - } }); diff --git a/templates/forms/f_login.html b/templates/forms/f_login.html index c55af35..8a861d6 100644 --- a/templates/forms/f_login.html +++ b/templates/forms/f_login.html @@ -17,7 +17,14 @@ {% endif %}
- + {% if form.username and form.errors.username %} {{ form.errors.username }} {% endif %} diff --git a/templates/forms/f_one_field_form.html b/templates/forms/f_one_field_form.html index 0ea9d92..d5817bc 100644 --- a/templates/forms/f_one_field_form.html +++ b/templates/forms/f_one_field_form.html @@ -7,10 +7,16 @@ data-name="msg_from_footer" {% if form.form_name %}data-name="{{ form.form_name}}"{% endif %} > -