From e1694cdc9cb0f7053032c4d77ffb8d85b721ed01 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 5 Jun 2024 14:22:19 +0300 Subject: [PATCH 1/9] 1.1.3 update dropdown-content lang --- 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 b7eeccb..bd8e8f0 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -1762,6 +1762,10 @@ background: #ffffff; } + .dropdown-content-lang{ + z-index: 1; + } + .menu_buttons.right.open .handler_menu{ background: #FFFFFF; color: #000000; From c9aea0b778613c34062129a396df614623570b6b Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 5 Jun 2024 14:26:36 +0300 Subject: [PATCH 2/9] 1.1.3 rising and highlight my_route --- static/css/mobile_styles.css | 2 +- static/css/styles.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index bd8e8f0..e83a8a9 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -1763,7 +1763,7 @@ } .dropdown-content-lang{ - z-index: 1; + z-index: 1 ; } .menu_buttons.right.open .handler_menu{ diff --git a/static/css/styles.css b/static/css/styles.css index e27b9ea..6909306 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -780,6 +780,7 @@ span.btn_profile_name { display: none; position: absolute; background-color: #f9f9f9; + z-index: 1; } From 28b505310dd8eab6508ea008b129c6ed8990c783 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Wed, 5 Jun 2024 15:00:58 +0300 Subject: [PATCH 3/9] 0.0.14 add yandex and google verification meta --- templates/blocks/b_header.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html index 2b62bb6..d7c6527 100644 --- a/templates/blocks/b_header.html +++ b/templates/blocks/b_header.html @@ -135,4 +135,7 @@
- \ No newline at end of file + + + +
\ No newline at end of file From a9ed3e0befed36e573ad3f38f5c8051114c0ce59 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Wed, 5 Jun 2024 15:06:46 +0300 Subject: [PATCH 4/9] 0.0.14 add yandex and google verification meta --- templates/tb_base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tb_base.html b/templates/tb_base.html index 67569f2..08bae45 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -48,8 +48,8 @@ gtag('config', 'G-2WW2PTG5BM'); - -
+{# #} +{#
#} From 632cf0b9b4d381166a95eb628ca930a27c367ee9 Mon Sep 17 00:00:00 2001 From: ArtemB <mil.basalyga@gmail.com> Date: Wed, 5 Jun 2024 16:47:10 +0300 Subject: [PATCH 5/9] 1.1.3 change meta_names.html --- templates/inter/meta_names.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/inter/meta_names.html b/templates/inter/meta_names.html index ac791d9..2bc1623 100644 --- a/templates/inter/meta_names.html +++ b/templates/inter/meta_names.html @@ -1,11 +1,11 @@ -<title>{{ page.get_title }} +{#{{ page.get_title }}#} {% if page.get_description %} {% endif %} -{% if page.seo_keywords %} - -{% elif page.get_description %} - -{% endif %} \ No newline at end of file +{#{% if page.seo_keywords %}#} +{# #} +{#{% elif page.get_description %}#} +{# #} +{#{% endif %}#} \ No newline at end of file From 22e40409d751541307d35cdfad5c7fb633d22fd4 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 5 Jun 2024 16:48:12 +0300 Subject: [PATCH 6/9] 1.1.3 rising and highlight my_route counter --- static/css/styles.css | 2 +- static/js/user_profile.js | 38 ++++++++++++++++-------- templates/widgets/routes/w_my_route.html | 4 +-- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/static/css/styles.css b/static/css/styles.css index 6909306..3931745 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -693,7 +693,7 @@ header .header-second { position: absolute; background-color: white; border-radius: 10px; - width: 282px; + width: 272px; height: 175px; 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; diff --git a/static/js/user_profile.js b/static/js/user_profile.js index e8ca00b..4e6ce35 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -616,18 +616,19 @@ function confirmUpgrade(el, routeID){ event.preventDefault() el.disabled = true - let remainsRisingCount = parseInt(document.getElementById('remains_route_rising_count').innerText); - let remainsHighlightCount = parseInt(document.getElementById('remains_route_highlight_count').innerText); + // let remainsRisingCount = parseInt(document.getElementById('remains_route_rising_count').innerText); + // let remainsHighlightCount = parseInt(document.getElementById('remains_route_highlight_count').innerText); let form = el.form let formData = new FormData(form); formData.set('route_id', routeID) - formData.set('remainsRisingCount', remainsRisingCount) - formData.set('remainsHighlightCount', remainsHighlightCount) + // formData.set('remainsRisingCount', remainsRisingCount) + // formData.set('remainsHighlightCount', remainsHighlightCount) let url = '/routes/' // let checkboxes = document.querySelectorAll('input[name="route_option"]'); let checkboxes = document.querySelectorAll('input[name="route_option"][data-routeid="' + routeID + '"]'); - + let remainsRisingCount = document.querySelectorAll('#remains_route_rising_count') + let remainsHighlightCount = document.querySelectorAll('#remains_route_highlight_count') for (let i = 0; i < checkboxes.length; i++) { @@ -651,11 +652,14 @@ function confirmUpgrade(el, routeID){ data: formData, success: function(data){ - if(url === '/routes/raise_route/' && remainsRisingCount > 0 ){ - remainsRisingCount -= 1; - } else if(url === '/routes/highlight_route/' && remainsHighlightCount > 0){ - remainsHighlightCount -= 1; - } + // $('#remains_route_rising_count').append(data.remains_route_rising_count) + // $('#remains_route_highlight_count').append(data.remains_route_highlight_count) + + // if(url === '/routes/raise_route/' && remainsRisingCount > 0 ){ + // remainsRisingCount -= 1; + // } else if(url === '/routes/highlight_route/' && remainsHighlightCount > 0){ + // remainsHighlightCount -= 1; + // } // for (let i = 0; i < checkboxes.length; i++) { @@ -667,8 +671,18 @@ function confirmUpgrade(el, routeID){ // } // } - document.getElementById('remains_route_rising_count').innerText = remainsRisingCount.toString(); - document.getElementById('remains_route_highlight_count').innerText = remainsHighlightCount; + for (let i = 0; i < remainsRisingCount.length; i++){ + remainsRisingCount[i].outerHTML = data.remains_route_rising_count.toString(); + } + + for (let i = 0; i < remainsHighlightCount.length; i++){ + remainsHighlightCount[i].outerHTML = data.remains_route_highlight_count.toString(); + } + + + + // document.getElementById('remains_route_rising_count').outerHTML = data.remains_route_rising_count.toString(); + // document.getElementById('remains_route_highlight_count').outerHTML = data.remains_route_highlight_count.toString(); let data_route_id = data.route_id // location.href = '/profile' diff --git a/templates/widgets/routes/w_my_route.html b/templates/widgets/routes/w_my_route.html index b0d3dce..1c9daf1 100644 --- a/templates/widgets/routes/w_my_route.html +++ b/templates/widgets/routes/w_my_route.html @@ -67,9 +67,7 @@
{% trans "Поднять объявление" %}
-
{% trans "Осталось поднятий " %} {% if form.data.remainsRisingCount %}{{ form.data.remainsRisingCount }}{% else %}{{ remains_route_rising_count }}{% endif %}
+
{% trans "Осталось поднятий " %} {% if form.data.remains_route_rising_count %}{{ form.data.remains_route_rising_count }}{% else %}{{ remains_route_rising_count }}{% endif %}
Date: Wed, 5 Jun 2024 16:55:09 +0300 Subject: [PATCH 7/9] 1.1.3 update meta_names.html --- templates/inter/meta_names.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/inter/meta_names.html b/templates/inter/meta_names.html index 2bc1623..5a899ac 100644 --- a/templates/inter/meta_names.html +++ b/templates/inter/meta_names.html @@ -1,8 +1,8 @@ {#{{ page.get_title }}#} -{% if page.get_description %} - -{% endif %} +{#{% if page.get_description %}#} +{# #} +{#{% endif %}#} {#{% if page.seo_keywords %}#} {# #} From f8d1de5d3092b7679810a76a72f719eea2cea0f5 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 5 Jun 2024 17:47:01 +0300 Subject: [PATCH 8/9] 1.1.4 update rising and highlight my_routes --- static/css/styles(boris).css | 4 +++ static/css/styles.css | 8 ++++++ static/js/user_profile.js | 34 +++++++++++++++++------- templates/widgets/routes/w_my_route.html | 5 ++-- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index c747b96..d13c39c 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1322,6 +1322,7 @@ padding-left: 35px; padding-right: 35px; margin-bottom: 20px; + border-radius: 10px; } @@ -1384,6 +1385,9 @@ .container_inf_about_moving{ display: block; width: 100%; + background: #F8F8F8; + padding: 5px; + border-radius: 10px; } diff --git a/static/css/styles.css b/static/css/styles.css index 3931745..b0d4d2d 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -688,6 +688,10 @@ header .header-second { display: inline-block; } +.carrier-card.highlight-color{ + background: linear-gradient(90deg, #FBED96 0%, #ABECD6 100%); +} + .control_frame{ display: none; position: absolute; @@ -2065,6 +2069,10 @@ button#raise_route { background: #E6E6E6; } + +.edit_route.highlight-color{ + background: #F8F8F8; +} .edit_route.hide{ display: none; } diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 4e6ce35..a963106 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -671,27 +671,22 @@ function confirmUpgrade(el, routeID){ // } // } - for (let i = 0; i < remainsRisingCount.length; i++){ - remainsRisingCount[i].outerHTML = data.remains_route_rising_count.toString(); - } - for (let i = 0; i < remainsHighlightCount.length; i++){ - remainsHighlightCount[i].outerHTML = data.remains_route_highlight_count.toString(); - } // document.getElementById('remains_route_rising_count').outerHTML = data.remains_route_rising_count.toString(); // document.getElementById('remains_route_highlight_count').outerHTML = data.remains_route_highlight_count.toString(); - let data_route_id = data.route_id + // location.href = '/profile' - if(!data.status){ - document.querySelector('[data-number-of-route="' + routeID + '"]').innerHTML = data.html - } + // if(!data.status){ + // document.querySelector('[data-number-of-route="' + routeID + '"]').innerHTML = data.html + // } + let data_route_id = data.route_id let el_route = document.querySelector(`[data-number-of-route="${data_route_id}"]`); if (routeID){ el_route = document.querySelector(`[data-number-of-route="${routeID}"]`); @@ -702,6 +697,25 @@ function confirmUpgrade(el, routeID){ inline:'start' }); + let editButton = document.getElementById('edit_route_' + routeID) + + if(url === '/routes/highlight_route/'){ + el_route.classList.add('highlight-color'); + editButton.classList.add('highlight-color') + } + + + for (let i = 0; i < remainsRisingCount.length; i++){ + remainsRisingCount[i].outerHTML = data.remains_route_rising_count.toString(); + } + + for (let i = 0; i < remainsHighlightCount.length; i++){ + remainsHighlightCount[i].outerHTML = data.remains_route_highlight_count.toString(); + } + + + + diff --git a/templates/widgets/routes/w_my_route.html b/templates/widgets/routes/w_my_route.html index 1c9daf1..5d2a852 100644 --- a/templates/widgets/routes/w_my_route.html +++ b/templates/widgets/routes/w_my_route.html @@ -2,7 +2,8 @@ {% load i18n %} -
+
+{#
#}
{#
#} {#
#} @@ -146,7 +147,7 @@
From 2996e844331237b0c66a862274e62d1f77cd74d9 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 6 Jun 2024 14:25:25 +0300 Subject: [PATCH 9/9] 1.1.5 fix show_contact if user is not authenticated --- templates/widgets/w_carrier_card.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/widgets/w_carrier_card.html b/templates/widgets/w_carrier_card.html index 1548fee..b88be4e 100644 --- a/templates/widgets/w_carrier_card.html +++ b/templates/widgets/w_carrier_card.html @@ -176,7 +176,8 @@ {% endif %} - {% if not user.is_authenticated and show_contacts_allow %} + {% if not user.is_authenticated %} +{# {% if not user.is_authenticated and show_contacts_allow %}#}
{% translate "Открыть контакт"%}