sysadminix/account_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SDE
2024-07-09 13:40:42 +03:00
parent f9906ea8fc c660831146
commit d64d858f15
8 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
static/css/styles(boris).css
View File

@@ -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%;

25
static/css/styles.css
View File

@@ -3304,6 +3304,31 @@ 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>ol>li>ul{
list-style: disc;
margin-left: 20px;
}
.advertisement_block_news {
display: none;
}
.self_news_text>img{
margin: 15px 0;
}
.self_news_img{
float: right;
width: 40%;

19
static/js/chat_socket_functions/etc_operations_for_chat_socket.js
View File

@@ -1,20 +1,27 @@
function update_count_unread_messages (data) {
let selected_btn = document.querySelector(".selected")
if (selected_btn.dataset['ajaxUrl'] !== 'chats'){
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_parent = document.querySelectorAll(".icon_unread_messages")
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 {
list_unrd[i].innerHTML = data.unread_msgs_count.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")
}
}
} else if (current_count === 0){
list_unrd_parent[i].classList.toggle("showed")
}
}

2
static/js/global_js.js
View File

@@ -41,7 +41,7 @@ window.onload = function (){
// }
let chats = document.querySelector(`[data-ajax-url='chats']`)
if (chats){
deleteMarkerMessages()
// deleteMarkerMessages()
}
}
}

5
static/js/user_profile_2.js
View File

@@ -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")) {
@@ -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()
// }
@@ -579,6 +581,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()

2
templates/blocks/b_footer.html
View File

@@ -20,7 +20,7 @@
<a href="https://instagram.com/trip_with_bonus" target="_blank"><img class="svg" src="/static/img/svg/Instagram.svg"></a>
<a href="https://www.facebook.com/share/p/tckdLFiyXm9r2925/?mibextid=WC7FNe" target="_blank"><img class="svg" src="/static/img/svg/facebook.svg"></a>
<a href="https://vk.com/club226251027" target="_blank"><img class="svg" src="/static/img/svg/vk.svg"></a>
<a href="https://www.tiktok.com/@.twb23?_t=8kfJPQC4LdV" target="_blank"><img class="svg" src="/static/img/svg/tiktok.svg"></a>
<a href="https://www.tiktok.com/@.tripwithbonus?_t=8njaU5JVCBK&_r=1" target="_blank"><img class="svg" src="/static/img/svg/tiktok.svg"></a>
<a href="https://youtube.com/@twb-bonus?si=k_YFiY86vBdvvHFN" target="_blank"><img class="svg" src="/static/img/svg/Youtube.svg"></a>
</div>
</div>

2
templates/blocks/b_header.html
View File

@@ -74,7 +74,7 @@
{{ user.first_name|truncatechars:6}} {{ user.last_name|truncatechars:5 }}
</span>
<span id="placeholder1"></span>
<div class="icon_unread_messages{% if unanswered_msgs_count %} showed{% endif %}" style="position:relative;top: 4px;padding-right: 13px;">
<div class="icon_unread_messages{% if unanswered_msgs_count > 0 %} showed{% endif %}" style="position:relative;top: 4px;padding-right: 13px;">
<div class="cost-messages-in-user-tab-messenger" style="background: #FFFFFF;">
<span class="unredmessages_value_text " style="padding-top: 2px;padding-left: 0;position: relative;top: -8px;color: #FF613A;">{{ unanswered_msgs_count }}</span>
</div>

4
templates/widgets/profile/w_button_for_profile_menu.html
View File

@@ -24,9 +24,9 @@
{% endif %}
{{ title }}
{% if sel_page_name == 'chat' %}
<div class="icon_unread_messages {% if unanswered_msgs_count %}showed{% endif %}" style="padding-top: 0;position:relative;top: 4px;">
<div class="icon_unread_messages {% if unanswered_msgs_count > 0 %}showed{% endif %}" style="padding-top: 0;position:relative;top: 4px;">
<div class="cost-messages-in-user-tab-messenger">
<span class="unredmessages_value_text" style="padding-top: 2px;padding-left: 0;position:relative;top: -6px">{{ unanswered_msgs_count }}</span>
<span class="unredmessages_value_text">{{ unanswered_msgs_count }}</span>
</div>
</div>
{% endif %}