From cffd810184e5f6938dd3db4f9d86d0fb145c7d94 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Wed, 23 Oct 2024 13:31:28 +0300 Subject: [PATCH 1/7] TRI-274 replace password recovery text --- AuthApp/js_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AuthApp/js_views.py b/AuthApp/js_views.py index 294797c..5226337 100644 --- a/AuthApp/js_views.py +++ b/AuthApp/js_views.py @@ -138,7 +138,7 @@ def password_recovery_ajax(request): return JsonResponse({ 'status': 'sended', 'message': _('На email') + ' ' + email + ' ' - + _('отправлено письмо с инструкциями для восстановления пароля') + + _('отправлено письмо с инструкциями для восстановления пароля. Если не пришло письмо, проверьте папку СПАМ') }) except Exception as e: From 08e28d14c95a0d90cade25c330f4fb01eaa9b8a5 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Wed, 23 Oct 2024 13:44:47 +0300 Subject: [PATCH 2/7] TRI-274 replace password recovery text --- templates/forms/f_registration.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/forms/f_registration.html b/templates/forms/f_registration.html index 7dc2a27..2f788ad 100644 --- a/templates/forms/f_registration.html +++ b/templates/forms/f_registration.html @@ -115,9 +115,9 @@
-
-
{% trans 'На Вашу почту отправлено письмо для подтверждения регистрации. Если не получили письмо, то проверьте папку СПАМ' %}
-
+
+
{% trans 'На Вашу почту отправлено письмо для подтверждения регистрации. Если не получили письмо, то проверьте папку СПАМ' %}
+
From a1da574c04748b206c53871c85c6ba9244e2470d Mon Sep 17 00:00:00 2001 From: sysadminix Date: Wed, 23 Oct 2024 13:54:33 +0300 Subject: [PATCH 3/7] TRI-274 replace password recovery text --- static/js/registration.js | 1 - 1 file changed, 1 deletion(-) diff --git a/static/js/registration.js b/static/js/registration.js index 05d4c73..c57aa88 100644 --- a/static/js/registration.js +++ b/static/js/registration.js @@ -24,7 +24,6 @@ function SendRegistrationForm(el, user_id){ success: function(data){ document.getElementById('confirm_password').innerHTML = data.message - document.querySelector('.info_text').classList.add('show') // location.href = `/profile/page/dashboard/` window.sessionStorage.removeItem('mailingSubscribeRequired') From e8f092a88bffa8caa235c27883741c0136caed40 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Thu, 24 Oct 2024 10:39:15 +0300 Subject: [PATCH 4/7] TRI-275 disable googlesindicator script in head section --- templates/tb_base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/tb_base.html b/templates/tb_base.html index 6d888e9..8b3255b 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -156,7 +156,7 @@ function gtag_report_conversion(url) { {% block meta %} {% endblock %} - +{# #} From aec622831dea6c6b875bce796d2d0197c8c8ced1 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Fri, 25 Oct 2024 13:03:17 +0300 Subject: [PATCH 5/7] TRI-275 disable googlesindicator script in head section --- static/js/global_js.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/static/js/global_js.js b/static/js/global_js.js index 9d084c5..a018c96 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -227,11 +227,11 @@ function checkStateCookie () { if (!window.document.cookie.includes("allow_cookie=true")){ document.querySelector(".cookie_block").classList.add("show") } - if (!window.document.cookie.includes("popup_show=false")){ - setTimeout(() => { - document.querySelector('.popup_wrapper').classList.add('show'); - }, 15000); - } + // if (!window.document.cookie.includes("popup_show=false")){ + // setTimeout(() => { + // document.querySelector('.popup_wrapper').classList.add('show'); + // }, 15000); + // } if(!window.document.cookie.includes("first_authorization=true") && window.document.getElementById('authenticated_img')){ document.querySelector(".popup_wrapper").classList.add("show") } From 995733d6e31c2a4ebde2c6364017784593b24c97 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Fri, 25 Oct 2024 13:04:25 +0300 Subject: [PATCH 6/7] TRI-275 disable googlesindicator script in head section --- static/js/global_js.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/static/js/global_js.js b/static/js/global_js.js index a018c96..9d084c5 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -227,11 +227,11 @@ function checkStateCookie () { if (!window.document.cookie.includes("allow_cookie=true")){ document.querySelector(".cookie_block").classList.add("show") } - // if (!window.document.cookie.includes("popup_show=false")){ - // setTimeout(() => { - // document.querySelector('.popup_wrapper').classList.add('show'); - // }, 15000); - // } + if (!window.document.cookie.includes("popup_show=false")){ + setTimeout(() => { + document.querySelector('.popup_wrapper').classList.add('show'); + }, 15000); + } if(!window.document.cookie.includes("first_authorization=true") && window.document.getElementById('authenticated_img')){ document.querySelector(".popup_wrapper").classList.add("show") } From cfe37ec57d536bf7d57a932279187dc311b70f65 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Fri, 1 Nov 2024 14:58:11 +0300 Subject: [PATCH 7/7] 1.3.1 counters in footer TRI-276 --- static/js/range_calendar.js | 4 ++-- templates/blocks/b_footer.html | 39 ++++++++++++++++++++++++++++++++++ templates/tb_base.html | 37 -------------------------------- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/static/js/range_calendar.js b/static/js/range_calendar.js index 4e1612c..e10ce45 100644 --- a/static/js/range_calendar.js +++ b/static/js/range_calendar.js @@ -98,8 +98,8 @@ function init_arrival_DT (date=null,single=true,hour=true){ } - let onl_param = "" - if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){ + let onl_param = ""; + if (window.location.href.includes("/create_route_for_mover") || window.location.href.includes("create_route_for_customer/")){ onl_param = "singleDatePicker" } let place_1 = document.querySelector("#id_arrival_DT") diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 56de7cd..125bc8e 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -101,4 +101,43 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/tb_base.html b/templates/tb_base.html index 8b3255b..b50cbcd 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -20,44 +20,7 @@ {% include "inter/meta_OpenGraph_Schema.html" %} - - - - - - - - - - -