From 069f2094f050a5391659b2bd38f50aa450b81233 Mon Sep 17 00:00:00 2001 From: SBD Date: Wed, 29 Nov 2023 20:34:01 +0300 Subject: [PATCH] 0.8.434 --- static/css/styles(boris).css | 19 +++++++++++++++++-- static/js/user_profile_2.js | 4 +++- templates/blocks/profile/b_chats.html | 7 ++++++- templates/blocks/profile/b_support_chat.html | 6 +++++- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 19ed2aa..442ac67 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -412,8 +412,8 @@ height: 100px; width: 100px; position: absolute; - top: 35%; - left: 47%; + top: 40%; + left: 45%; } .loader_chat_f_sw_chats.support.show{ @@ -446,13 +446,28 @@ background: #ffffff; box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20); float: right; + position: relative; +} +.block_loader_chat{ + width: 63%; + height: calc(100vh - 120px); + border-radius: 10px; + border: none; + background: none; + box-shadow: none; + float: right; + position: relative; } .block-chat.support{ height: calc(100vh - 154px); } +.block_loader_chat.support{ + height: calc(100vh - 154px); +} + .block-list-of-users{ width: 30%; margin-left: 20px; diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 29e457a..ddcb458 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -457,8 +457,10 @@ function selectedUserMessenger (ticket_id=null,user_id=null,el){ if (loader){ loader.classList.toggle("show") if (block_chat) { - block_chat.innerHTML = null + block_chat.innerHTML = '' } + } else if (block_chat){ + block_chat.innerHTML = `loader` } let data = null let url = null diff --git a/templates/blocks/profile/b_chats.html b/templates/blocks/profile/b_chats.html index 8b778b5..a1d14fe 100644 --- a/templates/blocks/profile/b_chats.html +++ b/templates/blocks/profile/b_chats.html @@ -50,9 +50,14 @@ {# #} {# #} {##} -loader +{% if not cur_receiver %} +
+ loader +
+{% endif %} {% if cur_receiver %}
+
diff --git a/templates/blocks/profile/b_support_chat.html b/templates/blocks/profile/b_support_chat.html index 793d149..525e7e8 100644 --- a/templates/blocks/profile/b_support_chat.html +++ b/templates/blocks/profile/b_support_chat.html @@ -12,7 +12,6 @@ {#
#} {#

Техническая поддержка

#} {#
#} - loader {% if user.is_staff or staff %} {% endif %} + {% if not ticket %} +
+ loader +
+ {% endif %} {% if ticket %}
{{ ticket.name }}