From 4919560500070e995d8de3c02c66ec0f8f6b6b19 Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 2 Jul 2024 19:07:47 +0300 Subject: [PATCH 1/9] 0.0.19 add articles indexing --- robots.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/robots.txt b/robots.txt index 3bdc234..31ce122 100644 --- a/robots.txt +++ b/robots.txt @@ -1,6 +1,5 @@ User-agent: * Allow: / -Disallow: */articles/* Disallow: */admin/* Host: tripwb.com \ No newline at end of file From f34664cbb33b04f62aada5b8a44d2c527e7c766f Mon Sep 17 00:00:00 2001 From: sysadminix Date: Tue, 2 Jul 2024 20:48:03 +0300 Subject: [PATCH 2/9] 0.0.19 add articles indexing --- robots.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/robots.txt b/robots.txt index 31ce122..3bdc234 100644 --- a/robots.txt +++ b/robots.txt @@ -1,5 +1,6 @@ User-agent: * Allow: / +Disallow: */articles/* Disallow: */admin/* Host: tripwb.com \ No newline at end of file From b67b2902790d9591513083bd9cf139882dccb3f5 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 3 Jul 2024 17:18:40 +0300 Subject: [PATCH 3/9] 1.1.26 upd msg counter and styles for news --- static/css/styles.css | 18 ++++++++++++++++++ .../etc_operations_for_chat_socket.js | 5 +++-- static/js/global_js.js | 2 +- static/js/user_profile_2.js | 2 +- templates/blocks/b_header.html | 2 +- .../profile/w_button_for_profile_menu.html | 4 ++-- 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/static/css/styles.css b/static/css/styles.css index a44e2b6..ab68082 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -3304,6 +3304,24 @@ details[open] summary ~ *{ text-decoration: underline; } +.self_news_text>ul>li{ + list-style: disc; + +} +.self_news_text>ul{ + margin-left: 20px; +} +.self_news_text>ol{ + padding-left: 20px; +} +.self_news_text>ol>li{ + margin: 10px 0; +} + +.self_news_text>img{ + margin: 15px 0; +} + .self_news_img{ float: right; width: 40%; diff --git a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js index bdd9fd6..7bf6d39 100644 --- a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js +++ b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js @@ -10,9 +10,10 @@ function update_count_unread_messages (data) { if (!list_unrd_parent[i].classList.contains("showed")){ // list_unrd_parent[i].classList.toggle("showed") - list_unrd[i].innerHTML = data.unread_msgs_count.toString() + // list_unrd[i].innerHTML = data.unread_msgs_count.toString() } else { - list_unrd[i].innerHTML = data.unread_msgs_count.toString() + let current_count = parseInt(list_unrd[i].innerHTML); + list_unrd[i].innerHTML = (current_count + 1).toString(); } } } diff --git a/static/js/global_js.js b/static/js/global_js.js index 511719a..c0f251e 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -41,7 +41,7 @@ window.onload = function (){ // } let chats = document.querySelector(`[data-ajax-url='chats']`) if (chats){ - deleteMarkerMessages() + // deleteMarkerMessages() } } } diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 1d88edd..33199fd 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -93,7 +93,7 @@ function select_tab_profile (el,url,owner_type=null, check_orders_required) { if (window.location.href.includes("profile")){ selectTabProfileIfHisNotSelected(url) } - deleteMarkerMessages(el) + // deleteMarkerMessages(el) checkStatesAfterTransitionToAnotherTabProfile() goToChatIfChat() if (window.location.href.includes("chat") || window.location.href.includes("support")) { diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html index 3db15ac..40effdc 100644 --- a/templates/blocks/b_header.html +++ b/templates/blocks/b_header.html @@ -74,7 +74,7 @@ {{ user.first_name|truncatechars:6}} {{ user.last_name|truncatechars:5 }} -
+
{{ unanswered_msgs_count }}
diff --git a/templates/widgets/profile/w_button_for_profile_menu.html b/templates/widgets/profile/w_button_for_profile_menu.html index 24dbab4..b57e2df 100644 --- a/templates/widgets/profile/w_button_for_profile_menu.html +++ b/templates/widgets/profile/w_button_for_profile_menu.html @@ -24,9 +24,9 @@ {% endif %} {{ title }} {% if sel_page_name == 'chat' %} -
+
- {{ unanswered_msgs_count }} + {{ unanswered_msgs_count }}
{% endif %} From 2695738ae3e77bdadbe5bb54557050c6625572a2 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 3 Jul 2024 17:22:17 +0300 Subject: [PATCH 4/9] 1.1.27 hide .advertisement_block_news --- static/css/styles.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/static/css/styles.css b/static/css/styles.css index ab68082..d3ca96a 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -3317,6 +3317,9 @@ details[open] summary ~ *{ .self_news_text>ol>li{ margin: 10px 0; } +.advertisement_block_news { + display: none; +} .self_news_text>img{ margin: 15px 0; From e2b205240ef1d80e4b0c55c1947c4289714a9699 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 3 Jul 2024 18:24:35 +0300 Subject: [PATCH 5/9] 1.1.28 upd msg counter and news --- static/css/styles.css | 4 ++++ .../etc_operations_for_chat_socket.js | 16 +++++++++------- static/js/user_profile_2.js | 1 + 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/static/css/styles.css b/static/css/styles.css index d3ca96a..e5b7d71 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -3317,6 +3317,10 @@ details[open] summary ~ *{ .self_news_text>ol>li{ margin: 10px 0; } +.self_news_text>ol>li>ul{ + list-style: disc; + margin-left: 20px; +} .advertisement_block_news { display: none; } diff --git a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js index 7bf6d39..aafcfc4 100644 --- a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js +++ b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js @@ -7,14 +7,16 @@ function update_count_unread_messages (data) { let i = 0 for (i;i < list_unrd.length;i++){ - if (!list_unrd_parent[i].classList.contains("showed")){ - // list_unrd_parent[i].classList.toggle("showed") - - // list_unrd[i].innerHTML = data.unread_msgs_count.toString() - } else { let current_count = parseInt(list_unrd[i].innerHTML); - list_unrd[i].innerHTML = (current_count + 1).toString(); - } + + if(data.unread_msgs_count){ + list_unrd[i].innerHTML = (current_count + 1).toString(); + } + + if(current_count === 0){ + list_unrd_parent[i].classList.toggle("showed") + } + } } } diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 33199fd..8b21757 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -579,6 +579,7 @@ function selectedUserMessenger (ticket_id=null,user_id=null,el){ if (loader){ loader.classList.toggle("show") } + update_count_unread_messages() // let left_curtain = document.querySelector('.curtain.left') document.querySelector(".info_profile").innerHTML = data.html; document.querySelector(".enter-message-inp").focus() From 04f7fbdbb2d4e55cf7d65dc37b51aa1a29097eba Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 3 Jul 2024 21:54:40 +0300 Subject: [PATCH 6/9] 1.1.29 upd msg counter --- static/css/styles(boris).css | 13 ++++++++++--- .../widgets/profile/w_button_for_profile_menu.html | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 4355542..ee1ba62 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -708,6 +708,13 @@ display: block; } +.unredmessages_value_text{ + padding-top: 8px; + padding-left: 0; + position:relative; + top: -6px; +} + .cost-messages-in-user-tab-messenger{ width: 15px; @@ -719,8 +726,8 @@ } .cost-messages-in-user-tab-messenger > span{ - padding-top: 1px; - display: block; + padding-top: 7px; + /*display: block;*/ font-size: 10px; } @@ -2791,7 +2798,7 @@ a.open_inf_carrier{ /*}*/ .menu_profile>div>a{ /*font-size: 12px;*/ - line-height: 13px; + /*line-height: 13px;*/ } .menu_profile>div>.logout{ height: 100%; diff --git a/templates/widgets/profile/w_button_for_profile_menu.html b/templates/widgets/profile/w_button_for_profile_menu.html index b57e2df..9a54a65 100644 --- a/templates/widgets/profile/w_button_for_profile_menu.html +++ b/templates/widgets/profile/w_button_for_profile_menu.html @@ -26,7 +26,7 @@ {% if sel_page_name == 'chat' %}
- {{ unanswered_msgs_count }} + {{ unanswered_msgs_count }}
{% endif %} From 8439fc8736bbef935701fa921b30da5a6101fd94 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 4 Jul 2024 09:44:25 +0300 Subject: [PATCH 7/9] 1.1.29 upd tik tok url --- 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 a40ad90..a291686 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -20,7 +20,7 @@ - +
From a8ba3f9a3ae41857152353859f6ec7b619caf07c Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 4 Jul 2024 13:49:42 +0300 Subject: [PATCH 8/9] 1.1.30 upd chats markers --- static/js/user_profile_2.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 8b21757..b340bda 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -560,6 +560,8 @@ function selectedUserMessenger (ticket_id=null,user_id=null,el){ url = 'show_chat_w_user/' } let user_type = getInfoAboutUser() + + update_count_unread_messages() // if (user_type === 'mobile' || user_type === 'laptop') { // open_curtain_w_contacts() // } From c660831146a1bea7d20d62972fe4dd9b3274708a Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 4 Jul 2024 14:42:27 +0300 Subject: [PATCH 9/9] 1.1.31 upd chats markers --- .../etc_operations_for_chat_socket.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js index aafcfc4..c45dd9e 100644 --- a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js +++ b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js @@ -1,13 +1,15 @@ function update_count_unread_messages (data) { let selected_btn = document.querySelector(".selected") + let list_unrd = document.querySelectorAll(".unredmessages_value_text") + let current_count = parseInt(list_unrd[i].innerHTML); if (selected_btn.dataset['ajaxUrl'] !== 'chats'){ - let list_unrd = document.querySelectorAll(".unredmessages_value_text") let list_unrd_parent = document.querySelectorAll(".icon_unread_messages") let i = 0 + for (i;i < list_unrd.length;i++){ - let current_count = parseInt(list_unrd[i].innerHTML); + if(data.unread_msgs_count){ list_unrd[i].innerHTML = (current_count + 1).toString(); @@ -18,7 +20,9 @@ function update_count_unread_messages (data) { } } - } + } else if (current_count === 0){ + list_unrd_parent[i].classList.toggle("showed") + } } function play_required_beep (data,beep) {