From fde640e997a0792fdcf84535ea3a646d5f39a40c Mon Sep 17 00:00:00 2001 From: ArtemB Date: Fri, 1 Dec 2023 00:34:42 +0300 Subject: [PATCH] 0.0.283 add success_msg for forms, clear forms --- static/css/styles.css | 15 ++++ static/js/user_profile.js | 71 ++++++++++--------- templates/blocks/b_footer.html | 4 +- .../static_pages_blocks/b_about_service.html | 12 ++-- .../static_pages_blocks/b_feedback_form.html | 8 ++- templates/widgets/w_msg_send_success.html | 7 +- 6 files changed, 75 insertions(+), 42 deletions(-) diff --git a/static/css/styles.css b/static/css/styles.css index d1b946a..1e122c3 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1888,11 +1888,26 @@ button#edit_route { font-weight: 700; background: #FFFFFF; box-shadow: -1px 4px 10px 0px rgba(198, 199, 203, 0.20), 0px -1px 10px 0px rgba(198, 199, 203, 0.20); + z-index: 1; + position: absolute; + height: 100%; + width: 101%; + border-radius: 10px; } + +.msg_text { + margin-top: 100px; +} + + .msg_send.hide{ display: none; } +.form_wrapper{ + position: relative; +} + button.confirm_remove{ width: 48.5%; diff --git a/static/js/user_profile.js b/static/js/user_profile.js index cb8a8fd..ddcee75 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -202,6 +202,8 @@ function cancelRemove(route_id) { function hideBlock(el) { el.classList.add('hide') + let clear_form = document.getElementsByClassName('clear_form'); + clear_form[0].reset(); } @@ -800,6 +802,9 @@ function RequestCommercialOffer (el){ event.preventDefault() + let disable_btn = document.getElementById('send_feedback_form'); + disable_btn.setAttribute('disabled', true); + let form = el.form; let formData = new FormData(form); let form_name = form.dataset['name'] @@ -819,6 +824,8 @@ function RequestCommercialOffer (el){ success: function(data){ $(data.html).insertBefore(document.querySelector(".feedback_form")) + let disable_btn = document.getElementById('send_feedback_form'); + disable_btn.removeAttribute('disabled'); }, @@ -828,38 +835,38 @@ function RequestCommercialOffer (el){ }); } -function SendFeedbackForm (el){ - - event.preventDefault() - let form = el.form; - let formData = new FormData(form); - let form_name = form.dataset['name'] - formData.set('form_name',form_name) - - - - - $.ajax({ - headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, - // url: '/user_account/request_offer/', - type: "POST", - // async: true, - cache: false, - processData: false, - contentType: false, - // enctype: 'json', - data: formData, - success: function(data){ - - // location.href = '/profile' - - - }, - error: function (data, exception){ - // document.querySelector(".login").innerHTML = data.responseJSON.html - } - }); -} +// function SendFeedbackForm (el){ +// +// event.preventDefault() +// let form = el.form; +// let formData = new FormData(form); +// let form_name = form.dataset['name'] +// formData.set('form_name',form_name) +// +// +// +// +// $.ajax({ +// headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, +// // url: '/user_account/request_offer/', +// type: "POST", +// // async: true, +// cache: false, +// processData: false, +// contentType: false, +// // enctype: 'json', +// data: formData, +// success: function(data){ +// +// // location.href = '/profile' +// +// +// }, +// error: function (data, exception){ +// // document.querySelector(".login").innerHTML = data.responseJSON.html +// } +// }); +// } diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 8fbc6b3..a6086c7 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -7,7 +7,9 @@
- diff --git a/templates/blocks/static_pages_blocks/b_about_service.html b/templates/blocks/static_pages_blocks/b_about_service.html index 9cff778..ac17bc5 100644 --- a/templates/blocks/static_pages_blocks/b_about_service.html +++ b/templates/blocks/static_pages_blocks/b_about_service.html @@ -53,14 +53,16 @@
- - - - + + + + +
+ {% include "blocks/static_pages_blocks/b_feedback_form.html" %} - {% include "blocks/static_pages_blocks/b_feedback_form.html" %} +
diff --git a/templates/blocks/static_pages_blocks/b_feedback_form.html b/templates/blocks/static_pages_blocks/b_feedback_form.html index f3da64b..2a27aba 100644 --- a/templates/blocks/static_pages_blocks/b_feedback_form.html +++ b/templates/blocks/static_pages_blocks/b_feedback_form.html @@ -14,13 +14,17 @@ {% endif %}
- + {% if form.username and form.errors.username %} {{ form.errors.username }} {% endif %} @@ -60,7 +64,7 @@
- +
diff --git a/templates/widgets/w_msg_send_success.html b/templates/widgets/w_msg_send_success.html index 281626f..dabfaf3 100644 --- a/templates/widgets/w_msg_send_success.html +++ b/templates/widgets/w_msg_send_success.html @@ -3,7 +3,10 @@
+ class="msg_send" + > + +
{% translate 'Ваше сообщение отправлено' %}
+ - {% translate 'Ваше сообщение отправлено' %}
\ No newline at end of file