From a19017351bce5343713d8025f54fe3eadf793d21 Mon Sep 17 00:00:00 2001 From: borissedw Date: Tue, 7 Nov 2023 14:18:25 +0300 Subject: [PATCH] 0.0.337 --- static/css/mobile_styles.css | 21 ++++++---- static/css/styles(boris).css | 4 +- static/css/styles.css | 2 +- static/js/user_profile_2.js | 78 +++++++++++++++++++++++++++--------- templates/tb_base.html | 3 +- 5 files changed, 78 insertions(+), 30 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 03262ff..0bdfd25 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -441,7 +441,7 @@ } .menu_buttons.left.close{ - left: -320px; + left: -338px; transition: 200ms; position: absolute; width: 320px; @@ -459,8 +459,9 @@ left: 0; transition: 200ms; position: fixed; - + float: unset; padding-top: 10px; + width: 320px; } .handler_menu.left.close{ background: #FF613A; @@ -500,8 +501,8 @@ padding: 7px 18px 7px 18px; } .menu_buttons.left .handler_menu{ - transform: rotate(270deg); - left: 312px; + transform: rotate(90deg); + left: -48px; width: 91px; height: 18px; display: block; @@ -540,6 +541,10 @@ display: block; } + .block_overlay.show{ + display: block; + } + .text_f_curtain{ display: inline-block; } @@ -561,11 +566,11 @@ height: 100vh; width: 100vw; /*background: rgba(39, 53, 62, 0.7);*/ - backdrop-filter: blur(15px); + backdrop-filter: blur(6px); z-index: 100; - position: fixed; - top: 86px; - left: -19px; + position: absolute; + top: -55px; + right: 0; } #customer>a, #mover>a{ left: 5%; diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index ffb3bc1..0a4b0fa 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2260,8 +2260,10 @@ .menu_buttons.left.open{ left: 0; transition: 200ms; - position: fixed; + /* position: fixed; */ padding-top: 10px; + float: left; + width: 33%; } .handler_menu.left.close{ background: #FF613A; diff --git a/static/css/styles.css b/static/css/styles.css index a826b8b..4c0a9b5 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1101,7 +1101,7 @@ section.login>form>div>div:nth-child(5)>a { section.profile { padding: 60px 40px 0; margin-bottom: 120px; - width: 60%; + width: 70%; float: left; } diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index b161f33..836355c 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -478,7 +478,14 @@ function selectedUserMessenger (ticket_id=null,user_id=null){ document.querySelector(".info_profile").innerHTML = data.html; document.querySelector(".enter-message-inp").focus() document.querySelector(".tab_user_messanger.select").scrollIntoView({behavior: "smooth"}); - + let user_type = getInfoAboutUser() + if (user_type === 'mobile') { + closeCurtain() + } else { + if (!window.location.href.includes('profile')){ + closeCurtain() + } + } }, error: function (data){ @@ -672,7 +679,7 @@ function open_curtain (left=null,right=null,overlay=null,close=null){ if (left){ if (left_curtain){ curtain = left_curtain - curtain.style.zIndex = '101' + newCurtainZIndex(curtain) if (right_curtain) { right_curtain.style.zIndex = '99' curtain_name = curtain.dataset['name'] @@ -682,7 +689,7 @@ function open_curtain (left=null,right=null,overlay=null,close=null){ } else if (right) { if (right_curtain){ curtain = right_curtain - curtain.style.zIndex = '101' + newCurtainZIndex(curtain) if (left_curtain) { left_curtain.style.zIndex = '99' curtain_name = curtain.dataset['name'] @@ -696,27 +703,23 @@ function open_curtain (left=null,right=null,overlay=null,close=null){ let body = document.querySelector('body') if (close){ // curtain = getOpenCurtain() - let handler_text = curtain.querySelector('.text_f_curtain') + let type_curt = getTypeOfData(curtain) + let handler_text = '' + if (type_curt === 'object'){ + curtain = curtain[0] + } + handler_text = curtain.querySelector('.text_f_curtain') + handler_text.innerHTML = curtain_name curtain.classList.remove("open") curtain.classList.add("close") - let overlay = document.querySelector(".block_overlay") - overlay.classList.add('hidden') - overlay.classList.remove('show') + closeOverlay() } else { - if (overlay){ - overlay.classList.toggle("hidden") - overlay.classList.toggle("show") - } else { - let overlay = document.querySelector(".block_overlay") - if (overlay){ - overlay.classList.toggle("hidden") - overlay.classList.toggle("show") - } - } + closeOverlay() curtain.classList.toggle("close") curtain.classList.toggle("open") + newCurtainZIndex() let handler_text = curtain.querySelector('.text_f_curtain') if (curtain.classList.contains('open')){ handler_text.innerHTML = 'Закрыть' @@ -735,8 +738,36 @@ function open_curtain (left=null,right=null,overlay=null,close=null){ } +function closeOverlay () { + let curt = getOpenCurtain() + if (curt.length > 1){ + // nothing to do + } else { + let overlay = document.querySelector(".block_overlay") + overlay.classList.toggle('hidden') + overlay.classList.toggle('show') + } +} + +function newCurtainZIndex (curtain) { + let cur_curtain = '' + if (curtain){ + cur_curtain = curtain + } else { + cur_curtain = getOpenCurtain()[0] + } + if (cur_curtain){ + cur_curtain.style.zIndex = '101' + } + +} + function getNameCurtain () { let curtain = getOpenCurtain() + let type_curt = getTypeOfData(curtain) + if (type_curt === 'object'){ + curtain = curtain[0] + } let dataset = curtain.dataset let name = '' if (dataset){ @@ -747,12 +778,16 @@ function getNameCurtain () { function getOpenCurtain () { let curtains = document.querySelectorAll(".curtain") - let i = 0 let curtain = '' + if (curtains.length > 1){ + curtain = [] + } + let i = 0 + curtains.forEach(function (){ let el = curtains[i] if (el.classList.contains('open')){ - curtain = el + curtain.push(el) } i++ }) @@ -761,4 +796,9 @@ function getOpenCurtain () { console.log(`not finded open curtain choice first curtain named=${curtain.dataset['name']}`) } return curtain +} + +function getTypeOfData (data) { + let type = typeof data + return type } \ No newline at end of file diff --git a/templates/tb_base.html b/templates/tb_base.html index a9a80de..765f490 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -57,6 +57,7 @@
{% include 'blocks/b_header.html' %} +
@@ -70,7 +71,7 @@
- + {% block content %} {% endblock %}