From e04ec83877c084d32faaba173c33c6ecc1c41e21 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Sat, 15 Jun 2024 17:35:46 +0300 Subject: [PATCH 01/28] 0.0.17 social network instagram link added --- templates/blocks/b_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index aeff61e..2060991 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -17,7 +17,7 @@
- +
From 52361a6a1618e42c0a09f5881042943cd3736183 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Sat, 15 Jun 2024 17:37:58 +0300 Subject: [PATCH 02/28] 0.0.17 social network instagram link added --- templates/blocks/b_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 2060991..f037f65 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -17,7 +17,7 @@ From d31f019afb2f4d59dca2438d6b225fdc3ba2dcec Mon Sep 17 00:00:00 2001 From: sysadminix Date: Sat, 15 Jun 2024 17:42:55 +0300 Subject: [PATCH 03/28] 0.0.17 social network instagram link added --- templates/blocks/b_footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index f037f65..f4755f9 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -18,8 +18,8 @@
From 11ea66f5768b9552daccaed6450a7bfd2c55162d Mon Sep 17 00:00:00 2001 From: sysadminix Date: Sat, 15 Jun 2024 17:53:45 +0300 Subject: [PATCH 04/28] 0.0.17 social network link added --- templates/blocks/b_footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index f4755f9..4f940f1 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -18,8 +18,8 @@
From d33eff493540b7dc1b63e8dc176ae4078099bc1c Mon Sep 17 00:00:00 2001 From: sysadminix Date: Sat, 15 Jun 2024 17:55:34 +0300 Subject: [PATCH 05/28] 0.0.17 social network link added --- static/img/svg/tiktok.svg | 1 + static/img/svg/vk.svg | 1 + static/vk.svg | 1 + 3 files changed, 3 insertions(+) create mode 100644 static/img/svg/tiktok.svg create mode 100644 static/img/svg/vk.svg create mode 100644 static/vk.svg diff --git a/static/img/svg/tiktok.svg b/static/img/svg/tiktok.svg new file mode 100644 index 0000000..2de188f --- /dev/null +++ b/static/img/svg/tiktok.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/svg/vk.svg b/static/img/svg/vk.svg new file mode 100644 index 0000000..f70f8ee --- /dev/null +++ b/static/img/svg/vk.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/vk.svg b/static/vk.svg new file mode 100644 index 0000000..f70f8ee --- /dev/null +++ b/static/vk.svg @@ -0,0 +1 @@ + \ No newline at end of file From 9c39f9e07c567015567ff0adb9ed6676f68b4131 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Sat, 15 Jun 2024 17:57:04 +0300 Subject: [PATCH 06/28] 0.0.17 social network link added --- templates/blocks/b_footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 4f940f1..086d478 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -18,8 +18,8 @@
From b7a616325159dc05d9bf7e4ef01917b4e1c9684f Mon Sep 17 00:00:00 2001 From: sysadminix Date: Sat, 15 Jun 2024 18:06:15 +0300 Subject: [PATCH 07/28] 0.0.17 social network link added --- templates/blocks/b_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 086d478..5f61310 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -78,7 +78,7 @@
-
Copyright © 2023. {% trans "Все права защищены." %}
+
Copyright © 2023-2024. {% trans "Все права защищены." %}
{% trans "Публичная оферта" %} From df7b3e1a8b0bf07385e6197c2400516d07131309 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Sat, 15 Jun 2024 18:07:41 +0300 Subject: [PATCH 08/28] 0.0.17 social network link added --- templates/blocks/b_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 5f61310..e225eeb 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -78,7 +78,7 @@
-
Copyright © 2023-2024. {% trans "Все права защищены." %}
+
Copyright © 2023-{% now "Y" %}. {% trans "Все права защищены." %}
{% trans "Публичная оферта" %} From b6af2c799777f8a4a28db5d10ad99e802ddc79a1 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 18 Jun 2024 11:37:35 +0300 Subject: [PATCH 09/28] 0.0.18 add social network icons --- static/img/svg/Instagram.svg | 8 ++++---- static/img/svg/Telegram.svg | 8 ++++---- static/img/svg/Youtube.svg | 3 +++ static/img/svg/facebook.svg | 10 +++++----- static/img/svg/tiktok.svg | 4 +++- static/img/svg/vk.svg | 4 +++- 6 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 static/img/svg/Youtube.svg diff --git a/static/img/svg/Instagram.svg b/static/img/svg/Instagram.svg index 625c5c5..673aaf7 100644 --- a/static/img/svg/Instagram.svg +++ b/static/img/svg/Instagram.svg @@ -1,17 +1,17 @@ - + - + - - + + diff --git a/static/img/svg/Telegram.svg b/static/img/svg/Telegram.svg index 13e2e9d..db488df 100644 --- a/static/img/svg/Telegram.svg +++ b/static/img/svg/Telegram.svg @@ -1,17 +1,17 @@ - + - + - - + + diff --git a/static/img/svg/Youtube.svg b/static/img/svg/Youtube.svg new file mode 100644 index 0000000..45fc160 --- /dev/null +++ b/static/img/svg/Youtube.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/img/svg/facebook.svg b/static/img/svg/facebook.svg index ebe59ce..5e57501 100644 --- a/static/img/svg/facebook.svg +++ b/static/img/svg/facebook.svg @@ -1,17 +1,17 @@ - - + + - + - - + + diff --git a/static/img/svg/tiktok.svg b/static/img/svg/tiktok.svg index 2de188f..cbbed6b 100644 --- a/static/img/svg/tiktok.svg +++ b/static/img/svg/tiktok.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/static/img/svg/vk.svg b/static/img/svg/vk.svg index f70f8ee..712c1d5 100644 --- a/static/img/svg/vk.svg +++ b/static/img/svg/vk.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + From 57a1c82db2fa91317698f2aede11fa24be1525d3 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 18 Jun 2024 11:39:40 +0300 Subject: [PATCH 10/28] 0.0.18 add social network icons --- templates/blocks/b_footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index e225eeb..ebda16b 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -18,8 +18,8 @@
From c93a15025be25e000d8bbd568829649722613da6 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 18 Jun 2024 11:43:38 +0300 Subject: [PATCH 11/28] 0.0.18 add footer social networks --- templates/blocks/b_footer.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index ebda16b..f3fe93c 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -18,8 +18,10 @@
From 7a40ca09862dd318335ca6dbcf7abaae3da9ec10 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 18 Jun 2024 11:44:49 +0300 Subject: [PATCH 12/28] 0.0.18 add footer social networks --- templates/blocks/b_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index f3fe93c..b19799e 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -20,7 +20,7 @@ - +
From 4bbb3428c0677e298fdfae52d1b4c95db4fee0b3 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 18 Jun 2024 11:46:31 +0300 Subject: [PATCH 13/28] 0.0.18 add footer social networks --- templates/blocks/b_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index b19799e..f8ece6c 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -20,7 +20,7 @@ - +
From 854faf56f5ecb50302ae2125f164c82b08dd0e10 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 18 Jun 2024 11:52:15 +0300 Subject: [PATCH 14/28] 0.0.18 add footer social networks --- templates/blocks/b_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index f8ece6c..1a5da59 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -18,10 +18,10 @@
From 8267d99b4a355da4e8295136c76614721ae4d877 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 18 Jun 2024 11:56:14 +0300 Subject: [PATCH 15/28] 0.0.18 add footer social networks --- templates/blocks/b_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 1a5da59..ce1424f 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -19,8 +19,8 @@
From 035634df67b6760aabd96f10776c3fa3bd5c121f Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 18 Jun 2024 11:57:13 +0300 Subject: [PATCH 16/28] 0.0.18 add footer social networks --- templates/blocks/b_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index ce1424f..1a5da59 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -19,8 +19,8 @@ From fddda1ef0a748de113d2dcd3916b7017e3aad00b Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 20 Jun 2024 14:28:42 +0300 Subject: [PATCH 17/28] 1.1.11 fix height for cards in search --- static/css/mobile_styles.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index e15039d..8e4ba4c 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -1659,6 +1659,11 @@ } @media (max-width: 800px) { + + +.line_inf_about_moving{ + margin-bottom: 40px; +} .marker_messages_mobile{ position: absolute; top: 0; From 2b94d3f8510ad8a9c6990ea4847669fc62b78732 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 20 Jun 2024 16:00:23 +0300 Subject: [PATCH 18/28] 1.1.12 add YandexMetrika tag for registration page --- templates/blocks/profile/b_new_route.html | 2 +- templates/forms/f_feedback_form.html | 2 +- templates/forms/f_registration.html | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html index e537e68..80f4980 100644 --- a/templates/blocks/profile/b_new_route.html +++ b/templates/blocks/profile/b_new_route.html @@ -463,7 +463,7 @@ {% endif %}
- +
diff --git a/templates/forms/f_feedback_form.html b/templates/forms/f_feedback_form.html index 02d8103..c4ff275 100644 --- a/templates/forms/f_feedback_form.html +++ b/templates/forms/f_feedback_form.html @@ -71,7 +71,7 @@ {{ form.errors.text_msg }} {% endif %}
- +
diff --git a/templates/forms/f_registration.html b/templates/forms/f_registration.html index b1ee7d1..6ac9f4b 100644 --- a/templates/forms/f_registration.html +++ b/templates/forms/f_registration.html @@ -9,7 +9,10 @@

{% translate "Регистрация" %}

-
+ {% csrf_token %} From f8aa0162a5d90bbab2734bd010f0858cda29e536 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 20 Jun 2024 16:56:21 +0300 Subject: [PATCH 19/28] 1.1.12 add YandexMetrika tag for feedback form --- templates/forms/f_feedback_form.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/forms/f_feedback_form.html b/templates/forms/f_feedback_form.html index c4ff275..eb1656c 100644 --- a/templates/forms/f_feedback_form.html +++ b/templates/forms/f_feedback_form.html @@ -5,6 +5,7 @@ Date: Thu, 20 Jun 2024 17:10:20 +0300 Subject: [PATCH 20/28] 1.1.13 add YandexMetrika tag for feedback form v2 --- static/js/user_profile.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/static/js/user_profile.js b/static/js/user_profile.js index c7b6747..e894a8f 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -1067,6 +1067,8 @@ function RequestCommercialOffer (el){ data: formData, success: function(data){ + ym(97070898,'reachGoal','Message'); + // el.style.background = '#FF613A'; el.removeAttribute('style') From 96c0111428fdfd0e45b9dca27a680c1c98f7da92 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Fri, 21 Jun 2024 13:17:35 +0300 Subject: [PATCH 21/28] 1.1.14 add YandexMetrika tag for feedback form v3 --- static/js/registration.js | 2 ++ static/js/user_profile.js | 10 +++++++++- templates/forms/f_feedback_form.html | 11 ++++------- templates/forms/f_registration.html | 4 +++- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/static/js/registration.js b/static/js/registration.js index 422e3a8..945c494 100644 --- a/static/js/registration.js +++ b/static/js/registration.js @@ -20,6 +20,8 @@ function SendRegistrationForm(el){ // location.href = `/profile/page/dashboard/` window.sessionStorage.removeItem('mailingSubscribeRequired') window.sessionStorage.removeItem('email') + + ym(97070898,'reachGoal','Registration') }, error: function (data, exception){ document.querySelector(".register").innerHTML = data.responseJSON.html diff --git a/static/js/user_profile.js b/static/js/user_profile.js index e894a8f..b9e57e7 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -1067,7 +1067,7 @@ function RequestCommercialOffer (el){ data: formData, success: function(data){ - ym(97070898,'reachGoal','Message'); + // el.style.background = '#FF613A'; el.removeAttribute('style') @@ -1095,6 +1095,14 @@ function RequestCommercialOffer (el){ let hide_error_msg = document.getElementById('error_footer').classList.add('hide') } + if(typeof ym === 'function'){ + ym(97070898,'reachGoal','Message'); + return true; + }else { + console.log('Скрипт Яндекс.Метрики не найден. Статистика не будет отправлена.'); + } + + }, error: function (data, exception){ // document.querySelector(".login").innerHTML = data.responseJSON.html diff --git a/templates/forms/f_feedback_form.html b/templates/forms/f_feedback_form.html index eb1656c..3348bf4 100644 --- a/templates/forms/f_feedback_form.html +++ b/templates/forms/f_feedback_form.html @@ -5,14 +5,15 @@ + {% if form.form_name %}data-name="{{ form.form_name}}"{% endif %}> +
-
- - - - +
\ No newline at end of file diff --git a/templates/forms/f_registration.html b/templates/forms/f_registration.html index 6ac9f4b..0fe01bf 100644 --- a/templates/forms/f_registration.html +++ b/templates/forms/f_registration.html @@ -11,8 +11,10 @@ + > {% csrf_token %} From 729f03ca47b719915c161ef4955d352b2c028aa3 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Fri, 21 Jun 2024 13:48:37 +0300 Subject: [PATCH 22/28] 1.1.15 add YandexMetrika tag for feedback form v4 --- static/js/registration.js | 10 +++++++++- templates/forms/f_registration.html | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/static/js/registration.js b/static/js/registration.js index 945c494..a747787 100644 --- a/static/js/registration.js +++ b/static/js/registration.js @@ -21,7 +21,15 @@ function SendRegistrationForm(el){ window.sessionStorage.removeItem('mailingSubscribeRequired') window.sessionStorage.removeItem('email') - ym(97070898,'reachGoal','Registration') + + if(typeof ym === 'function'){ + ym(97070898,'reachGoal','Registration') + return true; + }else { + console.log('Скрипт Яндекс.Метрики не найден. Статистика не будет отправлена.'); + } + + }, error: function (data, exception){ document.querySelector(".register").innerHTML = data.responseJSON.html diff --git a/templates/forms/f_registration.html b/templates/forms/f_registration.html index 0fe01bf..7d2f4f6 100644 --- a/templates/forms/f_registration.html +++ b/templates/forms/f_registration.html @@ -113,7 +113,7 @@ {% endif %}
- +
{% trans 'На Вашу почту отправлено письмо для подтверждения регистрации.' %}
From 2fc153843ffe7980fbc91fcecd0c839894e49047 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Fri, 21 Jun 2024 14:54:30 +0300 Subject: [PATCH 23/28] 1.1.16 add YandexMetrika tag for create_routes, registration button in header/footer --- static/js/user_profile.js | 14 +++++++++++++- templates/blocks/b_footer.html | 5 ++++- templates/blocks/b_header.html | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/static/js/user_profile.js b/static/js/user_profile.js index b9e57e7..291abaf 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -541,7 +541,7 @@ function sendRoute(el, routeID = null){ // if (selected_owner_type[0].classList.contains('selected')){ // // }else{} - let owner_type_value = document.getElementById('hide_owner_type').value + let owner_type_value = document.getElementById('hide_owner_type').value let form = el.form let formData = new FormData(form); @@ -596,6 +596,18 @@ function sendRoute(el, routeID = null){ my_routes.classList.add('selected') middleWareJS() + if(data.owner_type === 'customer' && typeof ym === 'function' ){ + ym(97070898,'reachGoal','customer') + return true + } else if(data.owner_type === 'mover' && typeof ym === 'function'){ + ym(97070898,'reachGoal','mover') + return true + } + + + // + + }, error: function (data, exception){ document.querySelector(".info_profile").innerHTML = data.responseJSON.html; diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 1a5da59..66f5dcb 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -64,7 +64,10 @@ {% if not user.is_authenticated %}
- {% trans "Регистрация" %} + {% trans "Регистрация" %} {% trans "Войти" %}
{% endif %} diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html index d7c6527..df67331 100644 --- a/templates/blocks/b_header.html +++ b/templates/blocks/b_header.html @@ -106,6 +106,7 @@
{% trans "Регистрация" %} From b6a0fcdf07c03912219867d59579ca365514daf0 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Fri, 21 Jun 2024 15:41:19 +0300 Subject: [PATCH 24/28] 1.1.17 add YandexMetrika tag for create_routes, registration button in header/footer v2 --- static/js/user_profile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 291abaf..f0101cd 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -596,10 +596,10 @@ function sendRoute(el, routeID = null){ my_routes.classList.add('selected') middleWareJS() - if(data.owner_type === 'customer' && typeof ym === 'function' ){ + if(owner_type_value === 'customer' && typeof ym === 'function' ){ ym(97070898,'reachGoal','customer') return true - } else if(data.owner_type === 'mover' && typeof ym === 'function'){ + } else if(owner_type_value === 'mover' && typeof ym === 'function'){ ym(97070898,'reachGoal','mover') return true } From 4afe61546ad7da8e5913c4097d00e0eef8590f2e Mon Sep 17 00:00:00 2001 From: ArtemB Date: Tue, 25 Jun 2024 13:10:32 +0300 Subject: [PATCH 25/28] 1.1.17 add YandexMetrika tag for create_routes, registration button in header/footer v2 --- ArticlesApp/views.py | 4 ++-- locale/en/LC_MESSAGES/django.po | 8 ++++---- templates/blocks/b_footer.html | 2 +- templates/pages/profile/p_user_profile.html | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ArticlesApp/views.py b/ArticlesApp/views.py index d9851f3..a9b1396 100644 --- a/ArticlesApp/views.py +++ b/ArticlesApp/views.py @@ -85,8 +85,8 @@ def ArticlesPageView(request, year=None): Dict = get_articles(art_kwargs=kwargs) Dict.update({ 'page': { - 'title': _('Новости сервиса доставки посылок | TWB'), - 'description': _('Обновления, полезные статьи и свежие новости от TWB ✓ Актуальные новости в мире доставок по всему СНГ ➡️ Следите за нашими новостями'), + 'title': _('Новости сервиса доставки посылок | TripWB'), + 'description': _('Обновления, полезные статьи и свежие новости от TripWB ✓ Актуальные новости в мире доставок по всему СНГ ➡️ Следите за нашими новостями'), 'keywords': _('Все новости сайта tripwb.com'), } }) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 0a0bd9f..46da955 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -39,12 +39,12 @@ msgid "Статьи" msgstr "Articles" #: ArticlesApp/views.py:88 -msgid "Новости сервиса доставки посылок | TWB" -msgstr "Parcel Delivery Service News | TWB" +msgid "Новости сервиса доставки посылок | TripWB" +msgstr "Parcel Delivery Service News | TripWB" #: ArticlesApp/views.py:89 ArticlesApp/views.py:90 -msgid "Обновления, полезные статьи и свежие новости от TWB ✓ Актуальные новости в мире доставок по всему СНГ ➡️ Следите за нашими новостями" -msgstr "Updates, useful articles, and fresh news from TWB ✓ Current news in the world of deliveries throughout the CIS ➡️ Stay tuned for our updates" +msgid "Обновления, полезные статьи и свежие новости от TripWB ✓ Актуальные новости в мире доставок по всему СНГ ➡️ Следите за нашими новостями" +msgstr "Updates, useful articles, and fresh news from TripWB ✓ Current news in the world of deliveries throughout the CIS ➡️ Stay tuned for our updates" #: AuthApp/admin.py:52 diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 66f5dcb..a40ad90 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -66,7 +66,7 @@
{% trans "Регистрация" %} {% trans "Войти" %}
diff --git a/templates/pages/profile/p_user_profile.html b/templates/pages/profile/p_user_profile.html index f386b75..12914ad 100644 --- a/templates/pages/profile/p_user_profile.html +++ b/templates/pages/profile/p_user_profile.html @@ -4,9 +4,9 @@ {% block title %} {% if page_name == 'create_route_for_customer' %} - {% trans 'Отправить посылку в другие города| TWB' %} + {% trans 'Отправить посылку в другие города| TripWB' %} {% elif page_name == 'create_route_for_mover' %} - {% trans 'Перевезти посылку в другие города | TWB' %} + {% trans 'Перевезти посылку в другие города | TripWB' %} {% endif %} {% endblock %} From 18aae945aeed7ab140c0e15ae54c96dfc0db0353 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Tue, 25 Jun 2024 18:33:54 +0300 Subject: [PATCH 26/28] 1.1.18 fix height for container_inf_about_moving --- static/css/mobile_styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 8e4ba4c..f88e4b8 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -116,6 +116,10 @@ } @media (max-width: 1180px){ + .container_inf_about_moving{ + padding: 15px; + } + .input_list.find_route{ left: unset; width: 70%; From 62325eb9fa183814ffb38fad1b4aeff636544ca3 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 26 Jun 2024 12:32:53 +0300 Subject: [PATCH 27/28] 1.1.19 upd css for block-chat --- static/css/styles(boris).css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 9f6bdb8..da553ae 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -443,7 +443,7 @@ .block-chat{ width: 63%; - height: calc(100vh - 120px); + height: calc(100vh - 150px); border-radius: 10px; border: 1px solid #E6E6E6; background: #ffffff; @@ -2523,7 +2523,7 @@ a.open_inf_carrier{ background: #FFFFFF; border-radius: 10px; max-height: calc(100vh - 125px); - overflow: unset; + /*overflow: unset;*/ left: -19px; top: 0; } From eb60bcec56691763f79eb09b2f822cc7c0699226 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 26 Jun 2024 13:02:52 +0300 Subject: [PATCH 28/28] 1.1.20 upd css for .menu_profile right --- static/css/styles(boris).css | 3 +++ templates/tb_base.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index da553ae..4355542 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2596,6 +2596,9 @@ a.open_inf_carrier{ .menu_buttons.right.open .menu_profile{ padding-top: 45px; } +.menu_buttons.right.padding_remove.open .menu_profile{ + padding-top: unset; +} diff --git a/templates/tb_base.html b/templates/tb_base.html index 08bae45..92a56bd 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -143,7 +143,7 @@ {% include 'blocks/b_header.html' %}
-
"> +
"> {% include "blocks/profile/b_buttons_menu_profile.html" %}